diff options
author | Samuel Rødal <sroedal@trolltech.com> | 2009-06-15 08:47:51 (GMT) |
---|---|---|
committer | Samuel Rødal <sroedal@trolltech.com> | 2009-06-15 10:02:32 (GMT) |
commit | ca57370d923cbda2f14380382d887ad5e003a040 (patch) | |
tree | 13e2f239c8235a3cfc1b690432f28076c2b061b5 /src/opengl/qpixmapdata_gl.cpp | |
parent | d5750bbf85a234692261df24e99a1c4f427bf287 (diff) | |
download | Qt-ca57370d923cbda2f14380382d887ad5e003a040.zip Qt-ca57370d923cbda2f14380382d887ad5e003a040.tar.gz Qt-ca57370d923cbda2f14380382d887ad5e003a040.tar.bz2 |
Re-enabled GL pixmap backend and window surface to work without GL2.
GL window surface and GL pixmap backend should work with old GL engine
as well, though not supported to the same degree.
Reviewed-by: Trond
Diffstat (limited to 'src/opengl/qpixmapdata_gl.cpp')
-rw-r--r-- | src/opengl/qpixmapdata_gl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp index 48feb82..e641d2c 100644 --- a/src/opengl/qpixmapdata_gl.cpp +++ b/src/opengl/qpixmapdata_gl.cpp @@ -398,7 +398,8 @@ static TextureBuffer createTextureBuffer(const QSize &size, QGL2PaintEngineEx *e bool QGLPixmapData::useFramebufferObjects() { return QGLFramebufferObject::hasOpenGLFramebufferObjects() - && QGLFramebufferObject::hasOpenGLFramebufferBlit(); + && QGLFramebufferObject::hasOpenGLFramebufferBlit() + && qt_gl_preferGL2Engine(); } QPaintEngine* QGLPixmapData::paintEngine() const |