AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed QOpenGLBuffer::map and unmap implementations.

Browse Source 
We already have the necessary enablers in QOpenGLExtensions.

Change-Id: I90d763516d8b92c09c878133552200c94a46fbf2
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
This commit is contained in:
Samuel Rødal 2012-05-05 20:03:04 +02:00 committed by Qt by Nokia
parent 79400f83ec
commit f60bf8a18a
1 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/opengl/qopenglbuffer.cpp
View File

@ -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