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:
1f2153d
)
[4.0] Fast bounding-box clipping feature
42/153542/1
author
Tom Robinson
<tom.robinson@samsung.com>
Fri, 22 Sep 2017 17:16:57 +0000
(18:16 +0100)
committer
Jinho, Lee
<jeano.lee@samsung.com>
Thu, 28 Sep 2017 17:39:42 +0000
(
02:39
+0900)
Change-Id: I532c00cc322ceae9bd28918fef8b68a58603b8b2
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
c4bc01d
..
02439bc
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,6
+85,7
@@
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
8408b10
..
b306c3e
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,6
+949,15
@@
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)
@@
-1951,6
+1960,11
@@
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(); }
@@
-2189,6
+2203,7
@@
private:
TraceCallStack mDrawTrace;
TraceCallStack mDepthFunctionTrace;
TraceCallStack mStencilFunctionTrace;
TraceCallStack mDrawTrace;
TraceCallStack mDepthFunctionTrace;
TraceCallStack mStencilFunctionTrace;
+ TraceCallStack mScissorTrace;
TraceCallStack mSetUniformTrace;
// Shaders & Uniforms
TraceCallStack mSetUniformTrace;
// Shaders & Uniforms