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 "(Automated Tests) Remove unused TestGraphicsProgram Constructor" into devel...
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-graphics-controller.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.h
index
cbe78ec
..
d70ed3b
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.h
@@
-337,8
+337,8
@@
public:
struct ProgramCache
{
struct ProgramCache
{
- std::map<Graphics::PipelineStage,
const void*
> shaders;
- TestGraphicsProgramImpl* programImpl;
+ std::map<Graphics::PipelineStage,
std::vector<uint8_t>
> shaders;
+ TestGraphicsProgramImpl*
programImpl;
};
std::vector<ProgramCache> mProgramCache;
};
std::vector<ProgramCache> mProgramCache;