projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Render to Frame Buffer Object.
[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
d66b096
..
4eb7a40
100644
(file)
--- a/
dali/internal/render/common/render-instruction.cpp
+++ b/
dali/internal/render/common/render-instruction.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
*
* 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,7
@@
RenderInstruction::RenderInstruction()
mClearColor(),
mIsViewportSet( false ),
mIsClearColorSet( false ),
mClearColor(),
mIsViewportSet( false ),
mIsClearColorSet( false ),
- m
OffscreenTextureId( 0
),
+ m
IgnoreRenderToFbo( false
),
mFrameBuffer( 0 ),
mCamera( 0 ),
mNextFreeRenderList( 0 )
mFrameBuffer( 0 ),
mCamera( 0 ),
mNextFreeRenderList( 0 )
@@
-106,7
+106,6
@@
const RenderList* RenderInstruction::GetRenderList( RenderListContainer::SizeTyp
}
void RenderInstruction::Reset( Camera* camera,
}
void RenderInstruction::Reset( Camera* camera,
- unsigned int offscreenTextureId,
Render::FrameBuffer* frameBuffer,
const Viewport* viewport,
const Vector4* clearColor )
Render::FrameBuffer* frameBuffer,
const Viewport* viewport,
const Vector4* clearColor )
@@
-116,7
+115,6
@@
void RenderInstruction::Reset( Camera* camera,
mIsViewportSet = NULL != viewport;
mClearColor = clearColor ? *clearColor : Color::BLACK;
mIsClearColorSet = NULL != clearColor;
mIsViewportSet = NULL != viewport;
mClearColor = clearColor ? *clearColor : Color::BLACK;
mIsClearColorSet = NULL != clearColor;
- mOffscreenTextureId = offscreenTextureId;
mRenderTracker = NULL;
mNextFreeRenderList = 0;
mFrameBuffer = frameBuffer;
mRenderTracker = NULL;
mNextFreeRenderList = 0;
mFrameBuffer = frameBuffer;