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=6fc704972218b8f6d39a174bb11adafb6274d508;hp=516b3661757cd7311a348e8901388e2b9ef3757e;hb=3fea156f024c5b2909e6a6aa9daaffd3767d7108;hpb=6e44b7e1d2a1ba9f24fb48751e8969eb63cfa716

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 516b366..6fc7049 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) 2020 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.
@@ -19,18 +19,22 @@
  */
 
 // EXTERNAL INCLUDES
-#include <cstdio>  // fprintf
 #include <sstream>
 #include <string>
-#include <cstring> // for strcpy, strncpy
+#include <cstring>
 #include <map>
+#include <cstdio>
+#include <cstring> // for strcmp
+#include <typeinfo>
 
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-core.h>
+#include <dali/devel-api/rendering/frame-buffer-devel.h>
 #include <dali/integration-api/core.h>
 #include <dali/integration-api/gl-abstraction.h>
 #include <dali/integration-api/gl-defines.h>
-#include "test-trace-call-stack.h"
+#include <test-trace-call-stack.h>
+#include <test-compare-types.h>
 
 namespace Dali
 {
@@ -46,19 +50,23 @@ 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();
-  ~TestGlAbstraction();
+  ~TestGlAbstraction() override;
   void Initialize();
 
-  void PreRender();
-  void PostRender(unsigned int timeDelta);
+  void PreRender() override;
+  void PostRender() override;
+
+  bool IsSurfacelessContextSupported() const override;
+
+  bool TextureRequiresConverting( const GLenum imageGlFormat, const GLenum textureGlFormat, const bool isSubImage ) const override;
 
   /* OpenGL ES 2.0 */
 
-  inline void ActiveTexture( GLenum textureUnit )
+  inline void ActiveTexture( GLenum textureUnit ) override
   {
     mActiveTextureUnit = textureUnit - GL_TEXTURE0;
   }
@@ -68,26 +76,32 @@ public:
     return mActiveTextureUnit + GL_TEXTURE0;
   }
 
-  inline void AttachShader( GLuint program, GLuint shader )
+  inline void AttachShader( GLuint program, GLuint shader ) override
   {
     std::stringstream out;
     out << program << ", " << shader;
-    mShaderTrace.PushCall("AttachShader", out.str());
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["program"] = ToString(program);
+    namedParams["shader"] = ToString(shader);
+    mShaderTrace.PushCall("AttachShader", out.str(), namedParams);
   }
 
-  inline void BindAttribLocation( GLuint program, GLuint index, const char* name )
+  inline void BindAttribLocation( GLuint program, GLuint index, const char* name ) override
   {
   }
 
-  inline void BindBuffer( GLenum target, GLuint buffer )
+  inline void BindBuffer( GLenum target, GLuint buffer ) override
   {
   }
 
-  inline void BindFramebuffer( GLenum target, GLuint framebuffer )
+  inline void BindFramebuffer( GLenum target, GLuint framebuffer ) override
   {
+    //Add 010 bit;
+    mFramebufferStatus |= 2;
   }
 
-  inline void BindRenderbuffer( GLenum target, GLuint renderbuffer )
+  inline void BindRenderbuffer( GLenum target, GLuint renderbuffer ) override
   {
   }
 
@@ -123,7 +137,7 @@ public:
     }
   }
 
-  inline void BindTexture( GLenum target, GLuint texture )
+  inline void BindTexture( GLenum target, GLuint texture ) override
   {
     // Record the bound textures for future checks
     if( texture )
@@ -138,10 +152,15 @@ public:
 
     std::stringstream out;
     out << target << ", " << texture;
-    mTextureTrace.PushCall("BindTexture", out.str());
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["target"] = ToString(target);
+    namedParams["texture"] = ToString(texture);
+
+    mTextureTrace.PushCall("BindTexture", out.str(), namedParams);
   }
 
-  inline void BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
+  inline void BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) override
   {
     mLastBlendColor.r = red;
     mLastBlendColor.g = green;
@@ -154,13 +173,13 @@ public:
     return mLastBlendColor;
   }
 
-  inline void BlendEquation( GLenum mode )
+  inline void BlendEquation( GLenum mode ) override
   {
     mLastBlendEquationRgb   = mode;
     mLastBlendEquationAlpha = mode;
   }
 
-  inline void BlendEquationSeparate( GLenum modeRgb, GLenum modeAlpha )
+  inline void BlendEquationSeparate( GLenum modeRgb, GLenum modeAlpha ) override
   {
     mLastBlendEquationRgb   = modeRgb;
     mLastBlendEquationAlpha = modeAlpha;
@@ -176,7 +195,7 @@ public:
     return mLastBlendEquationAlpha;
   }
 
-  inline void BlendFunc(GLenum sfactor, GLenum dfactor)
+  inline void BlendFunc(GLenum sfactor, GLenum dfactor) override
   {
     mLastBlendFuncSrcRgb = sfactor;
     mLastBlendFuncDstRgb = dfactor;
@@ -184,7 +203,7 @@ public:
     mLastBlendFuncDstAlpha = dfactor;
   }
 
-  inline void BlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha)
+  inline void BlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha) override
   {
     mLastBlendFuncSrcRgb = srcRGB;
     mLastBlendFuncDstRgb = dstRGB;
@@ -212,63 +231,136 @@ public:
     return mLastBlendFuncDstAlpha;
   }
 
-  inline void BufferData(GLenum target, GLsizeiptr size, const void* data, GLenum usage)
+  inline void BufferData(GLenum target, GLsizeiptr size, const void* data, GLenum usage) override
   {
+     mBufferDataCalls.push_back(size);
   }
 
-  inline void BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void* data)
+  inline void BufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const void* data) override
   {
+     mBufferSubDataCalls.push_back(size);
   }
 
-  inline GLenum CheckFramebufferStatus(GLenum target)
+  inline GLenum CheckFramebufferStatus(GLenum target) override
   {
+    //If it has the three last bits set to 1 - 111, then the three minimum functions to create a
+    //Framebuffer texture have been called
+    if( mFramebufferStatus == 7 )
+    {
+      return GL_FRAMEBUFFER_COMPLETE;
+    }
+
     return mCheckFramebufferStatusResult;
   }
 
-  inline void Clear(GLbitfield mask)
+  inline GLuint CheckFramebufferColorAttachmentCount()
+  {
+    return mFramebufferColorAttachmentCount;
+  }
+
+  inline GLenum CheckFramebufferDepthAttachment()
   {
+    return mFramebufferDepthAttached;
   }
 
-  inline void ClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
+  inline GLenum CheckFramebufferStencilAttachment()
   {
+    return mFramebufferStencilAttached;
   }
 
-  inline void ClearDepthf(GLclampf depth)
+  inline void Clear(GLbitfield mask) override
   {
+    mClearCount++;
+    mLastClearBitMask = mask;
   }
 
-  inline void ClearStencil(GLint s)
+  inline void ClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) override
   {
+    mLastClearColor.r = red;
+    mLastClearColor.g = green;
+    mLastClearColor.b = blue;
+    mLastClearColor.a = alpha;
+  }
+
+  inline const Vector4& GetLastClearColor() const
+  {
+    return mLastClearColor;
+  }
+
+  inline void ClearDepthf(GLclampf depth) override
+  {
+  }
+
+  inline void ClearStencil(GLint s) override
+  {
+    std::stringstream out;
+    out << s;
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["s"] = ToString( s );
+
+    mStencilFunctionTrace.PushCall( "ClearStencil", out.str(), namedParams );
   }
 
-  inline void ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
+  inline void ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) override
   {
+    mColorMaskParams.red = red;
+    mColorMaskParams.green = green;
+    mColorMaskParams.blue = blue;
+    mColorMaskParams.alpha = alpha;
   }
 
-  inline void CompileShader(GLuint shader)
+  inline void CompileShader(GLuint shader) override
   {
     std::stringstream out;
     out << shader;
-    mShaderTrace.PushCall("CompileShader", out.str());
+    TraceCallStack::NamedParams namedParams;
+    namedParams["shader"] = ToString(shader);
+
+    mShaderTrace.PushCall("CompileShader", out.str(), namedParams);
   }
 
-  inline void CompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data)
+  inline void CompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data) override
   {
+    std::stringstream out;
+    out << target<<", "<<level<<", "<<width << ", " << height;
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["target"] = ToString(target);
+    namedParams["level"] = ToString(level);
+    namedParams["internalformat"] = ToString(internalformat);
+    namedParams["width"] = ToString(width);
+    namedParams["height"] = ToString(height);
+    namedParams["border"] = ToString(border);
+    namedParams["size"] = ToString(imageSize);
+
+    mTextureTrace.PushCall("CompressedTexImage2D", out.str(), namedParams);
   }
 
