X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-gl-abstraction.h;h=516b3661757cd7311a348e8901388e2b9ef3757e;hb=aabc3440c8952244a7f50af568e23c735a04ffef;hp=06357b488de1e070fbb83131e2e80a8a318513f4;hpb=a881757839b7abb008873a68c67e17b3ba39669b;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h index 06357b4..516b366 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h @@ -19,15 +19,17 @@ */ // EXTERNAL INCLUDES +#include // fprintf #include #include +#include // for strcpy, strncpy #include // INTERNAL INCLUDES -#include #include #include #include +#include #include "test-trace-call-stack.h" namespace Dali @@ -51,6 +53,9 @@ public: ~TestGlAbstraction(); void Initialize(); + void PreRender(); + void PostRender(unsigned int timeDelta); + /* OpenGL ES 2.0 */ inline void ActiveTexture( GLenum textureUnit ) @@ -130,6 +135,10 @@ public: mActiveTextures[ mActiveTextureUnit ].mBoundTextures.push_back( texture ); } } + + std::stringstream out; + out << target << ", " << texture; + mTextureTrace.PushCall("BindTexture", out.str()); } inline void BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) @@ -472,6 +481,17 @@ public: *(textures+i) = ++mLastAutoTextureIdUsed; } } + + std::stringstream out; + for(int i=0; i + inline bool GetUniformValue( const char* name, T& value ) const + { + for( ProgramUniformMap::const_iterator program_it = mUniforms.begin(); + program_it != mUniforms.end(); + ++program_it ) + { + const UniformIDMap &uniformIDs = program_it->second; + + UniformIDMap::const_iterator uniform_it = uniformIDs.find( name ); + if( uniform_it != uniformIDs.end() ) + { + // found one matching uniform name, lets check the value... + GLuint programId = program_it->first; + GLint uniformId = uniform_it->second; + + const ProgramUniformValue &mProgramUniforms = GetProgramUniformsForType( value ); + return mProgramUniforms.GetUniformValue( programId, uniformId, value ); + } + } + return false; + } + + + template inline bool CheckUniformValue( const char* name, const T& value ) const { for( ProgramUniformMap::const_iterator program_it = mUniforms.begin(); @@ -1603,6 +1673,18 @@ public: // TEST FUNCTIONS ATTRIB_TYPE_LAST }; + struct ScissorParams + { + GLint x; + GLint y; + GLsizei width; + GLsizei height; + + ScissorParams() : x( 0 ), y( 0 ), width( 0 ), height( 0 ) { } + }; + + // Methods to check scissor tests + inline const ScissorParams& GetScissorParams() const { return mScissorParams; } private: GLuint mCurrentProgram; @@ -1653,6 +1735,7 @@ private: TraceCallStack mCullFaceTrace; TraceCallStack mShaderTrace; TraceCallStack mTextureTrace; + TraceCallStack mTexParamaterTrace; TraceCallStack mDrawTrace; // Shaders & Uniforms @@ -1779,6 +1862,8 @@ private: mVertexAttribArrayState[ index ] = state; mVertexAttribArrayChanged = true; } + + ScissorParams mScissorParams; }; template <>