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
Syncing common test files.
[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
3edad10
..
098f555
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
@@
-252,9
+252,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()
@@
-584,9
+584,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::FrameBuffer::MAX_COLOR_ATTACHMENTS
))
{
{
- mFramebufferColorAttached = true;
+ uint8_t mask = 1 << (attachment - GL_COLOR_ATTACHMENT0);
+ if ((mFrameBufferColorStatus & mask) == 0)
+ {
+ mFrameBufferColorStatus |= mask;
+ ++mFramebufferColorAttachmentCount;
+ }
}
}
}
}
@@
-2178,9
+2183,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;