-  inline void CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data)
+  inline void CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data) override
   {
+    std::stringstream out;
+    out << target << ", "<<level <<", " << xoffset << ", " << yoffset << ", " << width << ", " << height;
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["target"] = ToString(target);
+    namedParams["level"] = ToString(level);
+    namedParams["xoffset"] = ToString(xoffset);
+    namedParams["yoffset"] = ToString(yoffset);
+    namedParams["width"] = ToString(width);
+    namedParams["height"] = ToString(height);
+    mTextureTrace.PushCall("CompressedTexSubImage2D", out.str(), namedParams);
   }
 
-  inline void CopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
+  inline void CopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border) override
   {
   }
 
-  inline void CopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
+  inline void CopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height) override
   {
   }
 
-  inline GLuint CreateProgram(void)
+  inline GLuint CreateProgram(void) override
   {
     mShaderTrace.PushCall("CreateProgram", "");
 
@@ -277,60 +369,82 @@ public:
     return mLastProgramIdUsed;
   }
 
-  inline GLuint CreateShader(GLenum type)
+  inline GLuint CreateShader(GLenum type) override
   {
     std::stringstream out;
     out << type;
-    mShaderTrace.PushCall("CreateShader", out.str());
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["type"] = ToString(type);
+    mShaderTrace.PushCall("CreateShader", out.str(), namedParams);
 
     return ++mLastShaderIdUsed;
   }
 
-  inline void CullFace(GLenum mode)
+  inline void CullFace(GLenum mode) override
   {
     std::stringstream out;
     out << mode;
-    mCullFaceTrace.PushCall("CullFace", out.str());
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["program"] = ToString(mode);
+
+    mCullFaceTrace.PushCall("CullFace", out.str(), namedParams);
   }
 
-  inline void DeleteBuffers(GLsizei n, const GLuint* buffers)
+  inline void DeleteBuffers(GLsizei n, const GLuint* buffers) override
   {
   }
 
-  inline void DeleteFramebuffers(GLsizei n, const GLuint* framebuffers)
+  inline void DeleteFramebuffers(GLsizei n, const GLuint* framebuffers) override
   {
   }
 
-  inline void DeleteProgram(GLuint program)
+  inline void DeleteProgram(GLuint program) override
   {
     std::stringstream out;
     out << program;
-    mShaderTrace.PushCall("DeleteProgram", out.str());
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["program"] = ToString(program);
+
+    mShaderTrace.PushCall("DeleteProgram", out.str(), namedParams);
   }
 
-  inline void DeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers)
+  inline void DeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers) override
   {
   }
 
-  inline void DeleteShader(GLuint shader)
+  inline void DeleteShader(GLuint shader) override
   {
     std::stringstream out;
     out << shader;
-    mShaderTrace.PushCall("DeleteShader", out.str());
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["shader"] = ToString(shader);
+
+    mShaderTrace.PushCall("DeleteShader", out.str(), namedParams);
   }
 
-  inline void DeleteTextures(GLsizei n, const GLuint* textures)
+  inline void DeleteTextures(GLsizei n, const GLuint* textures) override
   {
     std::stringstream out;
-    out << n << ", " << textures << " = [" ;
+    out << n << ", " << textures << " = [";
+
+    TraceCallStack::NamedParams namedParams;
 
     for(GLsizei i=0; i<n; i++)
     {
-      out << textures[i] << ", " ;
+      out << textures[i] << ", ";
+      std::stringstream paramName;
+      paramName<<"texture["<<i<<"]";
+      namedParams[paramName.str()] = ToString(textures[i]);
       mDeletedTextureIds.push_back(textures[i]);
+      mNumGeneratedTextures--;
     }
     out << "]";
-    mTextureTrace.PushCall("DeleteTextures", out.str());
+
+    mTextureTrace.PushCall("DeleteTextures", out.str(), namedParams);
   }
 
   inline bool CheckNoTexturesDeleted()
@@ -358,99 +472,167 @@ public:
     mDeletedTextureIds.clear();
   }
 
-  inline void DepthFunc(GLenum func)
+  inline void DepthFunc(GLenum func) override
   {
+    std::stringstream out;
+    out << func;
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["func"] = ToString(func);
+
+    mDepthFunctionTrace.PushCall("DepthFunc", out.str(), namedParams);
   }
 
-  inline void DepthMask(GLboolean flag)
+  inline void DepthMask(GLboolean flag) override
   {
+    mLastDepthMask = flag;
   }
 
-  inline void DepthRangef(GLclampf zNear, GLclampf zFar)
+  inline bool GetLastDepthMask() const
   {
+    return mLastDepthMask;
   }
 
-  inline void DetachShader(GLuint program, GLuint shader)
+  inline void DepthRangef(GLclampf zNear, GLclampf zFar) override
+  {
+  }
+
+  inline void DetachShader(GLuint program, GLuint shader) override
   {
     std::stringstream out;
     out << program << ", " << shader;
-    mShaderTrace.PushCall("DetachShader", out.str());
+    TraceCallStack::NamedParams namedParams;
+    namedParams["program"] = ToString(program);
+    namedParams["shader"] = ToString(shader);
+    mShaderTrace.PushCall("DetachShader", out.str(), namedParams);
   }
 
-  inline void Disable(GLenum cap)
+  inline void Disable(GLenum cap) override
   {
     std::stringstream out;
     out << cap;
-    mCullFaceTrace.PushCall("Disable", out.str());
+    TraceCallStack::NamedParams namedParams;
+    namedParams["cap"] = ToString(cap);
+    mEnableDisableTrace.PushCall("Disable", out.str(), namedParams);
   }
 
-  inline void DisableVertexAttribArray(GLuint index)
+  inline void DisableVertexAttribArray(GLuint index) override
   {
     SetVertexAttribArray( index, false );
   }
 
-  inline void DrawArrays(GLenum mode, GLint first, GLsizei count)
+  inline void DrawArrays(GLenum mode, GLint first, GLsizei count) override
   {
     std::stringstream out;
     out << mode << ", " << first << ", " << count;
-    mDrawTrace.PushCall("DrawArrays", out.str());
+    TraceCallStack::NamedParams namedParams;
+    namedParams["mode"] = ToString(mode);
+    namedParams["first"] = ToString(first);
+    namedParams["count"] = ToString(count);
+    mDrawTrace.PushCall("DrawArrays", out.str(), namedParams);
   }
 
-  inline void DrawElements(GLenum mode, GLsizei count, GLenum type, const void* indices)
+  inline void DrawElements(GLenum mode, GLsizei count, GLenum type, const void* indices) override
   {
     std::stringstream out;
     out << mode << ", " << count << ", " << type << ", indices";
-    mDrawTrace.PushCall("DrawElements", out.str());
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["mode"] = ToString(mode);
+    namedParams["count"] = ToString(count);
+    namedParams["type"] = ToString(type);
+    // Skip void pointers - are they of any use?
+    mDrawTrace.PushCall("DrawElements", out.str(), namedParams);
   }
 
-  inline void Enable(GLenum cap)
+  inline void Enable(GLenum cap) override
   {
     std::stringstream out;
     out << cap;
-    mCullFaceTrace.PushCall("Enable", out.str());
+    TraceCallStack::NamedParams namedParams;
+    namedParams["cap"] = ToString(cap);
+    mEnableDisableTrace.PushCall("Enable", out.str(), namedParams);
   }
 
-  inline void EnableVertexAttribArray(GLuint index)
+  inline void EnableVertexAttribArray(GLuint index) override
   {
     SetVertexAttribArray( index, true);
   }
 
-  inline void Finish(void)
+  inline void Finish(void) override
   {
   }
 
-  inline void Flush(void)
+  inline void Flush(void) override
   {
   }
 
-  inline void FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer)
+  inline void FramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer) override
   {
+    if (attachment == GL_DEPTH_ATTACHMENT)
+    {
+      mFramebufferDepthAttached = true;
+    }
+    else if (attachment == GL_STENCIL_ATTACHMENT)
+    {
+      mFramebufferStencilAttached = true;
+    }
   }
 
-  inline void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level)
+  inline void FramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) override
   {
+    //Add 100 bit;
+    mFramebufferStatus |= 4;
+
+    //We check 4 attachment colors
+    if ((attachment >= GL_COLOR_ATTACHMENT0) && (attachment < GL_COLOR_ATTACHMENT0 + Dali::DevelFrameBuffer::MAX_COLOR_ATTACHMENTS))
+    {
+      uint8_t mask = 1 << (attachment - GL_COLOR_ATTACHMENT0);
+      if ((mFrameBufferColorStatus & mask) == 0)
+      {
+        mFrameBufferColorStatus |= mask;
+        ++mFramebufferColorAttachmentCount;
+      }
+    }
   }
 
