summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2010-12-13 13:21:39 (GMT)
committerSamuel Rødal <samuel.rodal@nokia.com>2010-12-13 13:40:14 (GMT)
commit69ed34d2aa77a3bacc7f66797baa514f35358b7e (patch)
tree07f6ef33ead5a3ac81f875508ae73ce2b0e33bf7 /src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
parentaae8f8432856125c94d93a9849914a7c6a7ecc76 (diff)
downloadQt-69ed34d2aa77a3bacc7f66797baa514f35358b7e.zip
Qt-69ed34d2aa77a3bacc7f66797baa514f35358b7e.tar.gz
Qt-69ed34d2aa77a3bacc7f66797baa514f35358b7e.tar.bz2
Fixed GL 2 engine rendering of images / pixmaps above max texture size.
Down-scale images or pixmaps that are above the max texture size. Not optimal performance-wise, but better than failing. Task-number: QTBUG-16033 Reviewed-by: Eskil Abrahamsen Blomfeldt
Diffstat (limited to 'src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h')
-rw-r--r--src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
index b255e75..02b737b 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h
@@ -274,6 +274,8 @@ public:
QBrush currentBrush; // May not be the state's brush!
const QBrush noBrush;
+ QPixmap currentBrushPixmap;
+
QGL2PEXVertexArray vertexCoordinateArray;
QGL2PEXVertexArray textureCoordinateArray;
QVector<GLushort> elementIndices;