[Tizen] Remove context from RenderInstruction

Change-Id: I19f43c7728e2d3a59d2bdc74ca7d697f110e53dd

diff --git a/dali/internal/render/common/render-instruction.cpp b/dali/internal/render/common/render-instruction.cpp
index 164a9af..a001251 100644 (file)
--- a/dali/internal/render/common/render-instruction.cpp
+++ b/dali/internal/render/common/render-instruction.cpp
@@ -39,7 +39,6 @@ RenderInstruction::RenderInstruction()
   mIsClearColorSet( false ),
   mIgnoreRenderToFbo( false ),
   mFrameBuffer( 0 ),
-  mContext( 0 ),
   mCamera( 0 ),
   mNextFreeRenderList( 0 )
 {

diff --git a/dali/internal/render/common/render-instruction.h b/dali/internal/render/common/render-instruction.h
index f40ec04..91a48f4 100644 (file)
--- a/dali/internal/render/common/render-instruction.h
+++ b/dali/internal/render/common/render-instruction.h
@@ -149,8 +149,6 @@ public: // Data
 
   Render::FrameBuffer* mFrameBuffer;
 
-  Context* mContext;                    ///< The context holding the GL state of rendering
-
 private: // Data
 
   Camera* mCamera;  ///< camera that is used

diff --git a/dali/internal/update/manager/render-instruction-processor.cpp b/dali/internal/update/manager/render-instruction-processor.cpp
index b973fa9..3e71956 100644 (file)
--- a/dali/internal/update/manager/render-instruction-processor.cpp
+++ b/dali/internal/update/manager/render-instruction-processor.cpp
@@ -438,7 +438,6 @@ inline void RenderInstructionProcessor::SortRenderItems( BufferIndex bufferIndex
 
 void RenderInstructionProcessor::Prepare( BufferIndex updateBufferIndex,
                                           SortedLayerPointers& sortedLayers,
-                                          Context& context,
                                           RenderTask& renderTask,
                                           bool cull,
                                           bool hasClippingNodes,
@@ -518,7 +517,6 @@ void RenderInstructionProcessor::Prepare( BufferIndex updateBufferIndex,
 
   if( isRenderListAdded || instruction.mIsClearColorSet || isRootLayerDirty )
   {
-    instruction.mContext = &context;
     instructions.PushBack( updateBufferIndex, &instruction );
   }
 }

diff --git a/dali/internal/update/manager/render-instruction-processor.h b/dali/internal/update/manager/render-instruction-processor.h
index 9cc7b54..a35bcf0 100644 (file)
--- a/dali/internal/update/manager/render-instruction-processor.h
+++ b/dali/internal/update/manager/render-instruction-processor.h
@@ -29,8 +29,6 @@ namespace Dali
 namespace Internal
 {
 
-class Context;
-
 namespace Render
 {
 class Geometry;
@@ -99,7 +97,6 @@ public:
    *
    * @param[in]  updateBufferIndex The current update buffer index.
    * @param[in]  sortedLayers      The layers containing lists of opaque/transparent renderables.
-   * @param[in]  context           The context holding the GL state of rendering for the rendering instructions.
    * @param[in]  renderTask        The rendering task information.
    * @param[in]  cull              Whether frustum culling is enabled or not
    * @param[in]  hasClippingNodes  Whether any clipping nodes exist within this layer, to optimize sorting if not
@@ -107,7 +104,6 @@ public:
    */
   void Prepare( BufferIndex updateBufferIndex,
                 SortedLayerPointers& sortedLayers,
-                Context& context,
                 RenderTask& renderTask,
                 bool cull,
                 bool hasClippingNodes,

diff --git a/dali/internal/update/manager/render-task-processor.cpp b/dali/internal/update/manager/render-task-processor.cpp
index 0fdc554..5923331 100644 (file)
--- a/dali/internal/update/manager/render-task-processor.cpp
+++ b/dali/internal/update/manager/render-task-processor.cpp
@@ -207,7 +207,6 @@ bool AddRenderablesForTask( BufferIndex updateBufferIndex,
  * @param[in]  taskContainer              The container of render-tasks.
  * @param[in]  rootNode                   The root node of the scene-graph.
  * @param[in]  sortedLayers               The layers containing lists of opaque / transparent renderables.
- * @param[in]  context                    The context holding the GL state of rendering for the rendering instructions.
  * @param[out] instructions               The instructions for rendering the next frame.
  * @param[in]  renderInstructionProcessor An instance of the RenderInstructionProcessor used to sort and handle the renderers for each layer.
  * @param[in]  renderToFboEnabled         Whether rendering into the Frame Buffer Object is enabled (used to measure FPS above 60)
@@ -219,7 +218,6 @@ bool ProcessTasks( BufferIndex updateBufferIndex,
                    RenderTaskList::RenderTaskContainer& taskContainer,
                    Layer& rootNode,
                    SortedLayerPointers& sortedLayers,
-                   Context& context,
                    RenderInstructionContainer& instructions,
                    RenderInstructionProcessor& renderInstructionProcessor,
                    bool renderToFboEnabled,
@@ -287,7 +285,6 @@ bool ProcessTasks( BufferIndex updateBufferIndex,
 
       renderInstructionProcessor.Prepare( updateBufferIndex,
                                           sortedLayers,
-                                          context,
                                           renderTask,
                                           renderTask.GetCullMode(),
                                           hasClippingNodes,
@@ -323,7 +320,6 @@ bool RenderTaskProcessor::Process( BufferIndex updateBufferIndex,
                                    RenderTaskList& renderTasks,
                                    Layer& rootNode,
                                    SortedLayerPointers& sortedLayers,
-                                   Context& context,
                                    RenderInstructionContainer& instructions,
                                    bool renderToFboEnabled,
                                    bool isRenderingToFbo )
@@ -351,7 +347,6 @@ bool RenderTaskProcessor::Process( BufferIndex updateBufferIndex,
                                 taskContainer,
                                 rootNode,
                                 sortedLayers,
-                                context,
                                 instructions,
                                 mRenderInstructionProcessor,
                                 renderToFboEnabled,
@@ -367,7 +362,6 @@ bool RenderTaskProcessor::Process( BufferIndex updateBufferIndex,
                                  taskContainer,
                                  rootNode,
                                  sortedLayers,
-                                 context,
                                  instructions,
                                  mRenderInstructionProcessor,
                                  renderToFboEnabled,

diff --git a/dali/internal/update/manager/render-task-processor.h b/dali/internal/update/manager/render-task-processor.h
index 4f39220..9830f01 100644 (file)
--- a/dali/internal/update/manager/render-task-processor.h
+++ b/dali/internal/update/manager/render-task-processor.h
@@ -58,7 +58,6 @@ public:
    * @param[in]  renderTasks        The list of render-tasks.
    * @param[in]  rootNode           The root node of the scene-graph.
    * @param[in]  sortedLayers       The layers containing lists of opaque / transparent renderables.
-   * @param[in]  context            The context holding the GL state of rendering for the rendering instructions.
    * @param[out] instructions       The instructions for rendering the next frame.
    * @param[in]  renderToFboEnabled Whether rendering into the Frame Buffer Object is enabled (used to measure FPS above 60)
    * @param[in]  isRenderingToFbo   Whether this frame is being rendered into the Frame Buffer Object (used to measure FPS above 60)
@@ -68,7 +67,6 @@ public:
                 RenderTaskList& renderTasks,
                 Layer& rootNode,
                 SortedLayerPointers& sortedLayers,
-                Context& context,
                 RenderInstructionContainer& instructions,
                 bool renderToFboEnabled,
                 bool isRenderingToFbo );

diff --git a/dali/internal/update/manager/update-manager.cpp b/dali/internal/update/manager/update-manager.cpp
index b6372c3..a3e4534 100644 (file)
--- a/dali/internal/update/manager/update-manager.cpp
+++ b/dali/internal/update/manager/update-manager.cpp
@@ -995,7 +995,6 @@ uint32_t UpdateManager::Update( float elapsedSeconds,
                                               *scene->taskList,
                                               *scene->root,
                                               scene->sortedLayerList,
-                                              *scene->scene->GetContext(),
                                               scene->scene->GetRenderInstructions(),
                                               renderToFboEnabled,
                                               isRenderingToFbo );