From: Samuel Rødal <samuel.rodal@nokia.com>
Date: Sat, 5 May 2012 18:03:04 +0000 (+0200)
Subject: Fixed QOpenGLBuffer::map and unmap implementations.
X-Git-Tag: 071012110112~1154
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f60bf8a18a09b6e81ae755918e0d98a7f3301070;p=profile%2Fivi%2Fqtbase.git

Fixed QOpenGLBuffer::map and unmap implementations.

We already have the necessary enablers in QOpenGLExtensions.

Change-Id: I90d763516d8b92c09c878133552200c94a46fbf2
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
---

diff --git a/src/gui/opengl/qopenglbuffer.cpp b/src/gui/opengl/qopenglbuffer.cpp
index f47f71c..045eec0 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