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 files to match dali-core Pipeline VtxFmt
[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
9e8c7a8
..
eac9db5
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
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
0
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
1
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.
@@
-20,6
+20,10
@@
namespace Dali
{
TestGlAbstraction::TestGlAbstraction()
namespace Dali
{
TestGlAbstraction::TestGlAbstraction()
+: mBufferTrace(true, "gl"),
+ mTextureTrace(true, "gl"),
+ mTexParameterTrace(true, "gl"),
+ mDrawTrace(true, "gl")
{
Initialize();
}
{
Initialize();
}
@@
-34,7
+38,6
@@
void TestGlAbstraction::Initialize()
mCompileStatus = GL_TRUE;
mLinkStatus = GL_TRUE;
mNumberOfActiveUniforms = 0;
mCompileStatus = GL_TRUE;
mLinkStatus = GL_TRUE;
mNumberOfActiveUniforms = 0;
- mGetAttribLocationResult = 0;
mGetErrorResult = 0;
mGetStringResult = NULL;
mIsBufferResult = 0;
mGetErrorResult = 0;
mGetStringResult = NULL;
mIsBufferResult = 0;
@@
-83,6
+86,9
@@
void TestGlAbstraction::Initialize()
mProgramUniforms3f.clear();
mProgramUniforms4f.clear();
mProgramUniforms3f.clear();
mProgramUniforms4f.clear();
+ mAttribLocs.clear();
+ mAttribLocs.push_back("aPosition");
+ mAttribLocs.push_back("aTexCoord");
mCullFaceTrace.Reset();
mDepthFunctionTrace.Reset();
mEnableDisableTrace.Reset();
mCullFaceTrace.Reset();
mDepthFunctionTrace.Reset();
mEnableDisableTrace.Reset();
@@
-90,7
+96,7
@@
void TestGlAbstraction::Initialize()
mStencilFunctionTrace.Reset();
mScissorTrace.Reset();
mTextureTrace.Reset();
mStencilFunctionTrace.Reset();
mScissorTrace.Reset();
mTextureTrace.Reset();
- mTexParam
a
terTrace.Reset();
+ mTexParam
e
terTrace.Reset();
mDrawTrace.Reset();
for(unsigned int i = 0; i < MAX_ATTRIBUTE_CACHE_SIZE; ++i)
mDrawTrace.Reset();
for(unsigned int i = 0; i < MAX_ATTRIBUTE_CACHE_SIZE; ++i)