summaryrefslogtreecommitdiffstats
path: root/src/gui/image
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2009-07-28 13:57:36 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2009-07-29 10:07:16 (GMT)
commit65702aa6b44568946b8c3924a45b9362401d893c (patch)
tree6219bc42277a8ddeb2be7edd1d818179e0fd1462 /src/gui/image
parent78f079016e0dd9b455d74c6a84cfbdb859fd1094 (diff)
downloadQt-65702aa6b44568946b8c3924a45b9362401d893c.zip
Qt-65702aa6b44568946b8c3924a45b9362401d893c.tar.gz
Qt-65702aa6b44568946b8c3924a45b9362401d893c.tar.bz2
Refactor texture_from_pixmap to not re-create the gl surface each bind
Make a clear seperation between the GL texture and the GLX pixmap. A GLXPixmap is valid in any GL context and thus does not need to be re-created every time the pixmap has changed. Reviewed-By: Samuel
Diffstat (limited to 'src/gui/image')
-rw-r--r--src/gui/image/qpixmapdata_p.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h
index 29dafaf..32b419e 100644
--- a/src/gui/image/qpixmapdata_p.h
+++ b/src/gui/image/qpixmapdata_p.h
@@ -116,6 +116,7 @@ private:
friend class QPixmap;
friend class QGLContextPrivate;
friend class QX11PixmapData;
+ friend class QGLTextureCache; //Needs to check the reference count
QAtomicInt ref;
int detach_no;