/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
// 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
{
mClearColor(),
mIsViewportSet( false ),
mIsClearColorSet( false ),
- mCullMode(false),
- mOffscreenTextureId( 0 ),
- mCameraAttachment( 0 ),
+ mFrameBuffer( 0 ),
+ mCamera( 0 ),
mNextFreeRenderList( 0 )
{
// reserve 6 lists, which is enough for three layers with opaque and transparent things on
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( 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();