Commit 622446fdd8b6ac14287b65fc640e07819e136a3c

Add QMacCompatGLenum overrides for new QGLShaderProgram functions

Task-number: QTBUG-7391
Reviewed-by: Sarah Smith
src/opengl/qglshaderprogram.cpp
(28 / 0)
  
30783078
30793079#ifdef Q_MAC_COMPAT_GL_FUNCTIONS
30803080/*! \internal */
3081void QGLShaderProgram::setAttributeArray
3082 (int location, QMacCompatGLenum type, const void *values, int tupleSize, int stride)
3083{
3084 setAttributeArray(location, GLenum(type), values, tupleSize, stride);
3085}
3086
3087/*! \internal */
3088void QGLShaderProgram::setAttributeArray
3089 (const char *name, QMacCompatGLenum type, const void *values, int tupleSize, int stride)
3090{
3091 setAttributeArray(name, GLenum(type), values, tupleSize, stride);
3092}
3093
3094/*! \internal */
3095void QGLShaderProgram::setAttributeBuffer
3096 (int location, QMacCompatGLenum type, int offset, int tupleSize, int stride)
3097{
3098 setAttributeBuffer(location, GLenum(type), offset, tupleSize, stride);
3099}
3100
3101/*! \internal */
3102void QGLShaderProgram::setAttributeBuffer
3103 (const char *name, QMacCompatGLenum type, int offset, int tupleSize, int stride)
3104{
3105 setAttributeBuffer(name, GLenum(type), offset, tupleSize, stride);
3106}
3107
3108/*! \internal */
30813109void QGLShaderProgram::setUniformValue(int location, QMacCompatGLint value)
30823110{
30833111 setUniformValue(location, GLint(value));
src/opengl/qglshaderprogram.h
(11 / 0)
  
182182 void setAttributeBuffer
183183 (const char *name, GLenum type, int offset, int tupleSize, int stride = 0);
184184
185#ifdef Q_MAC_COMPAT_GL_FUNCTIONS
186 void setAttributeArray
187 (int location, QMacCompatGLenum type, const void *values, int tupleSize, int stride = 0);
188 void setAttributeArray
189 (const char *name, QMacCompatGLenum type, const void *values, int tupleSize, int stride = 0);
190 void setAttributeBuffer
191 (int location, QMacCompatGLenum type, int offset, int tupleSize, int stride = 0);
192 void setAttributeBuffer
193 (const char *name, QMacCompatGLenum type, int offset, int tupleSize, int stride = 0);
194#endif
195
185196 void enableAttributeArray(int location);
186197 void enableAttributeArray(const char *name);
187198 void disableAttributeArray(int location);