diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-22 10:49:28 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-08-29 10:25:24 +0200 |
| commit | 6e28e8441b698c3397c2c78125c877f2e9867cb1 (patch) | |
| tree | 1e3ad0e43cb775854835817cd04bdc8b5e047e15 /src/opengl/qglbuffer.cpp | |
| parent | aaa4a26f82f99fa8724841eba91bad029306e0ce (diff) | |
Copy core GL functionality to QtGui with QGL -> QOpenGL naming.
Change-Id: Ibc989afa4a30dd184d41d1a1cd89f97196e48855
Reviewed-on: http://codereview.qt.nokia.com/3710
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/opengl/qglbuffer.cpp')
| -rw-r--r-- | src/opengl/qglbuffer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qglbuffer.cpp b/src/opengl/qglbuffer.cpp index 53f27392b0..c1128a0ebd 100644 --- a/src/opengl/qglbuffer.cpp +++ b/src/opengl/qglbuffer.cpp @@ -334,7 +334,7 @@ bool QGLBuffer::read(int offset, void *data, int count) { #if !defined(QT_OPENGL_ES) Q_D(QGLBuffer); - if (!glGetBufferSubData || !d->guard.id()) + if (!glGetBufferSubData || !d->guard->id()) return false; while (glGetError() != GL_NO_ERROR) ; // Clear error state. glGetBufferSubData(d->type, offset, count, data); @@ -421,7 +421,7 @@ bool QGLBuffer::bind() Q_D(const QGLBuffer); GLuint bufferId = d->guard ? d->guard->id() : 0; if (bufferId) { - if (d->guard->group() != QGuiGLContextGroup::currentContextGroup()) { + if (d->guard->group() != QOpenGLContextGroup::currentContextGroup()) { #ifndef QT_NO_DEBUG qWarning("QGLBuffer::bind: buffer is not valid in the current context"); #endif |