diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-05-05 19:29:40 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2009-05-06 10:12:57 (GMT) |
| commit | 7d6281973f8b0a5b53e63952f0d03624e6020454 (patch) | |
| tree | 17637db5d4ccc46732fef2fab7bc153198be3cc3 /src/opengl/qwindowsurface_gl.cpp | |
| parent | 8baf1a4dfb2b1a1bb7ecb5ada93ed9972f0e7762 (diff) | |
| download | Qt-7d6281973f8b0a5b53e63952f0d03624e6020454.zip Qt-7d6281973f8b0a5b53e63952f0d03624e6020454.tar.gz Qt-7d6281973f8b0a5b53e63952f0d03624e6020454.tar.bz2 | |
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/qwindowsurface_gl.cpp')
| -rw-r--r-- | src/opengl/qwindowsurface_gl.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 4c2748c..576da12 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -449,14 +449,14 @@ void QGLWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoint & const int y0 = h - (rect.top() + rect.height()); const int y1 = h - rect.top(); - glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0); + glBindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, 0); glBlitFramebufferEXT(x0, y0, x1, y1, x0, y0, x1, y1, GL_COLOR_BUFFER_BIT, GL_NEAREST); - glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, d_ptr->fbo->handle()); + glBindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, d_ptr->fbo->handle()); } #if !defined(QT_OPENGL_ES_2) else { |