summaryrefslogtreecommitdiff
path: root/src/opengl/qpixmapdata_gl.cpp
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2009-05-05 21:29:40 +0200
committerTom Cooksey <thomas.cooksey@nokia.com>2009-05-06 12:12:57 +0200
commit7d6281973f8b0a5b53e63952f0d03624e6020454 (patch)
tree17637db5d4ccc46732fef2fab7bc153198be3cc3 /src/opengl/qpixmapdata_gl.cpp
parent8baf1a4dfb2b1a1bb7ecb5ada93ed9972f0e7762 (diff)
downloadqt4-tools-7d6281973f8b0a5b53e63952f0d03624e6020454.tar.gz
Big GL Extension Cleanup
Clean up the extension naming and make things build on OpenGL ES 2.0 again. All the extensions which made it into OpenGL 2.0 spec have have the EXT postfix removed. This also eliminates defines on ES 2.0 as the code now refers to the in-spec names. Reviewed-by: sroedal
Diffstat (limited to 'src/opengl/qpixmapdata_gl.cpp')
-rw-r--r--src/opengl/qpixmapdata_gl.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp
index 1fa5b4732e..cb0b4d1a2b 100644
--- a/src/opengl/qpixmapdata_gl.cpp
+++ b/src/opengl/qpixmapdata_gl.cpp
@@ -280,10 +280,10 @@ void QGLPixmapData::copyBackFromRenderFbo(bool keepCurrentFboBound) const
ensureCreated();
if (!ctx->d_ptr->fbo)
- glGenFramebuffersEXT(1, &ctx->d_ptr->fbo);
+ glGenFramebuffers(1, &ctx->d_ptr->fbo);
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, ctx->d_ptr->fbo);
- glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+ glBindFramebuffer(GL_FRAMEBUFFER_EXT, ctx->d_ptr->fbo);
+ glFramebufferTexture2D(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
qt_gl_preferredTextureTarget(), m_textureId, 0);
const int x0 = 0;
@@ -291,7 +291,7 @@ void QGLPixmapData::copyBackFromRenderFbo(bool keepCurrentFboBound) const
const int y0 = 0;
const int y1 = m_height;
- glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, m_renderFbo->handle());
+ glBindFramebuffer(GL_READ_FRAMEBUFFER_EXT, m_renderFbo->handle());
glDisable(GL_SCISSOR_TEST);
@@ -301,7 +301,7 @@ void QGLPixmapData::copyBackFromRenderFbo(bool keepCurrentFboBound) const
GL_NEAREST);
if (keepCurrentFboBound)
- glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, ctx->d_ptr->current_fbo);
+ glBindFramebuffer(GL_FRAMEBUFFER_EXT, ctx->d_ptr->current_fbo);
}
void QGLPixmapData::swapBuffers()