-  inline void FrontFace(GLenum mode)
+  inline void FrontFace(GLenum mode) override
   {
   }
 
-  inline void GenBuffers(GLsizei n, GLuint* buffers)
+  inline void GenBuffers(GLsizei n, GLuint* buffers) override
   {
     // avoids an assert in GpuBuffers
     *buffers = 1u;
   }
 
-  inline void GenerateMipmap(GLenum target)
+  inline void GenerateMipmap(GLenum target) override
   {
+    std::stringstream out;
+    out<<target;
+    TraceCallStack::NamedParams namedParams;
+    namedParams["target"] = ToString(target);
+
+    mTextureTrace.PushCall("GenerateMipmap", out.str(), namedParams);
   }
 
-  inline void GenFramebuffers(GLsizei n, GLuint* framebuffers)
+  inline void GenFramebuffers(GLsizei n, GLuint* framebuffers) override
   {
+    for( int i = 0; i < n; i++ )
+    {
+      framebuffers[i] = i + 1;
+    }
+
+    //Add 001 bit, this function needs to be called the first one in the chain
+    mFramebufferStatus = 1;
   }
 
-  inline void GenRenderbuffers(GLsizei n, GLuint* renderbuffers)
+  inline void GenRenderbuffers(GLsizei n, GLuint* renderbuffers) override
   {
+    for( int i = 0; i < n; i++ )
+    {
+      renderbuffers[i] = i + 1;
+    }
   }
 
   /**
@@ -467,9 +649,9 @@ public:
     return mNextTextureIds;
   }
 
-  inline void GenTextures(GLsizei n, GLuint* textures)
+  inline void GenTextures(GLsizei count, GLuint* textures) override
   {
-    for( int i=0; i<n; ++i )
+    for( int i=0; i<count; ++i )
     {
       if( !mNextTextureIds.empty() )
       {
@@ -480,33 +662,71 @@ public:
       {
         *(textures+i) = ++mLastAutoTextureIdUsed;
       }
+      mNumGeneratedTextures++;
     }
 
+    TraceCallStack::NamedParams namedParams;
+    namedParams["count"] = ToString(count);
+
     std::stringstream out;
-    for(int i=0; i<n; i++)
+    for(int i=0; i<count; i++)
     {
       out << textures[i];
-      if(i<n-1)
+      if(i<count-1)
       {
         out << ", ";
       }
+      std::ostringstream oss;
+      oss<<"indices["<<i<<"]";
+      namedParams[oss.str()] = ToString(textures[i]);
     }
-    mTextureTrace.PushCall("GenTexture", out.str());
+
+    mTextureTrace.PushCall("GenTextures", out.str(), namedParams);
   }
 
-  inline void GetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
+  inline GLuint GetLastGenTextureId()
   {
+    return mLastAutoTextureIdUsed;
   }
 
-  inline void GetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name)
+  inline GLuint GetNumGeneratedTextures()
   {
+    return mNumGeneratedTextures;
   }
 
-  inline void GetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders)
+  inline void GetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name) override
   {
   }
 
-  inline int  GetAttribLocation(GLuint program, const char* name)
+  inline void GetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name) override
+  {
+    switch(index)
+    {
+      case 0:
+        *length = snprintf(name, bufsize, "sTexture");
+        *type = GL_SAMPLER_2D;
+        *size = 1;
+        break;
+      case 1:
+        *length = snprintf(name, bufsize, "sEffect");
+        *type = GL_SAMPLER_2D;
+        *size = 1;
+        break;
+      case 2:
+        *length = snprintf(name, bufsize, "sGloss");
+        *type = GL_SAMPLER_2D;
+        *size = 1;
+        break;
+      default:
+        break;
+    }
+  }
+
+  inline void GetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders) override
+  {
+  }
+
+  inline int  GetAttribLocation(GLuint program, const char* name) override
   {
     std::string attribName(name);
 
@@ -522,28 +742,28 @@ public:
     return 0;
   }
 
-  inline void GetBooleanv(GLenum pname, GLboolean* params)
+  inline void GetBooleanv(GLenum pname, GLboolean* params) override
   {
   }
 
-  inline void GetBufferParameteriv(GLenum target, GLenum pname, GLint* params)
+  inline void GetBufferParameteriv(GLenum target, GLenum pname, GLint* params) override
   {
   }
 
-  inline GLenum GetError(void)
+  inline GLenum GetError(void) override
   {
     return mGetErrorResult;
   }
 
-  inline void GetFloatv(GLenum pname, GLfloat* params)
+  inline void GetFloatv(GLenum pname, GLfloat* params) override
   {
   }
 
-  inline void GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params)
+  inline void GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params) override
   {
   }
 
-  inline void GetIntegerv(GLenum pname, GLint* params)
+  inline void GetIntegerv(GLenum pname, GLint* params) override
   {
     switch( pname )
     {
@@ -562,28 +782,34 @@ public:
     }
   }
 
-  inline void GetProgramiv(GLuint program, GLenum pname, GLint* params)
+  inline void GetProgramiv(GLuint program, GLenum pname, GLint* params) override
   {
-    switch( pname ) {
+    switch( pname )
+    {
       case GL_LINK_STATUS:
         *params = mLinkStatus;
         break;
       case GL_PROGRAM_BINARY_LENGTH_OES:
         *params = mProgramBinaryLength;
         break;
+      case GL_ACTIVE_UNIFORMS:
+        *params = mNumberOfActiveUniforms;
+        break;
+      case GL_ACTIVE_UNIFORM_MAX_LENGTH:
+        *params = 100;
+        break;
     }
   }
 
-  inline void GetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog)
+  inline void GetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog) override
   {
   }
 
-
-  inline void GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params)
+  inline void GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params) override
   {
   }
 
-  inline void GetShaderiv(GLuint shader, GLenum pname, GLint* params)
+  inline void GetShaderiv(GLuint shader, GLenum pname, GLint* params) override
   {
     switch( pname ) {
       case GL_COMPILE_STATUS:
@@ -592,36 +818,36 @@ public:
     }
   }
 
-  inline void GetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog)
+  inline void GetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog) override
   {
   }
 
-  inline void GetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision)
+  inline void GetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision) override
   {
   }
 
-  inline const GLubyte* GetString(GLenum name)
+  inline const GLubyte* GetString(GLenum name) override
   {
     return mGetStringResult;
   }
 
-  inline void GetTexParameterfv(GLenum target, GLenum pname, GLfloat* params)
+  inline void GetTexParameterfv(GLenum target, GLenum pname, GLfloat* params) override
   {
   }
 
-  inline void GetTexParameteriv(GLenum target, GLenum pname, GLint* params)
+  inline void GetTexParameteriv(GLenum target, GLenum pname, GLint* params) override
   {
   }
 
-  inline void GetUniformfv(GLuint program, GLint location, GLfloat* params)
+  inline void GetUniformfv(GLuint program, GLint location, GLfloat* params) override
   {
   }
 
-  inline void GetUniformiv(GLuint program, GLint location, GLint* params)
+  inline void GetUniformiv(GLuint program, GLint location, GLint* params) override
   {
   }
 
-  inline GLint GetUniformLocation(GLuint program, const char* name)
+  inline GLint GetUniformLocation(GLuint program, const char* name) override
   {
     ProgramUniformMap::iterator it = mUniforms.find(program);
     if( it == mUniforms.end() )
@@ -643,105 +869,122 @@ public:
     return it2->second;
   }
 
-  inline void GetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params)
+  inline void GetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params) override
   {
   }
 
-  inline void GetVertexAttribiv(GLuint index, GLenum pname, GLint* params)
+  inline void GetVertexAttribiv(GLuint index, GLenum pname, GLint* params) override
   {
   }
 
-  inline void GetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer)
+  inline void GetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer) override
   {
   }
 
-  inline void Hint(GLenum target, GLenum mode)
+  inline void Hint(GLenum target, GLenum mode) override
   {
   }
 
-  inline GLboolean IsBuffer(GLuint buffer)
+  inline GLboolean IsBuffer(GLuint buffer) override
   {
     return mIsBufferResult;
   }
 
-  inline GLboolean IsEnabled(GLenum cap)
+  inline GLboolean IsEnabled(GLenum cap) override
   {
     return mIsEnabledResult;
   }
 
-  inline GLboolean IsFramebuffer(GLuint framebuffer)
+  inline GLboolean IsFramebuffer(GLuint framebuffer) override
   {
     return mIsFramebufferResult;
   }
 
-  inline GLboolean IsProgram(GLuint program)
+  inline GLboolean IsProgram(GLuint program) override
   {
     return mIsProgramResult;
   }
 
-  inline GLboolean IsRenderbuffer(GLuint renderbuffer)
+  inline GLboolean IsRenderbuffer(GLuint renderbuffer) override
   {
     return mIsRenderbufferResult;
   }
 
-  inline GLboolean IsShader(GLuint shader)
+  inline GLboolean IsShader(GLuint shader) override
   {
     return mIsShaderResult;
   }
 
-  inline GLboolean IsTexture(GLuint texture)
+  inline GLboolean IsTexture(GLuint texture) override
   {
     return mIsTextureResult;
   }
 
-  inline void LineWidth(GLfloat width)
+  inline void LineWidth(GLfloat width) override
   {
   }
 
-  inline void LinkProgram(GLuint program)
+  inline void LinkProgram(GLuint program) override
   {
     std::stringstream out;
     out << program;
-    mShaderTrace.PushCall("LinkProgram", out.str());
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["program"] = ToString(program);
+    mShaderTrace.PushCall("LinkProgram", out.str(), namedParams);
+
+    mNumberOfActiveUniforms=3;
+    GetUniformLocation(program, "sTexture");
+    GetUniformLocation(program, "sEffect");
+    GetUniformLocation(program, "sGloss");
   }
 
-  inline void PixelStorei(GLenum pname, GLint param)
+  inline void PixelStorei(GLenum pname, GLint param) override
   {
   }
 
-  inline void PolygonOffset(GLfloat factor, GLfloat units)
+  inline void PolygonOffset(GLfloat factor, GLfloat units) override
   {
   }
 
-  inline void ReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels)
+  inline void ReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void* pixels) override
   {
   }
 
-  inline void ReleaseShaderCompiler(void)
+  inline void ReleaseShaderCompiler(void) override
   {
   }
 
-  inline void RenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height)
+  inline void RenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height) override
   {
   }
 
-  inline void SampleCoverage(GLclampf value, GLboolean invert)
+  inline void SampleCoverage(GLclampf value, GLboolean invert) override
   {
   }
 
-  inline void Scissor(GLint x, GLint y, GLsizei width, GLsizei height)
+  inline void Scissor(GLint x, GLint y, GLsizei width, GLsizei height) override
   {
     mScissorParams.x = x;
     mScissorParams.y = y;
     mScissorParams.width = width;
     mScissorParams.height = height;
+
+    std::stringstream out;
+    out << x << ", " << y << ", " << width << ", " << height;
+    TraceCallStack::NamedParams namedParams;
+    namedParams["x"] = ToString( x );
+    namedParams["y"] = ToString( y );
+    namedParams["width"] = ToString( width );
+    namedParams["height"] = ToString( height );
+    mScissorTrace.PushCall( "Scissor", out.str(), namedParams );
   }
 
-  inline void ShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length)
+  inline void ShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length) override
   {
   }
 
-  inline void ShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length)
+  inline void ShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length) override
   {
     std::string stringBuilder;
     for(int i = 0; i < count; ++i)
@@ -752,13 +995,14 @@ public:
     mLastShaderCompiled = shader;
   }
 
-  inline void GetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char* source)
+  inline void GetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char* source) override
   {
     const std::string shaderSource = mShaderSources[shader];
-    if( static_cast<int>(shaderSource.length()) < bufsize )
+    const int shaderSourceLength = static_cast<int>(shaderSource.length());
+    if( shaderSourceLength < bufsize )
     {
-      strcpy(source, shaderSource.c_str());
-      *length = shaderSource.length();
+      strncpy( source, shaderSource.c_str(), shaderSourceLength );
+      *length = shaderSourceLength;
     }
     else
     {
@@ -773,82 +1017,185 @@ public:
     return mShaderSources[shader];
   }
 
-  inline void StencilFunc(GLenum func, GLint ref, GLuint mask)
+  inline void StencilFunc(GLenum func, GLint ref, GLuint mask) override
   {
+    std::stringstream out;
+    out << func << ", " << ref << ", " << mask;
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["func"] = ToString( func );
+    namedParams["ref"] = ToString( ref );
+    namedParams["mask"] = ToString( mask );
+
+    mStencilFunctionTrace.PushCall( "StencilFunc", out.str(), namedParams );
   }
 
-  inline void StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask)
+  inline void StencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask) override
   {
+    std::stringstream out;
+    out << face << ", " << func << ", " << ref << ", " << mask;
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["face"] = ToString( face );
+    namedParams["func"] = ToString( func );
+    namedParams["ref"] = ToString( ref );
+    namedParams["mask"] = ToString( mask );
+
+    mStencilFunctionTrace.PushCall( "StencilFuncSeparate", out.str(), namedParams );
   }
 
-  inline void StencilMask(GLuint mask)
+  inline void StencilMask(GLuint mask) override
   {
+    std::stringstream out;
+    out << mask;
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["mask"] = ToString( mask );
+
+    mStencilFunctionTrace.PushCall( "StencilMask", out.str(), namedParams );
   }
 
-  inline void StencilMaskSeparate(GLenum face, GLuint mask)
+  inline void StencilMaskSeparate(GLenum face, GLuint mask) override
   {
+    std::stringstream out;
+    out << face << ", " << mask;
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["face"] = ToString( face );
+    namedParams["mask"] = ToString( mask );
+
+    mStencilFunctionTrace.PushCall( "StencilMaskSeparate", out.str(), namedParams );
   }
 
-  inline void StencilOp(GLenum fail, GLenum zfail, GLenum zpass)
+  inline void StencilOp(GLenum fail, GLenum zfail, GLenum zpass) override
   {
+    std::stringstream out;
+    out << fail << ", " << zfail << ", " << zpass;
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["fail"] = ToString( fail );
+    namedParams["zfail"] = ToString( zfail );
+    namedParams["zpass"] = ToString( zpass );
+
+    mStencilFunctionTrace.PushCall( "StencilOp", out.str(), namedParams );
   }
 
-  inline void StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass)
+  inline void StencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass) override
   {
+    std::stringstream out;
+    out << face << ", " << fail << ", " << zfail << "," << zpass;
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["face"] = ToString( face );
+    namedParams["fail"] = ToString( fail );
+    namedParams["zfail"] = ToString( zfail );
+    namedParams["zpass"] = ToString( zpass );
+
+    mStencilFunctionTrace.PushCall( "StencilOpSeparate", out.str(), namedParams );
   }
 
-  inline void TexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels)
+  inline void TexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const void* pixels) override
   {
     std::stringstream out;
-    out << width << ", " << height;
-    mTextureTrace.PushCall("TexImage2D", out.str());
+    out << target<<", "<<level<<", "<<width << ", " << height;
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["target"] = ToString(target);
+    namedParams["level"] = ToString(level);
+    namedParams["internalformat"] = ToString(internalformat);
+    namedParams["width"] = ToString(width);
+    namedParams["height"] = ToString(height);
+    namedParams["border"] = ToString(border);
+    namedParams["format"] = ToString(format);
+    namedParams["type"] = ToString(type);
+
+    mTextureTrace.PushCall("TexImage2D", out.str(), namedParams);
   }
 
-  inline void TexParameterf(GLenum target, GLenum pname, GLfloat param)
+  inline void TexParameterf(GLenum target, GLenum pname, GLfloat param) override
   {
     std::stringstream out;
     out << target << ", " << pname << ", " << param;
-    mTexParamaterTrace.PushCall("TexParameterf", out.str());
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["target"] = ToString(target);
+    namedParams["pname"] = ToString(pname);
+    namedParams["param"] = ToString(param);
+
+    mTexParamaterTrace.PushCall("TexParameterf", out.str(), namedParams);
   }
 
-  inline void TexParameterfv(GLenum target, GLenum pname, const GLfloat* params)
+  inline void TexParameterfv(GLenum target, GLenum pname, const GLfloat* params) override
   {
     std::stringstream out;
     out << target << ", " << pname << ", " << params[0];
-    mTexParamaterTrace.PushCall("TexParameterfv", out.str());
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["target"] = ToString(target);
+    namedParams["pname"] = ToString(pname);
+    namedParams["params[0]"] = ToString(params[0]);
+
+    mTexParamaterTrace.PushCall("TexParameterfv", out.str(), namedParams);
   }
 
-  inline void TexParameteri(GLenum target, GLenum pname, GLint param)
+  inline void TexParameteri(GLenum target, GLenum pname, GLint param) override
   {
     std::stringstream out;
     out << target << ", " << pname << ", " << param;
-    mTexParamaterTrace.PushCall("TexParameteri", out.str());
+    TraceCallStack::NamedParams namedParams;
+    namedParams["target"] = ToString(target);
+    namedParams["pname"] = ToString(pname);
+    namedParams["param"] = ToString(param);
+    mTexParamaterTrace.PushCall("TexParameteri", out.str(), namedParams);
   }
 
-  inline void TexParameteriv(GLenum target, GLenum pname, const GLint* params)
+  inline void TexParameteriv(GLenum target, GLenum pname, const GLint* params) override
   {
     std::stringstream out;
     out << target << ", " << pname << ", " << params[0];
-    mTexParamaterTrace.PushCall("TexParameteriv", out.str());
+    TraceCallStack::NamedParams namedParams;
+    namedParams["target"] = ToString(target);
+    namedParams["pname"] = ToString(pname);
+    namedParams["params[0]"] = ToString(params[0]);
+    mTexParamaterTrace.PushCall("TexParameteriv", out.str(), namedParams);
   }
 
-  inline void TexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels)
+  inline void TexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const void* pixels) override
   {
     std::stringstream out;
-    out << xoffset << ", " << yoffset << ", " << width << ", " << height;
-    mTextureTrace.PushCall("TexSubImage2D", out.str());
+    out << target << ", "<<level <<", " << xoffset << ", " << yoffset << ", " << width << ", " << height;
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["target"] = ToString(target);
+    namedParams["level"] = ToString(level);
+    namedParams["xoffset"] = ToString(xoffset);
+    namedParams["yoffset"] = ToString(yoffset);
+    namedParams["width"] = ToString(width);
+    namedParams["height"] = ToString(height);
+    mTextureTrace.PushCall("TexSubImage2D", out.str(), namedParams);
   }
 
-  inline void Uniform1f(GLint location, GLfloat x)
+  inline void Uniform1f(GLint location, GLfloat value ) override
   {
-    if( ! mProgramUniforms1f.SetUniformValue( mCurrentProgram, location, x ) )
+    std::string params = ToString( value );
+    AddUniformCallToTraceStack( location, params );
+
+    if( ! mProgramUniforms1f.SetUniformValue( mCurrentProgram, location, value ) )
     {
       mGetErrorResult = GL_INVALID_OPERATION;
     }
   }
 
-  inline void Uniform1fv(GLint location, GLsizei count, const GLfloat* v)
+  inline void Uniform1fv(GLint location, GLsizei count, const GLfloat* v) override
   {
+    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] ) )
@@ -859,16 +1206,23 @@ public:
     }
   }
 
-  inline void Uniform1i(GLint location, GLint x)
+  inline void Uniform1i(GLint location, GLint x) override
   {
+    std::string params = ToString( x );
+
+    AddUniformCallToTraceStack( location,  params );
+
     if( ! mProgramUniforms1i.SetUniformValue( mCurrentProgram, location, x ) )
     {
       mGetErrorResult = GL_INVALID_OPERATION;
     }
   }
 
-  inline void Uniform1iv(GLint location, GLsizei count, const GLint* v)
+  inline void Uniform1iv(GLint location, GLsizei count, const GLint* v) override
   {
+    std::string params = ToString( v );
+    AddUniformCallToTraceStack( location, params );
+
     for( int i = 0; i < count; ++i )
     {
       if( ! mProgramUniforms1i.SetUniformValue( mCurrentProgram,
@@ -881,8 +1235,11 @@ public:
     }
   }
 
-  inline void Uniform2f(GLint location, GLfloat x, GLfloat y)
+  inline void Uniform2f(GLint location, GLfloat x, GLfloat y) override
   {
+    std::string params = ToString( x ) + "," + ToString( y );
+    AddUniformCallToTraceStack( location, params );
+
     if( ! mProgramUniforms2f.SetUniformValue( mCurrentProgram,
                                                location,
                                                Vector2( x, y ) ) )
@@ -891,8 +1248,11 @@ public:
     }
   }
 
-  inline void Uniform2fv(GLint location, GLsizei count, const GLfloat* v)
+  inline void Uniform2fv(GLint location, GLsizei count, const GLfloat* v) override
   {
+    std::string params = ToString( v );
+    AddUniformCallToTraceStack( location, params );
+
     for( int i = 0; i < count; ++i )
     {
       if( ! mProgramUniforms2f.SetUniformValue( mCurrentProgram,
@@ -905,16 +1265,23 @@ public:
     }
   }
 
-  inline void Uniform2i(GLint location, GLint x, GLint y)
+  inline void Uniform2i(GLint location, GLint x, GLint y) override
   {
+    std::string params = ToString( x ) + "," + ToString( y );
+    AddUniformCallToTraceStack( location, params );
   }
 
-  inline void Uniform2iv(GLint location, GLsizei count, const GLint* v)
+  inline void Uniform2iv(GLint location, GLsizei count, const GLint* v) override
   {
+    std::string params = ToString( v );
+    AddUniformCallToTraceStack( location, params );
   }
 
-  inline void Uniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z)
+  inline void Uniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z) override
   {
+    std::string params = ToString( x ) + "," + ToString( y ) + "," + ToString( z );
+    AddUniformCallToTraceStack( location, params );
+
     if( ! mProgramUniforms3f.SetUniformValue( mCurrentProgram,
                                                location,
                                                Vector3( x, y, z ) ) )
@@ -923,8 +1290,11 @@ public:
     }
   }
 
-  inline void Uniform3fv(GLint location, GLsizei count, const GLfloat* v)
+  inline void Uniform3fv(GLint location, GLsizei count, const GLfloat* v) override
   {
+    std::string params = ToString( v );
+    AddUniformCallToTraceStack( location, params );
+
     for( int i = 0; i < count; ++i )
     {
       if( ! mProgramUniforms3f.SetUniformValue(
@@ -938,16 +1308,23 @@ public:
     }
   }
 
-  inline void Uniform3i(GLint location, GLint x, GLint y, GLint z)
+  inline void Uniform3i(GLint location, GLint x, GLint y, GLint z) override
   {
+    std::string params = ToString( x ) + "," + ToString( y ) + "," + ToString( z );
+    AddUniformCallToTraceStack( location, params );
   }
 
-  inline void Uniform3iv(GLint location, GLsizei count, const GLint* v)
+  inline void Uniform3iv(GLint location, GLsizei count, const GLint* v) override
   {
+    std::string params = ToString( v );
+    AddUniformCallToTraceStack( location, params );
   }
 
-  inline void Uniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+  inline void Uniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w) override
   {
+    std::string params = ToString( x ) + "," + ToString( y ) + "," + ToString( z ) + "," + ToString( w );
+    AddUniformCallToTraceStack( location, params );
+
     if( ! mProgramUniforms4f.SetUniformValue( mCurrentProgram,
                                               location,
                                               Vector4( x, y, z, w ) ) )
@@ -956,8 +1333,11 @@ public:
     }
   }
 
-  inline void Uniform4fv(GLint location, GLsizei count, const GLfloat* v)
+  inline void Uniform4fv(GLint location, GLsizei count, const GLfloat* v) override
   {
+    std::string params = ToString( v );
+    AddUniformCallToTraceStack( location, params );
+
     for( int i = 0; i < count; ++i )
     {
       if( ! mProgramUniforms4f.SetUniformValue(
@@ -971,20 +1351,29 @@ public:
     }
   }
 
-  inline void Uniform4i(GLint location, GLint x, GLint y, GLint z, GLint w)
+  inline void Uniform4i(GLint location, GLint x, GLint y, GLint z, GLint w) override
   {
+    std::string params = ToString( x ) + "," + ToString( y ) + "," + ToString( z ) + "," + ToString( w );
+    AddUniformCallToTraceStack( location, params );
   }
 
-  inline void Uniform4iv(GLint location, GLsizei count, const GLint* v)
+  inline void Uniform4iv(GLint location, GLsizei count, const GLint* v) override
   {
+    std::string params = ToString( v );
+    AddUniformCallToTraceStack( location, params );
   }
 
-  inline void UniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
+  inline void UniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) override
   {
+    std::string params = ToString( value );
+    AddUniformCallToTraceStack( location, params );
   }
 
-  inline void UniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
+  inline void UniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) override
   {
+    std::string params = ToString( value );
+    AddUniformCallToTraceStack( location, params );
+
     for( int i = 0; i < count; ++i )
     {
       if( ! mProgramUniformsMat3.SetUniformValue(
@@ -998,8 +1387,11 @@ public:
     }
   }
 
-  inline void UniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
+  inline void UniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) override
   {
+    std::string params = ToString( value );
+    AddUniformCallToTraceStack( location, params );
+
     for( int i = 0; i < count; ++i )
     {
       if( ! mProgramUniformsMat4.SetUniformValue(
@@ -1013,485 +1405,515 @@ public:
     }
   }
 
-  inline void UseProgram(GLuint program)
+  inline void UseProgram(GLuint program) override
   {
     mCurrentProgram = program;
   }
 
-  inline void ValidateProgram(GLuint program)
+  inline void ValidateProgram(GLuint program) override
   {
   }
 
-  inline void VertexAttrib1f(GLuint indx, GLfloat x)
+  inline void VertexAttrib1f(GLuint indx, GLfloat x) override
   {
   }
 
-  inline void VertexAttrib1fv(GLuint indx, const GLfloat* values)
+  inline void VertexAttrib1fv(GLuint indx, const GLfloat* values) override
   {
   }
 
-  inline void VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y)
+  inline void VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y) override
   {
   }
 
-  inline void VertexAttrib2fv(GLuint indx, const GLfloat* values)
+  inline void VertexAttrib2fv(GLuint indx, const GLfloat* values) override
   {
   }
 
-  inline void VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z)
+  inline void VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z) override
   {
   }
 
-  inline void VertexAttrib3fv(GLuint indx, const GLfloat* values)
+  inline void VertexAttrib3fv(GLuint indx, const GLfloat* values) override
   {
   }
 
-  inline void VertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w)
+  inline void VertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w) override
   {
   }
 
-  inline void VertexAttrib4fv(GLuint indx, const GLfloat* values)
+  inline void VertexAttrib4fv(GLuint indx, const GLfloat* values) override
   {
   }
 
-  inline void VertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr)
+  inline void VertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr) override
   {
   }
 
-  inline void Viewport(GLint x, GLint y, GLsizei width, GLsizei height)
+  inline void Viewport(GLint x, GLint y, GLsizei width, GLsizei height) override
   {
+    std::string commaString(", ");
+    std::string params( std::to_string(x) + commaString + std::to_string(y) + commaString + std::to_string(width) + commaString + std::to_string(height) );
+
+    mViewportTrace.PushCall("Viewport", params);
   }
 
   /* OpenGL ES 3.0 */
 
