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 "DALi Version 2.0.21" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-gl-abstraction.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp
index
eac9db5
..
f2086d6
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.cpp
@@
-16,14
+16,23
@@
*/
#include "test-gl-abstraction.h"
*/
#include "test-gl-abstraction.h"
+#include "test-trace-call-stack.h"
namespace Dali
{
TestGlAbstraction::TestGlAbstraction()
namespace Dali
{
TestGlAbstraction::TestGlAbstraction()
-: mBufferTrace(true, "gl"),
- mTextureTrace(true, "gl"),
+: mBufferTrace(true, std::string("gl")),
+ mCullFaceTrace(true, "gl"),
+ mEnableDisableTrace(true, "gl"),
+ mShaderTrace(true, "gl"),
+ mTextureTrace(true, std::string("gl")),
mTexParameterTrace(true, "gl"),
mTexParameterTrace(true, "gl"),
- mDrawTrace(true, "gl")
+ mDrawTrace(true, "gl"),
+ mDepthFunctionTrace(true, "gl"),
+ mStencilFunctionTrace(true, "gl"),
+ mScissorTrace(true, "gl"),
+ mSetUniformTrace(true, "Uniform "),
+ mViewportTrace(true, "gl")
{
Initialize();
}
{
Initialize();
}