projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "(VectorBlobAtlas) Use Texture instead of BufferImage" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
test-gl-abstraction.h
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
..
9f458fc
100644
(file)
--- 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
@@
-2,7
+2,7
@@
#define TEST_GL_ABSTRACTION_H
/*
#define TEST_GL_ABSTRACTION_H
/*
- * Copyright (c) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-29,6
+29,7
@@
// INTERNAL INCLUDES
#include <dali/public-api/dali-core.h>
// 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 <dali/integration-api/core.h>
#include <dali/integration-api/gl-abstraction.h>
#include <dali/integration-api/gl-defines.h>
@@
-252,9
+253,9
@@
public:
return mCheckFramebufferStatusResult;
}
return mCheckFramebufferStatusResult;
}
- inline GL
enum CheckFramebufferColorAttachme
nt()
+ inline GL
uint CheckFramebufferColorAttachmentCou
nt()
{
{
- return mFramebufferColorAttach
ed
;
+ return mFramebufferColorAttach
mentCount
;
}
inline GLenum CheckFramebufferDepthAttachment()
}
inline GLenum CheckFramebufferDepthAttachment()
@@
-275,6
+276,15
@@
public:
inline void ClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
{
inline void ClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
{
+ mLastClearColor.r = red;
+ mLastClearColor.g = green;
+ mLastClearColor.b = blue;
+ mLastClearColor.a = alpha;
+ }
+
+ inline const Vector4& GetLastClearColor() const
+ {
+ return mLastClearColor;
}
inline void ClearDepthf(GLclampf depth)
}
inline void ClearDepthf(GLclampf depth)
@@
-575,9
+585,14
@@
public:
mFramebufferStatus |= 4;
//We check 4 attachment colors
mFramebufferStatus |= 4;
//We check 4 attachment colors
- if ((attachment
== GL_COLOR_ATTACHMENT0) || (attachment == GL_COLOR_ATTACHMENT1) || (attachment == GL_COLOR_ATTACHMENT2) || (attachment == GL_COLOR_ATTACHMENT4
))
+ if ((attachment
>= GL_COLOR_ATTACHMENT0) && (attachment < GL_COLOR_ATTACHMENT0 + Dali::DevelFrameBuffer::MAX_COLOR_ATTACHMENTS
))
{
{
- mFramebufferColorAttached = true;
+ uint8_t mask = 1 << (attachment - GL_COLOR_ATTACHMENT0);
+ if ((mFrameBufferColorStatus & mask) == 0)
+ {
+ mFrameBufferColorStatus |= mask;
+ ++mFramebufferColorAttachmentCount;
+ }
}
}
}
}
@@
-1436,6
+1451,10
@@
public:
inline void Viewport(GLint x, GLint y, GLsizei width, GLsizei height)
{
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 */
}
/* OpenGL ES 3.0 */
@@
-1974,6
+1993,11
@@
public: // TEST FUNCTIONS
inline void ResetSetUniformCallStack() { mSetUniformTrace.Reset(); }
inline TraceCallStack& GetSetUniformTrace() { return mSetUniformTrace; }
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
{
template <typename T>
inline bool GetUniformValue( const char* name, T& value ) const
{
@@
-2160,9
+2184,10
@@
private:
GLenum mActiveTextureUnit;
GLenum mCheckFramebufferStatusResult;
GLint mFramebufferStatus;
GLenum mActiveTextureUnit;
GLenum mCheckFramebufferStatusResult;
GLint mFramebufferStatus;
- GLenum mFramebufferColorAttached;
GLenum mFramebufferDepthAttached;
GLenum mFramebufferStencilAttached;
GLenum mFramebufferDepthAttached;
GLenum mFramebufferStencilAttached;
+ GLuint mFramebufferColorAttachmentCount;
+ GLuint mFrameBufferColorStatus;
GLint mNumBinaryFormats;
GLint mBinaryFormats;
GLint mProgramBinaryLength;
GLint mNumBinaryFormats;
GLint mBinaryFormats;
GLint mProgramBinaryLength;
@@
-2173,6
+2198,7
@@
private:
ShaderSourceMap mShaderSources;
GLuint mLastShaderCompiled;
GLbitfield mLastClearBitMask;
ShaderSourceMap mShaderSources;
GLuint mLastShaderCompiled;
GLbitfield mLastClearBitMask;
+ Vector4 mLastClearColor;
unsigned int mClearCount;
Vector4 mLastBlendColor;
unsigned int mClearCount;
Vector4 mLastBlendColor;
@@
-2209,6
+2235,7
@@
private:
TraceCallStack mStencilFunctionTrace;
TraceCallStack mScissorTrace;
TraceCallStack mSetUniformTrace;
TraceCallStack mStencilFunctionTrace;
TraceCallStack mScissorTrace;
TraceCallStack mSetUniformTrace;
+ TraceCallStack mViewportTrace;
// Shaders & Uniforms
GLuint mLastShaderIdUsed;
// Shaders & Uniforms
GLuint mLastShaderIdUsed;