qiurui
/
qtdatavis3d
mirror of https://github.com/qt/qtdatavis3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix invalid enum error in OpenGL ES2 builds. 

Change-Id: Ib4587a608a7b79d863d51e1a9ecd150996245fa7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
This commit is contained in:
Miikka Heikkinen 2014-11-21 12:43:25 +02:00
parent 2f7c12bfee
commit 7b2cd00ce8
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/datavisualizationqml2/glstatestore.cpp
View File

@ -80,8 +80,6 @@ void GLStateStore::storeGLState()
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &m_drawFramebuffer);
glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &m_readFramebuffer);
glGetIntegerv(GL_RENDERBUFFER_BINDING, &m_renderbuffer);
#else
glGetIntegerv(GL_RENDERBUFFER, &m_renderbuffer);
#endif
glGetFloatv(GL_COLOR_CLEAR_VALUE, m_clearColor);
m_isBlendingEnabled = glIsEnabled(GL_BLEND);
@ -138,8 +136,8 @@ void GLStateStore::printCurrentState(bool in)
#if !defined(QT_OPENGL_ES_2)
GLint drawFramebuffer;
GLint readFramebuffer;
#endif
GLint renderbuffer;
#endif
GLfloat clearColor[4];
GLfloat clearDepth;
GLboolean isBlendingEnabled = glIsEnabled(GL_BLEND);
@ -178,8 +176,6 @@ void GLStateStore::printCurrentState(bool in)
glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &drawFramebuffer);
glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &readFramebuffer);
glGetIntegerv(GL_RENDERBUFFER_BINDING, &renderbuffer);
#else
glGetIntegerv(GL_RENDERBUFFER, &renderbuffer);
#endif
glGetFloatv(GL_COLOR_CLEAR_VALUE, clearColor);
glGetFloatv(GL_DEPTH_CLEAR_VALUE, &clearDepth);
@ -223,8 +219,8 @@ void GLStateStore::printCurrentState(bool in)
msg << "---" << endl;
msg << " GL_DRAW_FRAMEBUFFER_BINDING "<< drawFramebuffer << endl;
msg << " GL_READ_FRAMEBUFFER_BINDING "<< readFramebuffer << endl;
#endif
msg << " GL_RENDERBUFFER_BINDING " << renderbuffer << endl;
#endif
msg << " GL_SCISSOR_TEST " << bool(isScissorTestEnabled) << endl;
msg << " GL_SCISSOR_BOX " << m_scissorBox[0] << m_scissorBox[1] << m_scissorBox[2]
<< m_scissorBox[3] << endl;
@ -275,8 +271,6 @@ void GLStateStore::restoreGLState()
glBindFramebuffer(GL_READ_FRAMEBUFFER, m_readFramebuffer);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_drawFramebuffer);
glBindRenderbuffer(GL_RENDERBUFFER_BINDING, m_renderbuffer);
#else
glBindRenderbuffer(GL_RENDERBUFFER, m_renderbuffer);
#endif
if (m_isScissorTestEnabled)
@ -351,8 +345,8 @@ void GLStateStore::initGLDefaultState()
#if !defined(QT_OPENGL_ES_2)
m_drawFramebuffer = 0;
m_readFramebuffer = 0;
#endif
m_renderbuffer = 0;
#endif
m_clearColor[0] = m_clearColor[1] = m_clearColor[2] = m_clearColor[3] = 1.0f;
m_clearDepth = 1.0f;
m_isBlendingEnabled = GL_FALSE;

2
src/datavisualizationqml2/glstatestore_p.h
View File

@ -55,8 +55,8 @@ public:
#if !defined(QT_OPENGL_ES_2)
GLint m_drawFramebuffer;
GLint m_readFramebuffer;
#endif
GLint m_renderbuffer;
#endif
GLfloat m_clearColor[4];
GLfloat m_clearDepth;
GLboolean m_isBlendingEnabled;