diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-05-15 07:02:01 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2014-05-15 07:08:40 +0300 |
| commit | c9a3325e59b224c26d5e49688b29b2a57134e019 (patch) | |
| tree | 54ef76390c722b5bbd0154cb84e109c7fbabd9d4 | |
| parent | 8015a58ea819b41e0a896ea9e7d57d7f3a9f1c5f (diff) | |
GLStateStore ES2 fix
Change-Id: I96e92601be00fc7dc1deef179b2ac825d6478283
Change-Id: I96e92601be00fc7dc1deef179b2ac825d6478283
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
| -rw-r--r-- | src/datavisualizationqml2/enumtostringmap.cpp | 4 | ||||
| -rw-r--r-- | src/datavisualizationqml2/glstatestore.cpp | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/datavisualizationqml2/enumtostringmap.cpp b/src/datavisualizationqml2/enumtostringmap.cpp index 249fbae3..ebd89981 100644 --- a/src/datavisualizationqml2/enumtostringmap.cpp +++ b/src/datavisualizationqml2/enumtostringmap.cpp @@ -379,7 +379,11 @@ EnumToStringMap::EnumToStringMap() : m_map[GL_FRAMEBUFFER_UNSUPPORTED] = "FRAMEBUFFER_UNSUPPORTED"; m_map[GL_FRAMEBUFFER_BINDING] = "FRAMEBUFFER_BINDING"; +#if !defined(QT_OPENGL_ES_2) m_map[GL_RENDERBUFFER_BINDING] = "RENDERBUFFER_BINDING"; +#else + m_map[GL_RENDERBUFFER] = "RENDERBUFFER_BINDING"; +#endif m_map[GL_MAX_RENDERBUFFER_SIZE] = "MAX_RENDERBUFFER_SIZE"; m_map[GL_INVALID_FRAMEBUFFER_OPERATION] = "INVALID_FRAMEBUFFER_OPERATION"; diff --git a/src/datavisualizationqml2/glstatestore.cpp b/src/datavisualizationqml2/glstatestore.cpp index 6fbd3a34..c590a4c1 100644 --- a/src/datavisualizationqml2/glstatestore.cpp +++ b/src/datavisualizationqml2/glstatestore.cpp @@ -78,8 +78,10 @@ void GLStateStore::storeGLState() #if !defined(QT_OPENGL_ES_2) glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &m_drawFramebuffer); glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &m_readFramebuffer); -#endif 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); m_isDepthTestEnabled = glIsEnabled(GL_DEPTH_TEST); @@ -171,8 +173,10 @@ void GLStateStore::printCurrentState(bool in) #if !defined(QT_OPENGL_ES_2) glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING, &drawFramebuffer); glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING, &readFramebuffer); -#endif glGetIntegerv(GL_RENDERBUFFER_BINDING, &renderbuffer); +#else + glGetIntegerv(GL_RENDERBUFFER, &renderbuffer); +#endif glGetFloatv(GL_COLOR_CLEAR_VALUE, clearColor); glGetFloatv(GL_DEPTH_CLEAR_VALUE, &clearDepth); glGetIntegerv(GL_DEPTH_FUNC, &depthFunc); @@ -263,8 +267,10 @@ void GLStateStore::restoreGLState() #if !defined(QT_OPENGL_ES_2) glBindFramebuffer(GL_READ_FRAMEBUFFER, m_readFramebuffer); glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_drawFramebuffer); -#endif glBindRenderbuffer(GL_RENDERBUFFER_BINDING, m_renderbuffer); +#else + glBindRenderbuffer(GL_RENDERBUFFER, m_renderbuffer); +#endif if (m_isScissorTestEnabled) glEnable(GL_SCISSOR_TEST); |