diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-03-12 13:38:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-15 10:45:10 +0100 |
| commit | 3d2160056e409ad2508a8bff4288944d37e32f85 (patch) | |
| tree | 03e4cc4ccc354066796b2536acb2a5e74e142d56 /src/opengl/gl2paintengineex/qglengineshadermanager.cpp | |
| parent | 77bf302ce2d69fb01e41b02329fdb8419b6e9e52 (diff) | |
Resurrect QGLWidget::renderText()
The variant taking x, y, z has been broken in all Qt 5.x releases.
This is now corrected by making the GL2 paint engine capable of applying
a Z translation.
Task-number: QTBUG-31156
Change-Id: I119566e9e9577f6cdf7e8bae56cac1e34995e622
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
Diffstat (limited to 'src/opengl/gl2paintengineex/qglengineshadermanager.cpp')
| -rw-r--r-- | src/opengl/gl2paintengineex/qglengineshadermanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp index 56f3f5ad0a..f266318ba6 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp +++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp @@ -534,7 +534,8 @@ GLuint QGLEngineShaderManager::getUniformLocation(Uniform id) "invertedTextureSize", "brushTransform", "brushTexture", - "matrix" + "matrix", + "translateZ" }; if (uniformLocations.at(id) == GLuint(-1)) |