X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Frender%2Frenderers%2Frender-renderer.h;h=6e1a1f7113ccfb3f4b8c972f502b33ff1f7be35c;hb=649ec06daecb510fb84fe4642a6af957f127e7ab;hp=2ce3538fd95166dfd1daeaeb85e5a4c2073695d1;hpb=ad93811bc6b8d95cf0be6edc78983690bd965205;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/render/renderers/render-renderer.h b/dali/internal/render/renderers/render-renderer.h
index 2ce3538..6e1a1f7 100644
--- a/dali/internal/render/renderers/render-renderer.h
+++ b/dali/internal/render/renderers/render-renderer.h
@@ -2,7 +2,7 @@
 #define DALI_INTERNAL_RENDER_RENDERER_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.
@@ -45,7 +45,6 @@ namespace SceneGraph
 {
 class SceneController;
 class Shader;
-class TextureCache;
 class NodeDataProvider;
 }
 
@@ -116,7 +115,7 @@ public:
   static Renderer* New( SceneGraph::RenderDataProvider* dataProviders,
                         Render::Geometry* geometry,
                         unsigned int blendingBitmask,
-                        const Vector4* blendColor,
+                        const Vector4& blendColor,
                         FaceCullingMode::Type faceCullingMode,
                         bool preMultipliedAlphaEnabled,
                         DepthWriteMode::Type depthWriteMode,
@@ -140,7 +139,7 @@ public:
   Renderer( SceneGraph::RenderDataProvider* dataProviders,
             Render::Geometry* geometry,
             unsigned int blendingBitmask,
-            const Vector4* blendColor,
+            const Vector4& blendColor,
             FaceCullingMode::Type faceCullingMode,
             bool preMultipliedAlphaEnabled,
             DepthWriteMode::Type depthWriteMode,
@@ -149,12 +148,6 @@ public:
             StencilParameters& stencilParameters );
 
   /**
-   * Change the data providers of the renderer
-   * @param[in] dataProviders The data providers
-   */
-  void SetRenderDataProvider( SceneGraph::RenderDataProvider* dataProviders );
-
-  /**
    * Change the geometry used by the renderer
    * @param[in] geometry The new geometry
    */
@@ -164,9 +157,8 @@ public:
    * Second-phase construction.
    * This is called when the renderer is inside render thread
    * @param[in] context Context used by the renderer
-   * @param[in] textureCache The texture cache to use
    */
-  void Initialize( Context& context, SceneGraph::TextureCache& textureCache );
+  void Initialize( Context& context );
 
   /**
    * Destructor
@@ -189,7 +181,7 @@ public:
    * Set the blend color for blending options
    * @param[in] blendColor The blend color to pass to GL
    */
-  void SetBlendColor( const Vector4* color );
+  void SetBlendColor( const Vector4& color );
 
   /**
    * Set the first element index to draw by the indexed draw
@@ -345,10 +337,8 @@ public:
   /**
    * Called to render during RenderManager::Render().
    * @param[in] context The context used for rendering
-   * @param[in] textureCache The texture cache used to get textures
    * @param[in] bufferIndex The index of the previous update buffer.
    * @param[in] node The node using this renderer
-   * @param[in] defaultShader in case there is no custom shader
    * @param[in] modelViewMatrix The model-view matrix.
    * @param[in] viewMatrix The view matrix.
    * @param[in] projectionMatrix The projection matrix.
@@ -356,10 +346,8 @@ public:
    * @param[in] blend If true, blending is enabled
    */
   void Render( Context& context,
-               SceneGraph::TextureCache& textureCache,
                BufferIndex bufferIndex,
                const SceneGraph::NodeDataProvider& node,
-               SceneGraph::Shader& defaultShader,
                const Matrix& modelMatrix,
                const Matrix& modelViewMatrix,
                const Matrix& viewMatrix,
@@ -412,18 +400,16 @@ private:
   /**
    * Bind the textures and setup the samplers
    * @param[in] context The GL context
-   * @param[in] textureCache The texture cache
    * @param[in] program The shader program
    * @return False if create or bind failed, true if success.
    */
-  bool BindTextures( Context& context, SceneGraph::TextureCache& textureCache, Program& program );
+  bool BindTextures( Context& context, Program& program );
 
 private:
 
   OwnerPointer< SceneGraph::RenderDataProvider > mRenderDataProvider;
 
   Context*                     mContext;
-  SceneGraph::TextureCache*    mTextureCache;
   Render::Geometry*            mGeometry;
 
   struct UniformIndexMap