From f60bf8a18a09b6e81ae755918e0d98a7f3301070 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20R=C3=B8dal?= Date: Sat, 5 May 2012 20:03:04 +0200 Subject: Fixed QOpenGLBuffer::map and unmap implementations. We already have the necessary enablers in QOpenGLExtensions. Change-Id: I90d763516d8b92c09c878133552200c94a46fbf2 Reviewed-by: Gunnar Sletta --- src/gui/opengl/qopenglbuffer.cpp | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) (limited to 'src/gui/opengl/qopenglbuffer.cpp') diff --git a/src/gui/opengl/qopenglbuffer.cpp b/src/gui/opengl/qopenglbuffer.cpp index f47f71c121..045eec060b 100644 --- a/src/gui/opengl/qopenglbuffer.cpp +++ b/src/gui/opengl/qopenglbuffer.cpp @@ -523,18 +523,7 @@ void *QOpenGLBuffer::map(QOpenGLBuffer::Access access) #endif if (!d->guard || !d->guard->id()) return 0; -#if 0 - if (!glMapBufferARB) - return 0; - return glMapBufferARB(d->type, access); -#endif - Q_UNUSED(access); - static bool warned = false; - if (!warned) { - qWarning("QOpenGLBuffer::map(): pending implementation"); - warned = true; - } - return 0; + return d->funcs->glMapBuffer(d->type, access); } /*! @@ -559,17 +548,7 @@ bool QOpenGLBuffer::unmap() #endif if (!d->guard || !d->guard->id()) return false; -#if 0 - if (!glUnmapBufferARB) - return false; - return glUnmapBufferARB(d->type) == GL_TRUE; -#endif - static bool warned = false; - if (!warned) { - qWarning("QOpenGLBuffer::map(): pending implementation"); - warned = true; - } - return 0; + return d->funcs->glUnmapBuffer(d->type) == GL_TRUE; } QT_END_NAMESPACE -- cgit v1.2.3