summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2010-06-24 01:23:57 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2010-06-24 01:23:57 (GMT)
commit9de452bba5b592402ced6f20fbdc6d0b5c075416 (patch)
tree4a485a22a60daf6524670cd34b7adea50ceaa5a7
parent5cfa764466be6ec2b987e0694b99f1d343d55048 (diff)
downloadQt-9de452bba5b592402ced6f20fbdc6d0b5c075416.zip
Qt-9de452bba5b592402ced6f20fbdc6d0b5c075416.tar.gz
Qt-9de452bba5b592402ced6f20fbdc6d0b5c075416.tar.bz2
Normalize integers when calling glVertexAttribPointer()
When QGLShaderProgram::setAttributeArray() is used with a type like GL_UNSIGNED_BYTE, it is normally going to be a value that should be normalized to the range 0..1. But the function wasn't normalizing, which led to errors in programs that used per-vertex colors with the 4ub representation. Reviewed-by: Sarah Smith
-rw-r--r--src/opengl/qglshaderprogram.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 83b4b21..c7689b8 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -1490,7 +1490,7 @@ void QGLShaderProgram::setAttributeArray
Q_D(QGLShaderProgram);
Q_UNUSED(d);
if (location != -1) {
- glVertexAttribPointer(location, tupleSize, type, GL_FALSE,
+ glVertexAttribPointer(location, tupleSize, type, GL_TRUE,
stride, values);
}
}
@@ -1634,7 +1634,7 @@ void QGLShaderProgram::setAttributeBuffer
Q_D(QGLShaderProgram);
Q_UNUSED(d);
if (location != -1) {
- glVertexAttribPointer(location, tupleSize, type, GL_FALSE, stride,
+ glVertexAttribPointer(location, tupleSize, type, GL_TRUE, stride,
reinterpret_cast<const void *>(offset));
}
}