summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglshaderprogram.h
diff options
context:
space:
mode:
authorTom Cooksey <thomas.cooksey@nokia.com>2009-11-04 14:23:22 (GMT)
committerTom Cooksey <thomas.cooksey@nokia.com>2009-11-04 14:40:56 (GMT)
commit4e5a1a77677540422cc69ec5c2b1341ca4b318f9 (patch)
tree0a150cdb9e47310f44757c7d949b7086c92f6060 /src/opengl/qglshaderprogram.h
parent8734e9643c38970a3b3a4dfc1484a6ec5b9ce9f8 (diff)
downloadQt-4e5a1a77677540422cc69ec5c2b1341ca4b318f9.zip
Qt-4e5a1a77677540422cc69ec5c2b1341ca4b318f9.tar.gz
Qt-4e5a1a77677540422cc69ec5c2b1341ca4b318f9.tar.bz2
Add QMacGLCompatTypes to QGLShaderProgram API
Diffstat (limited to 'src/opengl/qglshaderprogram.h')
-rw-r--r--src/opengl/qglshaderprogram.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h
index b7bd2d7..49c3364 100644
--- a/src/opengl/qglshaderprogram.h
+++ b/src/opengl/qglshaderprogram.h
@@ -181,6 +181,17 @@ public:
int uniformLocation(const QByteArray& name) const;
int uniformLocation(const QString& name) const;
+#ifdef Q_MAC_COMPAT_GL_FUNCTIONS
+ void setUniformValue(int location, QMacCompatGLint value);
+ void setUniformValue(int location, QMacCompatGLuint value);
+ void setUniformValue(const char *name, QMacCompatGLint value);
+ void setUniformValue(const char *name, QMacCompatGLuint value);
+ void setUniformValueArray(int location, const QMacCompatGLint *values, int count);
+ void setUniformValueArray(int location, const QMacCompatGLuint *values, int count);
+ void setUniformValueArray(const char *name, const QMacCompatGLint *values, int count);
+ void setUniformValueArray(const char *name, const QMacCompatGLuint *values, int count);
+#endif
+
void setUniformValue(int location, GLfloat value);
void setUniformValue(int location, GLint value);
void setUniformValue(int location, GLuint value);