1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove dead code from QOpenGLPaintEngine

Browse Source 
These variables were never used or set to anything meaningfull.

Change-Id: Ic68ac5c38a3db28d7a5a05be004bcb6a554a1483
Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
This commit is contained in:
Allan Sandfeld Jensen 2016-01-18 11:57:05 +01:00
parent f33c6f37a8
commit c7a86c5e0c
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/opengl/qopenglpaintengine.cpp
View File

@ -93,13 +93,6 @@ QOpenGL2PaintEngineExPrivate::~QOpenGL2PaintEngineExPrivate()
{ {
delete shaderManager; 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) { if (elementIndicesVBOId != 0) {
funcs.glDeleteBuffers(1, &elementIndicesVBOId); funcs.glDeleteBuffers(1, &elementIndicesVBOId);
elementIndicesVBOId = 0; elementIndicesVBOId = 0;
@ -292,8 +285,6 @@ void QOpenGL2PaintEngineExPrivate::updateBrushTexture()
} }
updateTexture(QT_BRUSH_TEXTURE_UNIT, currentBrushImage, wrapMode, filterMode, ForceUpdate); updateTexture(QT_BRUSH_TEXTURE_UNIT, currentBrushImage, wrapMode, filterMode, ForceUpdate);
textureInvertedY = false;
} }
brushTextureDirty = false; brushTextureDirty = false;
} }
@ -409,11 +400,7 @@ void QOpenGL2PaintEngineExPrivate::updateBrushUniforms()
dy = 0; dy = 0;
} }
QTransform gl_to_qt(1, 0, 0, m22, 0, dy); QTransform gl_to_qt(1, 0, 0, m22, 0, dy);
QTransform inv_matrix; QTransform inv_matrix = gl_to_qt * (brushQTransform * matrix).inverted() * translate;
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;
shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::BrushTransform), inv_matrix); shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::BrushTransform), inv_matrix);
shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::BrushTexture), QT_BRUSH_TEXTURE_UNIT); shaderManager->currentProgram()->setUniformValue(location(QOpenGLEngineShaderManager::BrushTexture), QT_BRUSH_TEXTURE_UNIT);

5
src/gui/opengl/qopenglpaintengine_p.h
View File

@ -309,14 +309,9 @@ public:
bool needsSync; bool needsSync;
bool multisamplingAlwaysEnabled; bool multisamplingAlwaysEnabled;
GLfloat depthRange[2];
float textureInvertedY;
QTriangulatingStroker stroker; QTriangulatingStroker stroker;
QDashedStrokeProcessor dasher; QDashedStrokeProcessor dasher;
QSet<QVectorPath::CacheEntry *> pathCaches;
QVector<GLuint> unusedVBOSToClean; QVector<GLuint> unusedVBOSToClean;
QVector<GLuint> unusedIBOSToClean; QVector<GLuint> unusedIBOSToClean;