From 10bffbabc6f1c2c1096d680a249b39bf014519db Mon Sep 17 00:00:00 2001 From: Paul Wisbey Date: Mon, 29 Jul 2019 17:55:29 +0100 Subject: [PATCH] Fixed viewport issue when changing window size Change-Id: Ifdd2b2b7270260b157f826b49e959b8f7fd5d1e7 --- .../dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h | 10 ++++++++++ 1 file changed, 10 insertions(+) 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 6572dbc..3fae461 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 @@ -1436,6 +1436,10 @@ public: inline void Viewport(GLint x, GLint y, GLsizei width, GLsizei height) { + 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 */ @@ -1974,6 +1978,11 @@ public: // TEST FUNCTIONS 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 inline bool GetUniformValue( const char* name, T& value ) const { @@ -2209,6 +2218,7 @@ private: TraceCallStack mStencilFunctionTrace; TraceCallStack mScissorTrace; TraceCallStack mSetUniformTrace; + TraceCallStack mViewportTrace; // Shaders & Uniforms GLuint mLastShaderIdUsed; -- 2.7.4