summaryrefslogtreecommitdiffstats
path: root/src/gui/opengl/qopenglframebufferobject.cpp
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-08-29 10:22:28 +0200
committerGunnar Sletta <gunnar.sletta@nokia.com>2011-08-29 10:42:42 +0200
commite35a83b293e6b38f6060895262b5494d36515e6e (patch)
tree42e0b0a9d4d9ca997959f399c208c25697dcaf77 /src/gui/opengl/qopenglframebufferobject.cpp
parent6e28e8441b698c3397c2c78125c877f2e9867cb1 (diff)
Clean up legacy defines in gui/opengl.
Change-Id: I14d477c3f7a98cecca2c0a240ff13ea8ec64a154 Reviewed-on: http://codereview.qt.nokia.com/3716 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Diffstat (limited to 'src/gui/opengl/qopenglframebufferobject.cpp')
-rw-r--r--src/gui/opengl/qopenglframebufferobject.cpp23
1 files changed, 8 insertions, 15 deletions
diff --git a/src/gui/opengl/qopenglframebufferobject.cpp b/src/gui/opengl/qopenglframebufferobject.cpp
index 543a48fc08..643dc67bb7 100644
--- a/src/gui/opengl/qopenglframebufferobject.cpp
+++ b/src/gui/opengl/qopenglframebufferobject.cpp
@@ -55,9 +55,6 @@
QT_BEGIN_NAMESPACE
-#define QOPENGL_FUNC_CONTEXT QOpenGLContext *ctx = QOpenGLContext::currentContext();
-#define QOPENGL_FUNCP_CONTEXT QOpenGLContext *ctx = QOpenGLContext::currentContext();
-
#ifndef QT_NO_DEBUG
#define QT_RESET_GLERROR() \
{ \
@@ -358,10 +355,10 @@ QOpenGLContextGroup *QOpenGLFBOGLPaintDevice::group() const
bool QOpenGLFramebufferObjectPrivate::checkFramebufferStatus() const
{
- QOPENGL_FUNCP_CONTEXT;
+ QOpenGLContext *ctx = QOpenGLContext::currentContext();
if (!ctx)
return false; // Context no longer exists.
- GLenum status = QOpenGLFunctions(ctx).glCheckFramebufferStatus(GL_FRAMEBUFFER);
+ GLenum status = ctx->functions()->glCheckFramebufferStatus(GL_FRAMEBUFFER);
switch(status) {
case GL_NO_ERROR:
case GL_FRAMEBUFFER_COMPLETE:
@@ -384,7 +381,6 @@ bool QOpenGLFramebufferObjectPrivate::checkFramebufferStatus() const
case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS:
qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, attached images must have same dimensions.");
break;
-#if 1
case GL_FRAMEBUFFER_INCOMPLETE_FORMATS:
qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, attached images must have same format.");
break;
@@ -397,7 +393,6 @@ bool QOpenGLFramebufferObjectPrivate::checkFramebufferStatus() const
case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
qDebug("QOpenGLFramebufferObject: Framebuffer incomplete, attachments must have same number of samples per pixel.");
break;
-#endif
default:
qDebug() <<"QOpenGLFramebufferObject: An undefined error has occurred: "<< status;
break;
@@ -937,12 +932,11 @@ bool QOpenGLFramebufferObject::bind()
if (!isValid())
return false;
Q_D(QOpenGLFramebufferObject);
- QOPENGL_FUNC_CONTEXT;
- if (!ctx)
- return false; // Context no longer exists.
QOpenGLContext *current = QOpenGLContext::currentContext();
+ if (!current)
+ return false;
#ifdef QT_DEBUG
- if (!current || current->shareGroup() != d->fbo_guard->group())
+ if (current->shareGroup() != d->fbo_guard->group())
qWarning("QOpenGLFramebufferObject::bind() called from incompatible context");
#endif
d->funcs.glBindFramebuffer(GL_FRAMEBUFFER, d->fbo());
@@ -965,15 +959,14 @@ bool QOpenGLFramebufferObject::release()
{
if (!isValid())
return false;
- QOPENGL_FUNC_CONTEXT;
- if (!ctx)
- return false; // Context no longer exists.
QOpenGLContext *current = QOpenGLContext::currentContext();
+ if (!current)
+ return false;
#ifdef QT_DEBUG
Q_D(QOpenGLFramebufferObject);
- if (!current || current->shareGroup() != d->fbo_guard->group())
+ if (current->shareGroup() != d->fbo_guard->group())
qWarning("QOpenGLFramebufferObject::release() called from incompatible context");
#endif