-  inline void ReadBuffer(GLenum mode)
+  inline void ReadBuffer(GLenum mode) override
   {
   }
 
-  inline void DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid* indices)
+  inline void DrawRangeElements(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid* indices) override
   {
   }
 
-  inline void TexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels)
+  inline void TexImage3D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid* pixels) override
   {
   }
 
-  inline void TexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels)
+  inline void TexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid* pixels) override
   {
   }
 
-  inline void CopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
+  inline void CopyTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height) override
   {
   }
 
-  inline void CompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data)
+  inline void CompressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid* data) override
   {
   }
 
-  inline void CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data)
+  inline void CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid* data) override
   {
   }
 
-  inline void GenQueries(GLsizei n, GLuint* ids)
+  inline void GenQueries(GLsizei n, GLuint* ids) override
   {
   }
 
-  inline void DeleteQueries(GLsizei n, const GLuint* ids)
+  inline void DeleteQueries(GLsizei n, const GLuint* ids) override
   {
   }
 
-  inline GLboolean IsQuery(GLuint id)
+  inline GLboolean IsQuery(GLuint id) override
   {
     return false;
   }
 
-  inline void BeginQuery(GLenum target, GLuint id)
+  inline void BeginQuery(GLenum target, GLuint id) override
   {
   }
 
