summaryrefslogtreecommitdiffstats
path: root/src/opengl/qpixmapdata_gl_p.h
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2010-09-09 15:12:57 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2010-09-09 15:47:48 (GMT)
commit6b7f0bb52f10a03758b5625bd7112d214627812a (patch)
tree175cff978ddf2e09e5c7f1110e00100865a3b68c /src/opengl/qpixmapdata_gl_p.h
parent0d76ad42f5479fb21ad9cd64f7251a421cc6a151 (diff)
downloadQt-6b7f0bb52f10a03758b5625bd7112d214627812a.zip
Qt-6b7f0bb52f10a03758b5625bd7112d214627812a.tar.gz
Qt-6b7f0bb52f10a03758b5625bd7112d214627812a.tar.bz2
Some optimizations to the GL pixmap data.
- Don't use toImage() / fromImage() to copy when a render FBO is active. - Use raster for rendering to small (< 32x32) pixmaps. Reviewed-by: Trond
Diffstat (limited to 'src/opengl/qpixmapdata_gl_p.h')
-rw-r--r--src/opengl/qpixmapdata_gl_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qpixmapdata_gl_p.h b/src/opengl/qpixmapdata_gl_p.h
index 736a28e..4cb67b0 100644
--- a/src/opengl/qpixmapdata_gl_p.h
+++ b/src/opengl/qpixmapdata_gl_p.h
@@ -145,7 +145,7 @@ private:
void copyBackFromRenderFbo(bool keepCurrentFboBound) const;
QSize size() const { return QSize(w, h); }
- static bool useFramebufferObjects();
+ bool useFramebufferObjects() const;
QImage fillImage(const QColor &color) const;