X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Frender%2Fcommon%2Frender-instruction.cpp;h=4eb7a401a67ba6b33b32f5a55b13d38c712d35cf;hb=4581860eac334340242f9a208ea85eb8c7e9bb9a;hp=74f641bd5a77011c06b9fe24cf5ee7668246fa07;hpb=837cbee3153526ba1be7d17ef69b28360feca76a;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/render/common/render-instruction.cpp b/dali/internal/render/common/render-instruction.cpp
index 74f641b..4eb7a40 100644
--- a/dali/internal/render/common/render-instruction.cpp
+++ b/dali/internal/render/common/render-instruction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -37,9 +37,9 @@ RenderInstruction::RenderInstruction()
   mClearColor(),
   mIsViewportSet( false ),
   mIsClearColorSet( false ),
-  mCullMode(false),
-  mOffscreenTextureId( 0 ),
-  mCameraAttachment( 0 ),
+  mIgnoreRenderToFbo( false ),
+  mFrameBuffer( 0 ),
+  mCamera( 0 ),
   mNextFreeRenderList( 0 )
 {
   // reserve 6 lists, which is enough for three layers with opaque and transparent things on
@@ -105,20 +105,19 @@ const RenderList* RenderInstruction::GetRenderList( RenderListContainer::SizeTyp
   return mRenderLists[ index ];
 }
 
-void RenderInstruction::Reset( CameraAttachment* cameraAttachment,
-                               unsigned int      offscreenTextureId,
-                               const Viewport*   viewport,
-                               const Vector4*    clearColor )
+void RenderInstruction::Reset( Camera*         camera,
+                               Render::FrameBuffer* frameBuffer,
+                               const Viewport* viewport,
+                               const Vector4*  clearColor )
 {
-  mCameraAttachment = cameraAttachment;
+  mCamera = camera;
   mViewport = viewport ? *viewport : Viewport();
   mIsViewportSet = NULL != viewport;
   mClearColor = clearColor ? *clearColor : Color::BLACK;
   mIsClearColorSet = NULL != clearColor;
-  mCullMode = false;
-  mOffscreenTextureId = offscreenTextureId;
   mRenderTracker = NULL;
   mNextFreeRenderList = 0;
+  mFrameBuffer = frameBuffer;
 
   RenderListContainer::Iterator iter = mRenderLists.Begin();
   RenderListContainer::ConstIterator end = mRenderLists.End();