-  inline void EndQuery(GLenum target)
+  inline void EndQuery(GLenum target) override
   {
   }
 
-  inline void GetQueryiv(GLenum target, GLenum pname, GLint* params)
+  inline void GetQueryiv(GLenum target, GLenum pname, GLint* params) override
   {
   }
 
-  inline void GetQueryObjectuiv(GLuint id, GLenum pname, GLuint* params)
+  inline void GetQueryObjectuiv(GLuint id, GLenum pname, GLuint* params) override
   {
   }
 
-  inline GLboolean UnmapBuffer(GLenum target)
+  inline GLboolean UnmapBuffer(GLenum target) override
   {
     return false;
   }
 
-  inline void GetBufferPointerv(GLenum target, GLenum pname, GLvoid** params)
+  inline void GetBufferPointerv(GLenum target, GLenum pname, GLvoid** params) override
   {
   }
 
-  inline void DrawBuffers(GLsizei n, const GLenum* bufs)
+  inline void DrawBuffers(GLsizei n, const GLenum* bufs) override
   {
   }
 
-  inline void UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
+  inline void UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) override
   {
   }
 
-  inline void UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
+  inline void UniformMatrix3x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) override
   {
   }
 
-  inline void UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
+  inline void UniformMatrix2x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) override
   {
   }
 
