diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-01-04 08:48:39 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-01-04 08:48:39 (GMT) |
| commit | c855c61ed5c80a97f3a2858a15453f9e041db7f8 (patch) | |
| tree | 68b86fe5adc7a5c19a237ee1e5bba147ccf92f23 /src/opengl/qglshaderprogram.h | |
| parent | 65a0c8cc6d2c13cfb2cef22e8a23f4e3050fde25 (diff) | |
| parent | 06bdf48e9194d73075041efecde5c70a144d6927 (diff) | |
| download | Qt-c855c61ed5c80a97f3a2858a15453f9e041db7f8.zip Qt-c855c61ed5c80a97f3a2858a15453f9e041db7f8.tar.gz Qt-c855c61ed5c80a97f3a2858a15453f9e041db7f8.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
Diffstat (limited to 'src/opengl/qglshaderprogram.h')
| -rw-r--r-- | src/opengl/qglshaderprogram.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h index deeaee2..4eb80dd 100644 --- a/src/opengl/qglshaderprogram.h +++ b/src/opengl/qglshaderprogram.h @@ -216,6 +216,8 @@ public: void setUniformValue(int location, const QMatrix4x2& value); void setUniformValue(int location, const QMatrix4x3& value); void setUniformValue(int location, const QMatrix4x4& value); + void setUniformValue(int location, const GLfloat value[2][2]); + void setUniformValue(int location, const GLfloat value[3][3]); void setUniformValue(int location, const GLfloat value[4][4]); void setUniformValue(int location, const QTransform& value); @@ -242,6 +244,8 @@ public: void setUniformValue(const char *name, const QMatrix4x2& value); void setUniformValue(const char *name, const QMatrix4x3& value); void setUniformValue(const char *name, const QMatrix4x4& value); + void setUniformValue(const char *name, const GLfloat value[2][2]); + void setUniformValue(const char *name, const GLfloat value[3][3]); void setUniformValue(const char *name, const GLfloat value[4][4]); void setUniformValue(const char *name, const QTransform& value); |