diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-05-13 12:47:54 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-05-13 13:15:49 (GMT) |
| commit | c8c5becc81679eb8a9a0f8baa454bc43fd3cccf9 (patch) | |
| tree | 357b605e0fa6cdf3b98916ffce9ebb3e051c33fc /src/opengl/qglframebufferobject.cpp | |
| parent | b352b0e637ca19591ee122c47ce4a6ab0a26c06b (diff) | |
| download | Qt-c8c5becc81679eb8a9a0f8baa454bc43fd3cccf9.zip Qt-c8c5becc81679eb8a9a0f8baa454bc43fd3cccf9.tar.gz Qt-c8c5becc81679eb8a9a0f8baa454bc43fd3cccf9.tar.bz2 | |
Reverted use of GL 2 engine as default on desktop.
Using GL 2 as default engine breaks the use cases where OpenGL commands
are inter-mixed with QPainter commands, such as when using raw OpenGL in
graphicsview.
For now we'll use the old OpenGL engine for QGLWidget, QGLPixelBuffer,
and QGLFramebufferObject on desktop, and the OpenGL 2 paint engine when
the OpenGL graphics system is used.
Reviewed-by: Trond
Diffstat (limited to 'src/opengl/qglframebufferobject.cpp')
| -rw-r--r-- | src/opengl/qglframebufferobject.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index 87e0dda..5f106ff 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -906,8 +906,9 @@ Q_GLOBAL_STATIC(QOpenGLPaintEngine, qt_buffer_engine) /*! \reimp */ QPaintEngine *QGLFramebufferObject::paintEngine() const { + Q_D(const QGLFramebufferObject); #if !defined(QT_OPENGL_ES_2) - if (qt_gl_preferGL2Engine()) + if (d->ctx->d_func()->internal_context || qt_gl_preferGL2Engine()) return qt_buffer_2_engine(); else return qt_buffer_engine(); |