summaryrefslogtreecommitdiffstats
path: root/src/gui/opengl/qopenglpaintengine_p.h
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2014-12-10 15:26:36 +0100
committerTor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>2014-12-14 17:09:58 +0100
commit1cc83b575d2a79b771b4b536a554cd4869c3687c (patch)
tree267cc5e625ad0fa600e2a88dd791ebb4fcc28aa0 /src/gui/opengl/qopenglpaintengine_p.h
parent37fa842f41311e71d4c94eaa380ebfa0965fa25d (diff)
Make GL2PaintEngine::drawCachedGlyphs use updateTexture
Ensures that we have a consistent view of what the last used texture was, which is critical when deciding whether or not we need to re-bind the texture or update texture properties. Change-Id: Ib47eb00abde98d148fc6e569ce3e359b340328fb Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'src/gui/opengl/qopenglpaintengine_p.h')
-rw-r--r--src/gui/opengl/qopenglpaintengine_p.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
index 297ac54640..9722ea3196 100644
--- a/src/gui/opengl/qopenglpaintengine_p.h
+++ b/src/gui/opengl/qopenglpaintengine_p.h
@@ -186,8 +186,7 @@ public:
snapToPixelGrid(false),
nativePaintingActive(false),
inverseScale(1),
- lastTextureUnitUsed(QT_UNKNOWN_TEXTURE_UNIT),
- lastMaskTextureUsed(0)
+ lastTextureUnitUsed(QT_UNKNOWN_TEXTURE_UNIT)
{ }
~QOpenGL2PaintEngineExPrivate();
@@ -306,7 +305,6 @@ public:
GLenum lastTextureUnitUsed;
GLuint lastTextureUsed;
- GLuint lastMaskTextureUsed;
bool needsSync;
bool multisamplingAlwaysEnabled;