From 4d39084cee39fd81526a2bb6894333b0d9ac001d Mon Sep 17 00:00:00 2001 From: "taeyoon0.lee" Date: Wed, 11 Oct 2017 17:35:26 +0900 Subject: [PATCH] Revert "[4.0] Fast bounding-box clipping feature" This reverts commit 2f379271c1ede9af6c3d90cc5802c0c4027084aa. Change-Id: Id295e584521c5daeb39a5d474aaa8d268a77a6f0 --- .../dali-test-suite-utils/test-gl-abstraction.cpp | 1 - .../dali-test-suite-utils/test-gl-abstraction.h | 15 --------------- 2 files changed, 16 deletions(-) diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.cpp index 02439bc..c4bc01d 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.cpp +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.cpp @@ -85,7 +85,6 @@ void TestGlAbstraction::Initialize() mEnableDisableTrace.Reset(); mShaderTrace.Reset(); mStencilFunctionTrace.Reset(); - mScissorTrace.Reset(); mTextureTrace.Reset(); mTexParamaterTrace.Reset(); mDrawTrace.Reset(); diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.h index b306c3e..8408b10 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.h +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.h @@ -949,15 +949,6 @@ public: 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) @@ -1960,11 +1951,6 @@ 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(); } @@ -2203,7 +2189,6 @@ private: TraceCallStack mDrawTrace; TraceCallStack mDepthFunctionTrace; TraceCallStack mStencilFunctionTrace; - TraceCallStack mScissorTrace; TraceCallStack mSetUniformTrace; // Shaders & Uniforms -- 2.7.4