projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
84ec291
)
Revert "[4.0] Fast bounding-box clipping feature"
67/154767/1
author
taeyoon0.lee
<taeyoon0.lee@samsung.com>
Wed, 11 Oct 2017 08:35:26 +0000
(17:35 +0900)
committer
taeyoon0.lee
<taeyoon0.lee@samsung.com>
Wed, 11 Oct 2017 08:35:37 +0000
(17:35 +0900)
This reverts commit
2f379271c1ede9af6c3d90cc5802c0c4027084aa
.
Change-Id: Id295e584521c5daeb39a5d474aaa8d268a77a6f0
automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.cpp
patch
|
blob
|
history
automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.h
patch
|
blob
|
history
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
(file)
--- 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();
mEnableDisableTrace.Reset();
mShaderTrace.Reset();
mStencilFunctionTrace.Reset();
- mScissorTrace.Reset();
mTextureTrace.Reset();
mTexParamaterTrace.Reset();
mDrawTrace.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
(file)
--- 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;
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)
@@
-1960,11
+1951,6
@@
public: // TEST FUNCTIONS
inline void ResetStencilFunctionCallStack() { mStencilFunctionTrace.Reset(); }
inline TraceCallStack& GetStencilFunctionTrace() { return mStencilFunctionTrace; }
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(); }
//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 mDrawTrace;
TraceCallStack mDepthFunctionTrace;
TraceCallStack mStencilFunctionTrace;
- TraceCallStack mScissorTrace;
TraceCallStack mSetUniformTrace;
// Shaders & Uniforms
TraceCallStack mSetUniformTrace;
// Shaders & Uniforms