-  inline void UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
+  inline void UniformMatrix4x2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) override
   {
   }
 
-  inline void UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
+  inline void UniformMatrix3x4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) override
   {
   }
 
-  inline void UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value)
+  inline void UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) override
   {
   }
 
-  inline void BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter)
+  inline void BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) override
   {
   }
 
-  inline void RenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height)
+  inline void RenderbufferStorageMultisample(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height) override
   {
   }
 
-  inline void FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer)
+  inline void FramebufferTextureLayer(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer) override
   {
   }
 
-  inline GLvoid* MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access)
+  inline GLvoid* MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access) override
   {
     return NULL;
   }
 
-  inline void FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length)
+  inline void FlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length) override
   {
   }
 
-  inline void BindVertexArray(GLuint array)
+  inline void BindVertexArray(GLuint array) override
   {
   }
 
-  inline void DeleteVertexArrays(GLsizei n, const GLuint* arrays)
+  inline void DeleteVertexArrays(GLsizei n, const GLuint* arrays) override
   {
   }
 
-  inline void GenVertexArrays(GLsizei n, GLuint* arrays)
+  inline void GenVertexArrays(GLsizei n, GLuint* arrays) override
   {
   }
 
-  inline GLboolean IsVertexArray(GLuint array)
+  inline GLboolean IsVertexArray(GLuint array) override
   {
     return false;
   }
 
-  inline void GetIntegeri_v(GLenum target, GLuint index, GLint* data)
+  inline void GetIntegeri_v(GLenum target, GLuint index, GLint* data) override
   {
   }
 
-  inline void BeginTransformFeedback(GLenum primitiveMode)
+  inline void BeginTransformFeedback(GLenum primitiveMode) override
   {
   }
 
-  inline void EndTransformFeedback(void)
+  inline void EndTransformFeedback(void) override
   {
   }
 
-  inline void BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size)
+  inline void BindBufferRange(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size) override
   {
   }
 
-  inline void BindBufferBase(GLenum target, GLuint index, GLuint buffer)
+  inline void BindBufferBase(GLenum target, GLuint index, GLuint buffer) override
   {
   }
 
-  inline void TransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const* varyings, GLenum bufferMode)
+  inline void TransformFeedbackVaryings(GLuint program, GLsizei count, const GLchar* const* varyings, GLenum bufferMode) override
   {
   }
 
-  inline void GetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name)
+  inline void GetTransformFeedbackVarying(GLuint program, GLuint index, GLsizei bufSize, GLsizei* length, GLsizei* size, GLenum* type, GLchar* name) override
   {
   }
 
-  inline void VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer)
+  inline void VertexAttribIPointer(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid* pointer) override
   {
   }
 
-  inline void GetVertexAttribIiv(GLuint index, GLenum pname, GLint* params)
+  inline void GetVertexAttribIiv(GLuint index, GLenum pname, GLint* params) override
   {
   }
 
-  inline void GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint* params)
+  inline void GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint* params) override
   {
   }
 
-  inline void VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w)
+  inline void VertexAttribI4i(GLuint index, GLint x, GLint y, GLint z, GLint w) override
   {
   }
 
-  inline void VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w)
+  inline void VertexAttribI4ui(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w) override
   {
   }
 
-  inline void VertexAttribI4iv(GLuint index, const GLint* v)
+  inline void VertexAttribI4iv(GLuint index, const GLint* v) override
   {
   }
 
-  inline void VertexAttribI4uiv(GLuint index, const GLuint* v)
+  inline void VertexAttribI4uiv(GLuint index, const GLuint* v) override
   {
   }
 
-  inline void GetUniformuiv(GLuint program, GLint location, GLuint* params)
+  inline void GetUniformuiv(GLuint program, GLint location, GLuint* params) override
   {
   }
 
-  inline GLint GetFragDataLocation(GLuint program, const GLchar *name)
+  inline GLint GetFragDataLocation(GLuint program, const GLchar *name) override
   {
     return -1;
   }
 
-  inline void Uniform1ui(GLint location, GLuint v0)
+  inline void Uniform1ui(GLint location, GLuint v0) override
   {
   }
 
