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
Updated test harness
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-graphics-reflection.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.h
index
9311e07
..
7af052e
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-reflection.h
@@
-17,6
+17,7
@@
* limitations under the License.
*/
* limitations under the License.
*/
+#include <dali/graphics-api/graphics-program-create-info.h>
#include <dali/graphics-api/graphics-reflection.h>
#include "test-gl-abstraction.h"
#include <dali/graphics-api/graphics-reflection.h>
#include "test-gl-abstraction.h"
@@
-25,7
+26,7
@@
namespace Dali
class TestGraphicsReflection : public Graphics::Reflection
{
public:
class TestGraphicsReflection : public Graphics::Reflection
{
public:
- TestGraphicsReflection(TestGlAbstraction& gl, Property::Array& vertexFormats);
+ TestGraphicsReflection(TestGlAbstraction& gl, Property::Array& vertexFormats
, const Graphics::ProgramCreateInfo& createInfo, std::vector<UniformData>& customUniforms
);
uint32_t GetVertexAttributeLocation(const std::string& name) const override;
Dali::Graphics::VertexInputAttributeFormat GetVertexAttributeFormat(uint32_t location) const override;
uint32_t GetVertexAttributeLocation(const std::string& name) const override;
Dali::Graphics::VertexInputAttributeFormat GetVertexAttributeFormat(uint32_t location) const override;
@@
-55,8
+56,14
@@
public: // Test methods
}
}
}
}
+ Dali::Property::Type GetMemberType(int blockIndex, int location) const;
+
TestGlAbstraction& mGl;
mutable std::vector<std::string> mAttributes;
TestGlAbstraction& mGl;
mutable std::vector<std::string> mAttributes;
+ std::vector<UniformData> mCustomUniforms;
+
+ Graphics::UniformBlockInfo mDefaultUniformBlock{}; ///< The emulated UBO containing all the standalone uniforms
+ std::vector<Graphics::UniformBlockInfo> mUniformBlocks{}; ///< List of uniform blocks
};
} // namespace Dali
};
} // namespace Dali