Syncing common test files.

[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 44c6a33..98a2fa5 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
@@ -46,9 +46,10 @@ void TestGlAbstraction::Initialize()
   mActiveTextureUnit = 0;
   mCheckFramebufferStatusResult = 0;
   mFramebufferStatus = 0;
   mActiveTextureUnit = 0;
   mCheckFramebufferStatusResult = 0;
   mFramebufferStatus = 0;

-  mFramebufferColorAttached = 0;

   mFramebufferDepthAttached = 0;
   mFramebufferStencilAttached = 0;
   mFramebufferDepthAttached = 0;
   mFramebufferStencilAttached = 0;

+  mFramebufferColorAttachmentCount = 0;
+  mFrameBufferColorStatus = 0;

   mNumBinaryFormats = 0;
   mBinaryFormats = 0;
   mProgramBinaryLength = 0;
   mNumBinaryFormats = 0;
   mBinaryFormats = 0;
   mProgramBinaryLength = 0;


@@ -58,6 +59,7 @@ void TestGlAbstraction::Initialize()
 
   mLastShaderCompiled = 0;
   mLastClearBitMask = 0;
 
   mLastShaderCompiled = 0;
   mLastClearBitMask = 0;

+  mLastClearColor = Color::TRANSPARENT;

   mClearCount = 0;
 
   mLastBlendEquationRgb   = 0;
   mClearCount = 0;
 
   mLastBlendEquationRgb   = 0;


@@ -104,8 +106,14 @@ void TestGlAbstraction::PostRender()
 {
 }
 
 {
 }
 

-void TestGlAbstraction::ConvertTexture( uint8_t* buffer, GLenum& imageGlFormat, const uint32_t dataSize, const GLenum textureGlFormat, const bool isSubImage )
+bool TestGlAbstraction::IsSurfacelessContextSupported() const

 {
 {

+  return true;
+}
+
+bool TestGlAbstraction::TextureRequiresConverting( const GLenum imageGlFormat, const GLenum textureGlFormat, const bool isSubImage ) const
+{
+  return ( ( imageGlFormat == GL_RGB ) && ( textureGlFormat == GL_RGBA ) );

 }
 
 } // Namespace dali
 }
 
 } // Namespace dali


@@ -125,3 +133,4 @@ bool BlendDisabled(const Dali::TraceCallStack& callStack)
   bool blendEnabled = callStack.FindMethodAndParams( "Disable", out.str() );
   return blendEnabled;
 }
   bool blendEnabled = callStack.FindMethodAndParams( "Disable", out.str() );
   return blendEnabled;
 }

+