diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-08-03 00:52:26 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-08-03 00:52:26 (GMT) |
| commit | 88917087b64a014a69d12946a162ab6588e733e6 (patch) | |
| tree | d96b76ca170f739770bc77658102f0d15f59ca97 /src/opengl | |
| parent | 374432a611c25d1c984220de410f5a65303b71f5 (diff) | |
| download | Qt-88917087b64a014a69d12946a162ab6588e733e6.zip Qt-88917087b64a014a69d12946a162ab6588e733e6.tar.gz Qt-88917087b64a014a69d12946a162ab6588e733e6.tar.bz2 | |
setUniformValue(QSize) was setting (w,w) not (w,h)
Task-number: QTBUG-12591
Reviewed-by: Daniel Pope
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qglshaderprogram.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp index bbfc2d5..edbb635 100644 --- a/src/opengl/qglshaderprogram.cpp +++ b/src/opengl/qglshaderprogram.cpp @@ -1971,7 +1971,7 @@ void QGLShaderProgram::setUniformValue(int location, const QSize& size) Q_D(QGLShaderProgram); Q_UNUSED(d); if (location != -1) { - GLfloat values[4] = {size.width(), size.width()}; + GLfloat values[4] = {size.width(), size.height()}; glUniform2fv(location, 1, values); } } |