summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglshaderprogram.cpp
diff options
context:
space:
mode:
authorRhys Weatherley <rhys.weatherley@nokia.com>2010-02-05 05:17:16 (GMT)
committerRhys Weatherley <rhys.weatherley@nokia.com>2010-02-05 05:17:54 (GMT)
commit622446fdd8b6ac14287b65fc640e07819e136a3c (patch)
tree2a4a7133083128b3335f282c3d7237c9196e4448 /src/opengl/qglshaderprogram.cpp
parent7a413f40f8db4f20277f153c1e771da478a5e991 (diff)
downloadQt-622446fdd8b6ac14287b65fc640e07819e136a3c.zip
Qt-622446fdd8b6ac14287b65fc640e07819e136a3c.tar.gz
Qt-622446fdd8b6ac14287b65fc640e07819e136a3c.tar.bz2
Add QMacCompatGLenum overrides for new QGLShaderProgram functions
Task-number: QTBUG-7391 Reviewed-by: Sarah Smith
Diffstat (limited to 'src/opengl/qglshaderprogram.cpp')
-rw-r--r--src/opengl/qglshaderprogram.cpp28
1 files changed, 28 insertions, 0 deletions
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 80b4872..255d51a 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -3078,6 +3078,34 @@ void QGLShaderProgram::shaderDestroyed()
#ifdef Q_MAC_COMPAT_GL_FUNCTIONS
/*! \internal */
+void QGLShaderProgram::setAttributeArray
+ (int location, QMacCompatGLenum type, const void *values, int tupleSize, int stride)
+{
+ setAttributeArray(location, GLenum(type), values, tupleSize, stride);
+}
+
+/*! \internal */
+void QGLShaderProgram::setAttributeArray
+ (const char *name, QMacCompatGLenum type, const void *values, int tupleSize, int stride)
+{
+ setAttributeArray(name, GLenum(type), values, tupleSize, stride);
+}
+
+/*! \internal */
+void QGLShaderProgram::setAttributeBuffer
+ (int location, QMacCompatGLenum type, int offset, int tupleSize, int stride)
+{
+ setAttributeBuffer(location, GLenum(type), offset, tupleSize, stride);
+}
+
+/*! \internal */
+void QGLShaderProgram::setAttributeBuffer
+ (const char *name, QMacCompatGLenum type, int offset, int tupleSize, int stride)
+{
+ setAttributeBuffer(name, GLenum(type), offset, tupleSize, stride);
+}
+
+/*! \internal */
void QGLShaderProgram::setUniformValue(int location, QMacCompatGLint value)
{
setUniformValue(location, GLint(value));