From c7a86c5e0c2c46be0972dac8ed797abbe3ed44ae Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Mon, 18 Jan 2016 11:57:05 +0100
Subject: Remove dead code from QOpenGLPaintEngine

These variables were never used or set to anything meaningfull.

Change-Id: Ic68ac5c38a3db28d7a5a05be004bcb6a554a1483
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
---
 src/gui/opengl/qopenglpaintengine.cpp | 15 +--------------
 src/gui/opengl/qopenglpaintengine_p.h |  5 -----
 2 files changed, 1 insertion(+), 19 deletions(-)

(limited to 'src/gui/opengl')

diff --git a/src/gui/opengl/qopenglpaintengine.cpp b/src/gui/opengl/qopenglpaintengine.cpp
index 4836dde343..0b92bf4b1d 100644
--- a/src/gui/opengl/qopenglpaintengine.cpp
+++ b/src/gui/opengl/qopenglpaintengine.cpp
@@ -93,13 +93,6 @@ QOpenGL2PaintEngineExPrivate::~QOpenGL2PaintEngineExPrivate()
 {
     delete shaderManager;
 
-    while (pathCaches.size()) {
-        QVectorPath::CacheEntry *e = *(pathCaches.constBegin());
-        e->cleanup(e->engine, e->data);
-        e->data = 0;
-        e->engine = 0;
-    }
-
     if (elementIndicesVBOId != 0) {
         funcs.glDeleteBuffers(1, &elementIndicesVBOId);
         elementIndicesVBOId = 0;
@@ -292,8 +285,6 @@ void QOpenGL2PaintEngineExPrivate::updateBrushTexture()
         }
 
         updateTexture(QT_BRUSH_TEXTURE_UNIT, currentBrushImage, wrapMode, filterMode, ForceUpdate);
-
-        textureInvertedY = false;
     }
     brushTextureDirty = false;
 }
@@ -409,11 +400,7 @@ void QOpenGL2PaintEngineExPrivate::updateBrushUniforms()
             dy = 0;
         }
         QTransform gl_to_qt(1, 0, 0, m22, 0, dy);
-        QTransform inv_matrix;
-        if (style == Qt::TexturePattern && textureInvertedY == -1)
-            inv_matrix = gl_to_qt * (QTransform(1, 0, 0, -1, 0, currentBrush.texture().height()) * brushQTransform * matrix).inverted() * translate;
-        else
-            inv_matrix = gl_to_qt * (brushQTransform * matrix).inverted() * translate;
+        QTransform inv_matrix = gl_to_qt * (brushQTransform * matrix).inverted() * translate;
 
         shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::BrushTransform), inv_matrix);
         shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::BrushTexture), QT_BRUSH_TEXTURE_UNIT);
diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h
index 17be72b1e9..f1ec669ca0 100644
--- a/src/gui/opengl/qopenglpaintengine_p.h
+++ b/src/gui/opengl/qopenglpaintengine_p.h
@@ -309,14 +309,9 @@ public:
     bool needsSync;
     bool multisamplingAlwaysEnabled;
 
-    GLfloat depthRange[2];
-
-    float textureInvertedY;
-
     QTriangulatingStroker stroker;
     QDashedStrokeProcessor dasher;
 
-    QSet<QVectorPath::CacheEntry *> pathCaches;
     QVector<GLuint> unusedVBOSToClean;
     QVector<GLuint> unusedIBOSToClean;
 
-- 
cgit v1.2.3