Remove RenderSurface from Core

[platform/core/uifw/dali-core.git] / dali / internal / render / common / render-instruction.cpp

diff --git a/dali/internal/render/common/render-instruction.cpp b/dali/internal/render/common/render-instruction.cpp
index 714177e..164a9af 100644 (file)
--- 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) 2020 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.
@@ -21,6 +21,7 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/common/constants.h> // for Color::BLACK
 #include <dali/internal/render/common/render-tracker.h>
+#include <dali/integration-api/debug.h>
 
 namespace Dali
 {
@@ -32,14 +33,14 @@ namespace SceneGraph
 {
 
 RenderInstruction::RenderInstruction()
-: mViewMatrix( 0 ),
-  mProjectionMatrix( 0 ),
-  mRenderTracker( NULL ),
+: mRenderTracker( NULL ),
   mClearColor(),
   mIsViewportSet( false ),
   mIsClearColorSet( false ),
-  mCullMode(false),
-  mOffscreenTextureId( 0 ),
+  mIgnoreRenderToFbo( false ),
+  mFrameBuffer( 0 ),
+  mContext( 0 ),
+  mCamera( 0 ),
   mNextFreeRenderList( 0 )
 {
   // reserve 6 lists, which is enough for three layers with opaque and transparent things on
@@ -94,26 +95,30 @@ RenderListContainer::SizeType RenderInstruction::RenderListCount() const
 
 const RenderList* RenderInstruction::GetRenderList( RenderListContainer::SizeType index ) const
 {
-  DALI_ASSERT_ALWAYS( (index < mNextFreeRenderList ) && "Renderlist index out of scope" );
+  DALI_ASSERT_DEBUG( (index < mNextFreeRenderList ) && (index < mRenderLists.Size()) && "Renderlist index out of container bounds" );
+
+  // Return null if the caller has passed an invalid index:
+  if( index >= std::min( mNextFreeRenderList, mRenderLists.Size() ) )
+  {
+    return 0;
+  }
+
   return mRenderLists[ index ];
 }
 
-void RenderInstruction::Reset( const Matrix*   viewMatrix,
-                               const Matrix*   projectionMatrix,
-                               unsigned int    offscreenTextureId,
+void RenderInstruction::Reset( Camera*         camera,
+                               Render::FrameBuffer* frameBuffer,
                                const Viewport* viewport,
-                               const Vector4*  clearColor)
+                               const Vector4*  clearColor )
 {
-  mViewMatrix = viewMatrix;
-  mProjectionMatrix = projectionMatrix;
+  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();