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
Removed ImageActor usage from automated-tests
[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
4a12bdb
..
d42a548
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
@@
-32,7
+32,7
@@
void TestGlAbstraction::Initialize()
mCurrentProgram = 0;
mCompileStatus = GL_TRUE;
mLinkStatus = GL_TRUE;
mCurrentProgram = 0;
mCompileStatus = GL_TRUE;
mLinkStatus = GL_TRUE;
-
+ mNumberOfActiveUniforms = 0;
mGetAttribLocationResult = 0;
mGetErrorResult = 0;
mGetStringResult = NULL;
mGetAttribLocationResult = 0;
mGetErrorResult = 0;
mGetStringResult = NULL;
@@
-78,6
+78,13
@@
void TestGlAbstraction::Initialize()
mProgramUniforms3f.clear();
mProgramUniforms4f.clear();
mProgramUniforms3f.clear();
mProgramUniforms4f.clear();
+ mCullFaceTrace.Reset();
+ mEnableDisableTrace.Reset();
+ mShaderTrace.Reset();
+ mTextureTrace.Reset();
+ mTexParamaterTrace.Reset();
+ mDrawTrace.Reset();
+
for( unsigned int i=0; i<MAX_ATTRIBUTE_CACHE_SIZE; ++i )
{
mVertexAttribArrayState[i] = false;
for( unsigned int i=0; i<MAX_ATTRIBUTE_CACHE_SIZE; ++i )
{
mVertexAttribArrayState[i] = false;