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
Syncing Test harness updates
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-graphics-program.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-program.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-program.cpp
index
1b23380
..
9a0afa6
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-program.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-program.cpp
@@
-18,20
+18,29
@@
namespace Dali
{
namespace Dali
{
-TestGraphicsProgram
::TestGraphicsProgram
(TestGlAbstraction& gl, const Graphics::ProgramCreateInfo& createInfo, Property::Array& vertexFormats)
+TestGraphicsProgram
Impl::TestGraphicsProgramImpl
(TestGlAbstraction& gl, const Graphics::ProgramCreateInfo& createInfo, Property::Array& vertexFormats)
: mGl(gl),
mCreateInfo(createInfo),
mReflection(gl, vertexFormats)
{
: mGl(gl),
mCreateInfo(createInfo),
mReflection(gl, vertexFormats)
{
- mId = 0;//mGl.CreateProgram();
+ mId = mGl.CreateProgram();
+ mGl.LinkProgram(1); // Ensure active sampler uniforms are set
}
}
-bool TestGraphicsProgram
::GetParameter(uint32_t parameterId, void* outData
)
+bool TestGraphicsProgram
Impl::GetParameter(uint32_t parameterId, void* outData
)
{
reinterpret_cast<uint32_t*>(outData)[0] = mId;
return true;
}
{
reinterpret_cast<uint32_t*>(outData)[0] = mId;
return true;
}
+TestGraphicsProgram::TestGraphicsProgram(TestGlAbstraction& gl, const Graphics::ProgramCreateInfo& createInfo, Property::Array& vertexFormats)
+{
+ mImpl = new TestGraphicsProgramImpl(gl, createInfo, vertexFormats);
+}
+TestGraphicsProgram::TestGraphicsProgram(TestGraphicsProgramImpl* impl)
+{
+ mImpl = impl;
+}
} // namespace Dali
} // namespace Dali