X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Frendering%2Fdata-providers%2Frender-data-provider.h;fp=dali%2Finternal%2Frender%2Fdata-providers%2Frender-data-provider.h;h=8f862beeb5adbb2328e0659ff9e888240878b5b2;hb=3d6004a410ab436e8fe7b1a99555fa50f3830eee;hp=22892820a28652a0351e30fef923d753c42ed3b4;hpb=f009e5fcd8090a603ba10ca0fc8b30cfb5dc2550;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/render/data-providers/render-data-provider.h b/dali/internal/update/rendering/data-providers/render-data-provider.h
similarity index 77%
rename from dali/internal/render/data-providers/render-data-provider.h
rename to dali/internal/update/rendering/data-providers/render-data-provider.h
index 2289282..8f862be 100644
--- a/dali/internal/render/data-providers/render-data-provider.h
+++ b/dali/internal/update/rendering/data-providers/render-data-provider.h
@@ -2,7 +2,7 @@
 #define __DALI_INTERNAL_SCENE_GRAPH_RENDER_DATA_PROVIDER_H__
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,11 +20,11 @@
 
 #include <dali/public-api/common/vector-wrapper.h>
 #include <dali/public-api/rendering/renderer.h>
-#include <dali/internal/render/data-providers/node-data-provider.h>
-#include <dali/internal/render/data-providers/property-buffer-data-provider.h>
-#include <dali/internal/render/data-providers/uniform-map-data-provider.h>
-#include <dali/internal/render/renderers/render-sampler.h>
-#include <dali/internal/render/renderers/render-texture.h>
+#include <dali/internal/update/rendering/data-providers/node-data-provider.h>
+#include <dali/internal/update/rendering/data-providers/property-buffer-data-provider.h>
+#include <dali/internal/update/rendering/data-providers/uniform-map-data-provider.h>
+#include <dali/internal/update/rendering/scene-graph-sampler.h>
+#include <dali/internal/update/rendering/scene-graph-texture.h>
 
 namespace Dali
 {
@@ -33,6 +33,7 @@ namespace Internal
 
 struct BlendingOptions;
 
+
 namespace SceneGraph
 {
 class PropertyBuffer;
@@ -48,8 +49,8 @@ class Shader;
 class RenderDataProvider
 {
 public:
-
-  typedef std::vector< Render::Sampler* > Samplers;
+  typedef Dali::Vector< const PropertyBufferDataProvider* > VertexBuffers;
+  typedef std::vector< SceneGraph::Sampler* > Samplers;
 
   /**
    * Constructor.
@@ -86,7 +87,7 @@ public:
    * Returns the shader
    * @return The shader
    */
-  Dali::Internal::SceneGraph::Shader& GetShader() const;
+  Shader& GetShader() const;
 
   /**
    * Returns the list of samplers
@@ -98,13 +99,13 @@ public:
    * Returns the list of Textures
    * @return The list of Textures
    */
-  std::vector<Render::Texture*>& GetTextures();
+  std::vector<SceneGraph::Texture*>& GetTextures();
 
 private:
 
   const UniformMapDataProvider*       mUniformMapDataProvider;
-  Dali::Internal::SceneGraph::Shader* mShader;
-  std::vector<Render::Texture*>       mTextures;
+  Shader*                             mShader;
+  std::vector<SceneGraph::Texture*>   mTextures;
   Samplers                            mSamplers;
 
   // Give Renderer access to our private data to reduce copying vectors on construction.