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
Removed old context test cases
[platform/core/uifw/dali-core.git]
/
automated-tests
/
src
/
dali
/
dali-test-suite-utils
/
test-graphics-program.cpp
diff --git
a/automated-tests/src/dali/dali-test-suite-utils/test-graphics-program.cpp
b/automated-tests/src/dali/dali-test-suite-utils/test-graphics-program.cpp
index
1b23380
..
8f2e0c7
100644
(file)
--- a/
automated-tests/src/dali/dali-test-suite-utils/test-graphics-program.cpp
+++ b/
automated-tests/src/dali/dali-test-suite-utils/test-graphics-program.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
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.
@@
-18,20
+18,28
@@
namespace Dali
{
namespace Dali
{
-TestGraphicsProgram
::TestGraphicsProgram(TestGlAbstraction& gl, const Graphics::ProgramCreateInfo& createInfo, Property::Array& vertexFormat
s)
+TestGraphicsProgram
Impl::TestGraphicsProgramImpl(TestGlAbstraction& gl, const Graphics::ProgramCreateInfo& createInfo, Property::Array& vertexFormats, std::vector<UniformData>& customUniform
s)
: mGl(gl),
: mGl(gl),
+ mId(gl.CreateProgram()),
mCreateInfo(createInfo),
mCreateInfo(createInfo),
- mReflection(gl,
vertexFormat
s)
+ mReflection(gl,
mId, vertexFormats, createInfo, customUniform
s)
{
{
- mId = 0;//mGl.CreateProgram();
+ // Ensure active sampler uniforms are set
+ mGl.SetCustomUniforms(customUniforms);
+
+ // Don't need to re-register uniforms in GL side - now done in creation of mReflection.
+ // Was previously done in mGl.LinkProgram(mId);
}
}
-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(TestGraphicsProgramImpl* impl)
+{
+ mImpl = impl;
+}
} // namespace Dali
} // namespace Dali