diff options
| author | Jani Hautakangas <jani.hautakangas@nokia.com> | 2011-05-10 20:41:09 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <jani.hautakangas@nokia.com> | 2011-06-09 10:31:54 (GMT) |
| commit | 489baff3d49f7acce8d36dd98d27885ca207d6e7 (patch) | |
| tree | f9b7a0decd67048b52c0513b7665ccd46135a8ce /src/opengl/opengl.pro | |
| parent | 7b0762c17f9899e68c0f67480a81b25c6f0c7dda (diff) | |
| download | Qt-489baff3d49f7acce8d36dd98d27885ca207d6e7.zip Qt-489baff3d49f7acce8d36dd98d27885ca207d6e7.tar.gz Qt-489baff3d49f7acce8d36dd98d27885ca207d6e7.tar.bz2 | |
Simplify texture pooling logic in GL graphics system.
Remove ugly TemporarilyCachedBindOption and use QGLTexture
objects as texture pool entries instead of QGLPixmapData.
Make texture pooling totally Symbian specific, remove
VG like texture pooling code and use common texture binding
path which is used on other platforms also on Symbian.
QGLPixmapData should be only used to bind SgImage based
textures (will be implemented by another commit).
Task-number: QTBUG-19180
Reviewed-by: Samuel Rødal
Diffstat (limited to 'src/opengl/opengl.pro')
| -rw-r--r-- | src/opengl/opengl.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 6d79584..4375358 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -148,10 +148,10 @@ embedded { } symbian { - DEFINES += QGL_USE_TEXTURE_POOL QGL_NO_PRESERVED_SWAP + DEFINES += QGL_NO_PRESERVED_SWAP SOURCES -= qpixmapdata_gl.cpp SOURCES += qgl_symbian.cpp \ - qpixmapdata_poolgl.cpp \ + qpixmapdata_symbiangl.cpp \ qglpixelbuffer_egl.cpp \ qgl_egl.cpp \ qgltexturepool.cpp |