diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-20 23:44:02 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-05-01 00:17:46 (GMT) |
| commit | 2f60b9688cd48c0cbaaf06862273056ff3710863 (patch) | |
| tree | 717037de8417e3fedbfc5e2138c30f8470262b0e /src/opengl/qglshaderprogram.h | |
| parent | ab0ee278362ec8bd3acbed0e98b3392aad68bef5 (diff) | |
| download | Qt-2f60b9688cd48c0cbaaf06862273056ff3710863.zip Qt-2f60b9688cd48c0cbaaf06862273056ff3710863.tar.gz Qt-2f60b9688cd48c0cbaaf06862273056ff3710863.tar.bz2 | |
Samplers should be set via the GLuint override, not the GLint override.
Reviewed-by: trustme
Diffstat (limited to 'src/opengl/qglshaderprogram.h')
| -rw-r--r-- | src/opengl/qglshaderprogram.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h index 8a54a5d..d4780f7 100644 --- a/src/opengl/qglshaderprogram.h +++ b/src/opengl/qglshaderprogram.h @@ -248,6 +248,7 @@ public: void setUniformValueArray(int location, const GLfloat *values, int count, int size); void setUniformValueArray(int location, const GLint *values, int count); + void setUniformValueArray(int location, const GLuint *values, int count); void setUniformValueArray(int location, const QVector2D *values, int count); void setUniformValueArray(int location, const QVector3D *values, int count); void setUniformValueArray(int location, const QVector4D *values, int count); @@ -263,6 +264,7 @@ public: void setUniformValueArray(const char *name, const GLfloat *values, int count, int size); void setUniformValueArray(const char *name, const GLint *values, int count); + void setUniformValueArray(const char *name, const GLuint *values, int count); void setUniformValueArray(const char *name, const QVector2D *values, int count); void setUniformValueArray(const char *name, const QVector3D *values, int count); void setUniformValueArray(const char *name, const QVector4D *values, int count); |