projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "(Vector) Drop frames when the animation is delayed" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-graphics-pipeline.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-pipeline.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-pipeline.cpp
index
0cc4194
..
d303d56
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-pipeline.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-pipeline.cpp
@@
-26,8
+26,8
@@
TestGraphicsPipeline::TestGraphicsPipeline(TestGlAbstraction& gl, const Graphics
if(createInfo.colorBlendState)
colorBlendState = *createInfo.colorBlendState;
if(createInfo.colorBlendState)
colorBlendState = *createInfo.colorBlendState;
- if(createInfo.
shader
State)
-
shaderState = *createInfo.shader
State;
+ if(createInfo.
program
State)
+
programState = *createInfo.program
State;
if(createInfo.viewportState)
viewportState = *createInfo.viewportState;
if(createInfo.viewportState)
viewportState = *createInfo.viewportState;