summaryrefslogtreecommitdiffstats
path: root/src/opengl/qglshaderprogram.h
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.h
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.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 2500275..19ce9f2 100644
--- a/src/opengl/qglshaderprogram.h
+++ b/src/opengl/qglshaderprogram.h
@@ -182,6 +182,17 @@ public:
void setAttributeBuffer
(const char *name, GLenum type, int offset, int tupleSize, int stride = 0);
+#ifdef Q_MAC_COMPAT_GL_FUNCTIONS
+ void setAttributeArray
+ (int location, QMacCompatGLenum type, const void *values, int tupleSize, int stride = 0);
+ void setAttributeArray
+ (const char *name, QMacCompatGLenum type, const void *values, int tupleSize, int stride = 0);
+ void setAttributeBuffer
+ (int location, QMacCompatGLenum type, int offset, int tupleSize, int stride = 0);
+ void setAttributeBuffer
+ (const char *name, QMacCompatGLenum type, int offset, int tupleSize, int stride = 0);
+#endif
+
void enableAttributeArray(int location);
void enableAttributeArray(const char *name);
void disableAttributeArray(int location);