-  inline void Uniform2ui(GLint location, GLuint v0, GLuint v1)
+  inline void Uniform2ui(GLint location, GLuint v0, GLuint v1) override
   {
   }
 
-  inline void Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
+  inline void Uniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2) override
   {
   }
 
-  inline void Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
+  inline void Uniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3) override
   {
   }
 
-  inline void Uniform1uiv(GLint location, GLsizei count, const GLuint* value)
+  inline void Uniform1uiv(GLint location, GLsizei count, const GLuint* value) override
   {
   }
 
-  inline void Uniform2uiv(GLint location, GLsizei count, const GLuint* value)
+  inline void Uniform2uiv(GLint location, GLsizei count, const GLuint* value) override
   {
   }
 
-  inline void Uniform3uiv(GLint location, GLsizei count, const GLuint* value)
+  inline void Uniform3uiv(GLint location, GLsizei count, const GLuint* value) override
   {
   }
 
-  inline void Uniform4uiv(GLint location, GLsizei count, const GLuint* value)
+  inline void Uniform4uiv(GLint location, GLsizei count, const GLuint* value) override
   {
   }
 
-  inline void ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint* value)
+  inline void ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint* value) override
   {
   }
 
-  inline void ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint* value)
+  inline void ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint* value) override
   {
   }
 
-  inline void ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat* value)
+  inline void ClearBufferfv(GLenum buffer, GLint drawbuffer, const GLfloat* value) override
   {
   }
 
-  inline void ClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil)
+  inline void ClearBufferfi(GLenum buffer, GLint drawbuffer, GLfloat depth, GLint stencil) override
   {
   }
 
-  inline const GLubyte* GetStringi(GLenum name, GLuint index)
+  inline const GLubyte* GetStringi(GLenum name, GLuint index) override
   {
     return NULL;
   }
 
-  inline void CopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size)
+  inline void CopyBufferSubData(GLenum readTarget, GLenum writeTarget, GLintptr readOffset, GLintptr writeOffset, GLsizeiptr size) override
   {
   }
 
-  inline void GetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const* uniformNames, GLuint* uniformIndices)
+  inline void GetUniformIndices(GLuint program, GLsizei uniformCount, const GLchar* const* uniformNames, GLuint* uniformIndices) override
   {
   }
 
-  inline void GetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params)
+  inline void GetActiveUniformsiv(GLuint program, GLsizei uniformCount, const GLuint* uniformIndices, GLenum pname, GLint* params) override
   {
   }
 
-  inline GLuint GetUniformBlockIndex(GLuint program, const GLchar* uniformBlockName)
+  inline GLuint GetUniformBlockIndex(GLuint program, const GLchar* uniformBlockName) override
   {
     return GL_INVALID_INDEX;
   }
 
-  inline void GetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params)
+  inline void GetActiveUniformBlockiv(GLuint program, GLuint uniformBlockIndex, GLenum pname, GLint* params) override
   {
   }
 
-  inline void GetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName)
+  inline void GetActiveUniformBlockName(GLuint program, GLuint uniformBlockIndex, GLsizei bufSize, GLsizei* length, GLchar* uniformBlockName) override
   {
   }
 
-  inline void UniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding)
+  inline void UniformBlockBinding(GLuint program, GLuint uniformBlockIndex, GLuint uniformBlockBinding) override
   {
   }
 
-  inline void DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount)
+  inline void DrawArraysInstanced(GLenum mode, GLint first, GLsizei count, GLsizei instanceCount) override
   {
   }
 
-  inline void DrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices, GLsizei instanceCount)
+  inline void DrawElementsInstanced(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices, GLsizei instanceCount) override
   {
   }
 
-  inline GLsync FenceSync(GLenum condition, GLbitfield flags)
+  inline GLsync FenceSync(GLenum condition, GLbitfield flags) override
   {
     return NULL;
   }
 
-  inline GLboolean IsSync(GLsync sync)
+  inline GLboolean IsSync(GLsync sync) override
   {
     return false;
   }
 
-  inline void DeleteSync(GLsync sync)
+  inline void DeleteSync(GLsync sync) override
   {
   }
 
-  inline GLenum ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
+  inline GLenum ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) override
   {
     return 0;
   }
 
-  inline void WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout)
+  inline void WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) override
   {
   }
 
-  inline void GetInteger64v(GLenum pname, GLint64* params)
+  inline void GetInteger64v(GLenum pname, GLint64* params) override
   {
   }
 
-  inline void GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values)
+  inline void GetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei* length, GLint* values) override
   {
   }
 
-  inline void GetInteger64i_v(GLenum target, GLuint index, GLint64* data)
+  inline void GetInteger64i_v(GLenum target, GLuint index, GLint64* data) override
   {
   }
 
-  inline void GetBufferParameteri64v(GLenum target, GLenum pname, GLint64* params)
+  inline void GetBufferParameteri64v(GLenum target, GLenum pname, GLint64* params) override
   {
   }
 
-  inline void GenSamplers(GLsizei count, GLuint* samplers)
+  inline void GenSamplers(GLsizei count, GLuint* samplers) override
   {
   }
 
-  inline void DeleteSamplers(GLsizei count, const GLuint* samplers)
+  inline void DeleteSamplers(GLsizei count, const GLuint* samplers) override
   {
   }
 
-  inline GLboolean IsSampler(GLuint sampler)
+  inline GLboolean IsSampler(GLuint sampler) override
   {
     return false;
   }
 
-  inline void BindSampler(GLuint unit, GLuint sampler)
+  inline void BindSampler(GLuint unit, GLuint sampler) override
   {
   }
 
-  inline void SamplerParameteri(GLuint sampler, GLenum pname, GLint param)
+  inline void SamplerParameteri(GLuint sampler, GLenum pname, GLint param) override
   {
   }
 
-  inline void SamplerParameteriv(GLuint sampler, GLenum pname, const GLint* param)
+  inline void SamplerParameteriv(GLuint sampler, GLenum pname, const GLint* param) override
   {
   }
 
-  inline void SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param)
+  inline void SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param) override
   {
   }
 
-  inline void SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat* param)
+  inline void SamplerParameterfv(GLuint sampler, GLenum pname, const GLfloat* param) override
   {
   }
 
-  inline void GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint* params)
+  inline void GetSamplerParameteriv(GLuint sampler, GLenum pname, GLint* params) override
   {
   }
 
-  inline void GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat* params)
+  inline void GetSamplerParameterfv(GLuint sampler, GLenum pname, GLfloat* params) override
   {
   }
 
-  inline void VertexAttribDivisor(GLuint index, GLuint divisor)
+  inline void VertexAttribDivisor(GLuint index, GLuint divisor) override
   {
   }
 
-  inline void BindTransformFeedback(GLenum target, GLuint id)
+  inline void BindTransformFeedback(GLenum target, GLuint id) override
   {
   }
 
-  inline void DeleteTransformFeedbacks(GLsizei n, const GLuint* ids)
+  inline void DeleteTransformFeedbacks(GLsizei n, const GLuint* ids) override
   {
   }
 
-  inline void GenTransformFeedbacks(GLsizei n, GLuint* ids)
+  inline void GenTransformFeedbacks(GLsizei n, GLuint* ids) override
   {
   }
 
-  inline GLboolean IsTransformFeedback(GLuint id)
+  inline GLboolean IsTransformFeedback(GLuint id) override
   {
     return false;
   }
 
-  inline void PauseTransformFeedback(void)
+  inline void PauseTransformFeedback(void) override
   {
   }
 
-  inline void ResumeTransformFeedback(void)
+  inline void ResumeTransformFeedback(void) override
   {
   }
 
-  inline void GetProgramBinary(GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat, GLvoid* binary)
+  inline void GetProgramBinary(GLuint program, GLsizei bufSize, GLsizei* length, GLenum* binaryFormat, GLvoid* binary) override
   {
+    mGetProgramBinaryCalled = true;
   }
 
-  inline void ProgramBinary(GLuint program, GLenum binaryFormat, const GLvoid* binary, GLsizei length)
+  inline void ProgramBinary(GLuint program, GLenum binaryFormat, const GLvoid* binary, GLsizei length) override
   {
   }
 
-  inline void ProgramParameteri(GLuint program, GLenum pname, GLint value)
+  inline void ProgramParameteri(GLuint program, GLenum pname, GLint value) override
   {
   }
 
-  inline void InvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum* attachments)
+  inline void InvalidateFramebuffer(GLenum target, GLsizei numAttachments, const GLenum* attachments) override
   {
   }
 
-  inline void InvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height)
+  inline void InvalidateSubFramebuffer(GLenum target, GLsizei numAttachments, const GLenum* attachments, GLint x, GLint y, GLsizei width, GLsizei height) override
   {
   }
 
