X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-gl-abstraction.h;h=c68573b03af0f01786ab5fac32a829ebbe308c23;hp=1f5597700a4c0a2925a398ff1897ec5b590cebc8;hb=908670e8d7b3447b5201a7f9118cca881cf0a41e;hpb=257a9991486e4e05335212b21ecc1f5a0aacbc63 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 1f55977..c68573b 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 @@ -1,8 +1,8 @@ -#ifndef __TEST_GL_ABSTRACTION_H__ -#define __TEST_GL_ABSTRACTION_H__ +#ifndef TEST_GL_ABSTRACTION_H +#define TEST_GL_ABSTRACTION_H /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -25,13 +25,15 @@ #include #include #include // for strcmp +#include // INTERNAL INCLUDES #include #include #include #include -#include "test-trace-call-stack.h" +#include +#include namespace Dali { @@ -47,7 +49,7 @@ static const char *mStdAttribs[MAX_ATTRIBUTE_CACHE_SIZE] = "aBoneIndices" // ATTRIB_BONE_INDICES }; -class DALI_IMPORT_API TestGlAbstraction: public Dali::Integration::GlAbstraction +class DALI_CORE_API TestGlAbstraction: public Dali::Integration::GlAbstraction { public: TestGlAbstraction(); @@ -424,6 +426,7 @@ public: paramName<<"texture["<(shaderSource.length()) < bufsize ) + const int shaderSourceLength = static_cast(shaderSource.length()); + if( shaderSourceLength < bufsize ) { - strcpy(source, shaderSource.c_str()); - *length = shaderSource.length(); + strncpy( source, shaderSource.c_str(), shaderSourceLength ); + *length = shaderSourceLength; } else { @@ -1126,9 +1155,12 @@ public: mTextureTrace.PushCall("TexSubImage2D", out.str(), namedParams); } - inline void Uniform1f(GLint location, GLfloat x) + inline void Uniform1f(GLint location, GLfloat value ) { - if( ! mProgramUniforms1f.SetUniformValue( mCurrentProgram, location, x ) ) + std::string params = ToString( value ); + AddUniformCallToTraceStack( location, params ); + + if( ! mProgramUniforms1f.SetUniformValue( mCurrentProgram, location, value ) ) { mGetErrorResult = GL_INVALID_OPERATION; } @@ -1136,6 +1168,14 @@ public: inline void Uniform1fv(GLint location, GLsizei count, const GLfloat* v) { + std::string params; + for( int i = 0; i < count; ++i ) + { + params = params + ToString( v[i] ) + ","; + } + + AddUniformCallToTraceStack( location, params ); + for( int i = 0; i < count; ++i ) { if( ! mProgramUniforms1f.SetUniformValue( mCurrentProgram, location, v[i] ) ) @@ -1148,6 +1188,10 @@ public: inline void Uniform1i(GLint location, GLint x) { + std::string params = ToString( x ); + + AddUniformCallToTraceStack( location, params ); + if( ! mProgramUniforms1i.SetUniformValue( mCurrentProgram, location, x ) ) { mGetErrorResult = GL_INVALID_OPERATION; @@ -1156,6 +1200,9 @@ public: inline void Uniform1iv(GLint location, GLsizei count, const GLint* v) { + std::string params = ToString( v ); + AddUniformCallToTraceStack( location, params ); + for( int i = 0; i < count; ++i ) { if( ! mProgramUniforms1i.SetUniformValue( mCurrentProgram, @@ -1170,6 +1217,9 @@ public: inline void Uniform2f(GLint location, GLfloat x, GLfloat y) { + std::string params = ToString( x ) + "," + ToString( y ); + AddUniformCallToTraceStack( location, params ); + if( ! mProgramUniforms2f.SetUniformValue( mCurrentProgram, location, Vector2( x, y ) ) ) @@ -1180,6 +1230,9 @@ public: inline void Uniform2fv(GLint location, GLsizei count, const GLfloat* v) { + std::string params = ToString( v ); + AddUniformCallToTraceStack( location, params ); + for( int i = 0; i < count; ++i ) { if( ! mProgramUniforms2f.SetUniformValue( mCurrentProgram, @@ -1194,14 +1247,21 @@ public: inline void Uniform2i(GLint location, GLint x, GLint y) { + std::string params = ToString( x ) + "," + ToString( y ); + AddUniformCallToTraceStack( location, params ); } inline void Uniform2iv(GLint location, GLsizei count, const GLint* v) { + std::string params = ToString( v ); + AddUniformCallToTraceStack( location, params ); } inline void Uniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z) { + std::string params = ToString( x ) + "," + ToString( y ) + "," + ToString( z ); + AddUniformCallToTraceStack( location, params ); + if( ! mProgramUniforms3f.SetUniformValue( mCurrentProgram, location, Vector3( x, y, z ) ) ) @@ -1212,6 +1272,9 @@ public: inline void Uniform3fv(GLint location, GLsizei count, const GLfloat* v) { + std::string params = ToString( v ); + AddUniformCallToTraceStack( location, params ); + for( int i = 0; i < count; ++i ) { if( ! mProgramUniforms3f.SetUniformValue( @@ -1227,14 +1290,21 @@ public: inline void Uniform3i(GLint location, GLint x, GLint y, GLint z) { + std::string params = ToString( x ) + "," + ToString( y ) + "," + ToString( z ); + AddUniformCallToTraceStack( location, params ); } inline void Uniform3iv(GLint location, GLsizei count, const GLint* v) { + std::string params = ToString( v ); + AddUniformCallToTraceStack( location, params ); } inline void Uniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w) { + std::string params = ToString( x ) + "," + ToString( y ) + "," + ToString( z ) + "," + ToString( w ); + AddUniformCallToTraceStack( location, params ); + if( ! mProgramUniforms4f.SetUniformValue( mCurrentProgram, location, Vector4( x, y, z, w ) ) ) @@ -1245,6 +1315,9 @@ public: inline void Uniform4fv(GLint location, GLsizei count, const GLfloat* v) { + std::string params = ToString( v ); + AddUniformCallToTraceStack( location, params ); + for( int i = 0; i < count; ++i ) { if( ! mProgramUniforms4f.SetUniformValue( @@ -1260,18 +1333,27 @@ public: inline void Uniform4i(GLint location, GLint x, GLint y, GLint z, GLint w) { + std::string params = ToString( x ) + "," + ToString( y ) + "," + ToString( z ) + "," + ToString( w ); + AddUniformCallToTraceStack( location, params ); } inline void Uniform4iv(GLint location, GLsizei count, const GLint* v) { + std::string params = ToString( v ); + AddUniformCallToTraceStack( location, params ); } inline void UniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) { + std::string params = ToString( value ); + AddUniformCallToTraceStack( location, params ); } inline void UniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) { + std::string params = ToString( value ); + AddUniformCallToTraceStack( location, params ); + for( int i = 0; i < count; ++i ) { if( ! mProgramUniformsMat3.SetUniformValue( @@ -1287,6 +1369,9 @@ public: inline void UniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) { + std::string params = ToString( value ); + AddUniformCallToTraceStack( location, params ); + for( int i = 0; i < count; ++i ) { if( ! mProgramUniformsMat4.SetUniformValue( @@ -1780,6 +1865,31 @@ public: { } +private: + + inline void AddUniformCallToTraceStack( GLint location, std::string& value ) + { + std::string name = ""; + bool matched = false; + + UniformIDMap& map = mUniforms[mCurrentProgram]; + for (UniformIDMap::iterator it=map.begin(); it!=map.end(); ++it) + { + if( it->second == location ) + { + name = it->first; + matched = true; + break; + } + } + + if ( matched ) + { + mSetUniformTrace.PushCall( name, value ); + } + } + + public: // TEST FUNCTIONS inline void SetCompileStatus( GLuint value ) { mCompileStatus = value; } inline void SetLinkStatus( GLuint value ) { mLinkStatus = value; } @@ -1850,6 +1960,16 @@ public: // TEST FUNCTIONS inline void ResetStencilFunctionCallStack() { mStencilFunctionTrace.Reset(); } inline TraceCallStack& GetStencilFunctionTrace() { return mStencilFunctionTrace; } + //Methods for Scissor verification + inline void EnableScissorCallTrace(bool enable) { mScissorTrace.Enable(enable); } + inline void ResetScissorCallStack() { mScissorTrace.Reset(); } + inline TraceCallStack& GetScissorTrace() { return mScissorTrace; } + + //Methods for Uniform function verification + inline void EnableSetUniformCallTrace(bool enable) { mSetUniformTrace.Enable(enable); } + inline void ResetSetUniformCallStack() { mSetUniformTrace.Reset(); } + inline TraceCallStack& GetSetUniformTrace() { return mSetUniformTrace; } + template inline bool GetUniformValue( const char* name, T& value ) const { @@ -2059,8 +2179,11 @@ private: GLenum mLastBlendFuncSrcAlpha; GLenum mLastBlendFuncDstAlpha; + GLboolean mLastDepthMask; + // Data for manipulating the IDs returned by GenTextures GLuint mLastAutoTextureIdUsed; + GLuint mNumGeneratedTextures; std::vector mNextTextureIds; std::vector mDeletedTextureIds; std::vector mBoundTextures; @@ -2080,6 +2203,8 @@ private: TraceCallStack mDrawTrace; TraceCallStack mDepthFunctionTrace; TraceCallStack mStencilFunctionTrace; + TraceCallStack mScissorTrace; + TraceCallStack mSetUniformTrace; // Shaders & Uniforms GLuint mLastShaderIdUsed; @@ -2123,7 +2248,7 @@ private: T uniformValue; if ( GetUniformValue( program, uniform, uniformValue ) ) { - return value == uniformValue; + return CompareType(value, uniformValue, Math::MACHINE_EPSILON_10); } return false; @@ -2258,6 +2383,4 @@ bool BlendEnabled(const Dali::TraceCallStack& callStack); bool BlendDisabled(const Dali::TraceCallStack& callStack); - - -#endif // __TEST_GL_ES_H__ +#endif // TEST_GL_ABSTRACTION_H