X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Frender%2Fcommon%2Frender-instruction.cpp;h=4eb7a401a67ba6b33b32f5a55b13d38c712d35cf;hb=1c21029fa51ea8e75575aca5ad65d36056609621;hp=d3419089fa8f412196fba951b51f1eef985d96c0;hpb=446cc2f7f201dc1f0cd29151ab621f3c78e30926;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 d341908..4eb7a40 100644 --- a/dali/internal/render/common/render-instruction.cpp +++ b/dali/internal/render/common/render-instruction.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 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,7 +37,8 @@ RenderInstruction::RenderInstruction() mClearColor(), mIsViewportSet( false ), mIsClearColorSet( false ), - mOffscreenTextureId( 0 ), + mIgnoreRenderToFbo( false ), + mFrameBuffer( 0 ), mCamera( 0 ), mNextFreeRenderList( 0 ) { @@ -105,7 +106,7 @@ const RenderList* RenderInstruction::GetRenderList( RenderListContainer::SizeTyp } void RenderInstruction::Reset( Camera* camera, - unsigned int offscreenTextureId, + Render::FrameBuffer* frameBuffer, const Viewport* viewport, const Vector4* clearColor ) { @@ -114,9 +115,9 @@ void RenderInstruction::Reset( Camera* camera, mIsViewportSet = NULL != viewport; mClearColor = clearColor ? *clearColor : Color::BLACK; mIsClearColorSet = NULL != clearColor; - mOffscreenTextureId = offscreenTextureId; mRenderTracker = NULL; mNextFreeRenderList = 0; + mFrameBuffer = frameBuffer; RenderListContainer::Iterator iter = mRenderLists.Begin(); RenderListContainer::ConstIterator end = mRenderLists.End();