-  inline void TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height)
+  inline void TexStorage2D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height) override
   {
   }
 
-  inline void TexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth)
+  inline void TexStorage3D(GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth) override
   {
   }
 
-  inline void GetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params)
+  inline void GetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint* params) override
   {
   }
 
+private:
+
+  inline void AddUniformCallToTraceStack( GLint location, std::string& value )
+    {
+    std::string name = "<not found>";
+    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; }
@@ -1527,6 +1949,11 @@ public: // TEST FUNCTIONS
   inline void ResetCullFaceCallStack() { mCullFaceTrace.Reset(); }
   inline TraceCallStack& GetCullFaceTrace() { return mCullFaceTrace; }
 
+  //Methods for Enable/Disable call verification
+  inline void EnableEnableDisableCallTrace(bool enable) { mEnableDisableTrace.Enable(enable); }
+  inline void ResetEnableDisableCallStack() { mEnableDisableTrace.Reset(); }
+  inline TraceCallStack& GetEnableDisableTrace() { return mEnableDisableTrace; }
+
   //Methods for Shader verification
   inline void EnableShaderCallTrace(bool enable) { mShaderTrace.Enable(enable); }
   inline void ResetShaderCallStack() { mShaderTrace.Reset(); }
@@ -1547,6 +1974,31 @@ public: // TEST FUNCTIONS
   inline void ResetDrawCallStack() { mDrawTrace.Reset(); }
   inline TraceCallStack& GetDrawTrace() { return mDrawTrace; }
 
+  //Methods for Depth function verification
+  inline void EnableDepthFunctionCallTrace(bool enable) { mDepthFunctionTrace.Enable(enable); }
+  inline void ResetDepthFunctionCallStack() { mDepthFunctionTrace.Reset(); }
+  inline TraceCallStack& GetDepthFunctionTrace() { return mDepthFunctionTrace; }
+
+  //Methods for Stencil function verification
+  inline void EnableStencilFunctionCallTrace(bool enable) { mStencilFunctionTrace.Enable(enable); }
+  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; }
+
+  //Methods for Viewport verification
+  inline void EnableViewportCallTrace(bool enable) { mViewportTrace.Enable(enable); }
+  inline void ResetViewportCallStack() { mViewportTrace.Reset(); }
+  inline TraceCallStack& GetViewportTrace() { return mViewportTrace; }
+
   template <typename T>
   inline bool GetUniformValue( const char* name, T& value ) const
   {
@@ -1596,7 +2048,7 @@ public: // TEST FUNCTIONS
       }
     }
 
-    fprintf(stderr, "Not found, printing possible values:" );
+    fprintf(stderr, "Not found, printing possible values:\n" );
     for( ProgramUniformMap::const_iterator program_it = mUniforms.begin();
           program_it != mUniforms.end();
           ++program_it )
@@ -1616,7 +2068,7 @@ public: // TEST FUNCTIONS
         {
           std::stringstream out;
           out << uniform_it->first << ": " << origValue;
-          fprintf(stderr, "%s", out.str().c_str() );
+          fprintf(stderr, "%s\n", out.str().c_str() );
         }
       }
     }
@@ -1649,8 +2101,6 @@ public: // TEST FUNCTIONS
     return false;
   }
 
-
-
   inline GLuint GetLastShaderCompiled() const
   {
     return mLastShaderCompiled;
@@ -1661,6 +2111,11 @@ public: // TEST FUNCTIONS
     return mLastProgramIdUsed;
   }
 
+  inline GLbitfield GetLastClearMask() const
+  {
+    return mLastClearBitMask;
+  }
+
   enum AttribType
   {
     ATTRIB_UNKNOWN = -1,
@@ -1686,10 +2141,37 @@ public: // TEST FUNCTIONS
   // Methods to check scissor tests
   inline const ScissorParams& GetScissorParams() const { return mScissorParams; }
 
+  struct ColorMaskParams
+  {
+    GLboolean red;
+    GLboolean green;
+    GLboolean blue;
+    GLboolean alpha;
+
+    ColorMaskParams() : red( true ), green( true ), blue( true ), alpha( true ) { }
+  };
+
+  inline bool GetProgramBinaryCalled() const { return mGetProgramBinaryCalled; }
+
+  inline unsigned int GetClearCountCalled() const { return mClearCount; }
+
+  inline const ColorMaskParams& GetColorMaskParams() const { return mColorMaskParams; }
+
+  typedef std::vector<size_t> BufferDataCalls;
+  inline const BufferDataCalls& GetBufferDataCalls() const { return mBufferDataCalls; }
+  inline void ResetBufferDataCalls() { mBufferDataCalls.clear(); }
+
+  typedef std::vector<size_t> BufferSubDataCalls;
+  inline const BufferSubDataCalls& GetBufferSubDataCalls() const { return mBufferSubDataCalls; }
+  inline void ResetBufferSubDataCalls() { mBufferSubDataCalls.clear(); }
+
 private:
   GLuint     mCurrentProgram;
   GLuint     mCompileStatus;
+  BufferDataCalls mBufferDataCalls;
+  BufferSubDataCalls mBufferSubDataCalls;
   GLuint     mLinkStatus;
+  GLint      mNumberOfActiveUniforms;
   GLint      mGetAttribLocationResult;
   GLenum     mGetErrorResult;
   GLubyte*   mGetStringResult;
@@ -1702,14 +2184,23 @@ private:
   GLboolean  mIsTextureResult;
   GLenum     mActiveTextureUnit;
   GLenum     mCheckFramebufferStatusResult;
+  GLint      mFramebufferStatus;
+  GLenum     mFramebufferDepthAttached;
+  GLenum     mFramebufferStencilAttached;
+  GLuint     mFramebufferColorAttachmentCount;
+  GLuint     mFrameBufferColorStatus;
   GLint      mNumBinaryFormats;
   GLint      mBinaryFormats;
   GLint      mProgramBinaryLength;
   bool       mVertexAttribArrayState[MAX_ATTRIBUTE_CACHE_SIZE];
   bool       mVertexAttribArrayChanged;                            // whether the vertex attrib array has been changed
+  bool       mGetProgramBinaryCalled;
   typedef std::map< GLuint, std::string> ShaderSourceMap;
   ShaderSourceMap mShaderSources;
   GLuint     mLastShaderCompiled;
+  GLbitfield mLastClearBitMask;
+  Vector4 mLastClearColor;
+  unsigned int mClearCount;
 
   Vector4 mLastBlendColor;
   GLenum  mLastBlendEquationRgb;
@@ -1719,8 +2210,11 @@ private:
   GLenum  mLastBlendFuncSrcAlpha;
   GLenum  mLastBlendFuncDstAlpha;
 
+  GLboolean mLastDepthMask;
+
   // Data for manipulating the IDs returned by GenTextures
   GLuint mLastAutoTextureIdUsed;
+  GLuint mNumGeneratedTextures;
   std::vector<GLuint> mNextTextureIds;
   std::vector<GLuint> mDeletedTextureIds;
   std::vector<GLuint> mBoundTextures;
@@ -1733,10 +2227,16 @@ private:
   ActiveTextureType mActiveTextures[ MIN_TEXTURE_UNIT_LIMIT ];
 
   TraceCallStack mCullFaceTrace;
+  TraceCallStack mEnableDisableTrace;
   TraceCallStack mShaderTrace;
   TraceCallStack mTextureTrace;
   TraceCallStack mTexParamaterTrace;
   TraceCallStack mDrawTrace;
+  TraceCallStack mDepthFunctionTrace;
+  TraceCallStack mStencilFunctionTrace;
+  TraceCallStack mScissorTrace;
+  TraceCallStack mSetUniformTrace;
+  TraceCallStack mViewportTrace;
 
   // Shaders & Uniforms
   GLuint mLastShaderIdUsed;
@@ -1780,7 +2280,7 @@ private:
       T uniformValue;
       if ( GetUniformValue( program, uniform, uniformValue ) )
       {
-        return value == uniformValue;
+        return CompareType<T>(value, uniformValue, Math::MACHINE_EPSILON_10);
       }
 
       return false;
@@ -1864,6 +2364,7 @@ private:
   }
 
   ScissorParams mScissorParams;
+  ColorMaskParams mColorMaskParams;
 };
 
 template <>
@@ -1914,6 +2415,4 @@ bool BlendEnabled(const Dali::TraceCallStack& callStack);
 bool BlendDisabled(const Dali::TraceCallStack& callStack);
 
 
-
-
-#endif // __TEST_GL_ES_H__
+#endif // TEST_GL_ABSTRACTION_H