From ad5aee2e34fad45d1d90bb059fa00a791d4ba3e2 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 14 Apr 2020 13:48:28 +0200 Subject: Get rid of QT_OPENGL_ES* The QT_OPENGL_ES* macros are leftovers from an earlier, ad hoc configuration system, which has since been replaced by QT_CONFIG. To clean things up in Qt 6, we use the new way instead. Task-number: QTBUG-83467 Change-Id: I578dc7695bff9d5ee303b22e44f60fee22fe0c28 Reviewed-by: Lars Knoll --- src/gui/opengl/qopenglfunctions.h | 286 +++++++++++++++++++------------------- 1 file changed, 143 insertions(+), 143 deletions(-) (limited to 'src/gui/opengl/qopenglfunctions.h') diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index 4554291bbd..66bdac5ca5 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -56,7 +56,7 @@ //#define Q_ENABLE_OPENGL_FUNCTIONS_DEBUG -#ifdef QT_OPENGL_ES +#if QT_CONFIG(opengles2) typedef double GLdouble; #endif @@ -599,7 +599,7 @@ struct QOpenGLFunctionsPrivate inline void QOpenGLFunctions::glBindTexture(GLenum target, GLuint texture) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glBindTexture(target, texture); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -610,7 +610,7 @@ inline void QOpenGLFunctions::glBindTexture(GLenum target, GLuint texture) inline void QOpenGLFunctions::glBlendFunc(GLenum sfactor, GLenum dfactor) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glBlendFunc(sfactor, dfactor); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -621,7 +621,7 @@ inline void QOpenGLFunctions::glBlendFunc(GLenum sfactor, GLenum dfactor) inline void QOpenGLFunctions::glClear(GLbitfield mask) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glClear(mask); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -632,7 +632,7 @@ inline void QOpenGLFunctions::glClear(GLbitfield mask) inline void QOpenGLFunctions::glClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glClearColor(red, green, blue, alpha); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -643,7 +643,7 @@ inline void QOpenGLFunctions::glClearColor(GLclampf red, GLclampf green, GLclamp inline void QOpenGLFunctions::glClearStencil(GLint s) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glClearStencil(s); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -654,7 +654,7 @@ inline void QOpenGLFunctions::glClearStencil(GLint s) inline void QOpenGLFunctions::glColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glColorMask(red, green, blue, alpha); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -665,7 +665,7 @@ inline void QOpenGLFunctions::glColorMask(GLboolean red, GLboolean green, GLbool inline void QOpenGLFunctions::glCopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glCopyTexImage2D(target, level, internalformat, x, y, width,height, border); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -676,7 +676,7 @@ inline void QOpenGLFunctions::glCopyTexImage2D(GLenum target, GLint level, GLenu inline void QOpenGLFunctions::glCopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -687,7 +687,7 @@ inline void QOpenGLFunctions::glCopyTexSubImage2D(GLenum target, GLint level, GL inline void QOpenGLFunctions::glCullFace(GLenum mode) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glCullFace(mode); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -698,7 +698,7 @@ inline void QOpenGLFunctions::glCullFace(GLenum mode) inline void QOpenGLFunctions::glDeleteTextures(GLsizei n, const GLuint* textures) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glDeleteTextures(n, textures); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -709,7 +709,7 @@ inline void QOpenGLFunctions::glDeleteTextures(GLsizei n, const GLuint* textures inline void QOpenGLFunctions::glDepthFunc(GLenum func) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glDepthFunc(func); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -720,7 +720,7 @@ inline void QOpenGLFunctions::glDepthFunc(GLenum func) inline void QOpenGLFunctions::glDepthMask(GLboolean flag) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glDepthMask(flag); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -731,7 +731,7 @@ inline void QOpenGLFunctions::glDepthMask(GLboolean flag) inline void QOpenGLFunctions::glDisable(GLenum cap) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glDisable(cap); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -742,7 +742,7 @@ inline void QOpenGLFunctions::glDisable(GLenum cap) inline void QOpenGLFunctions::glDrawArrays(GLenum mode, GLint first, GLsizei count) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glDrawArrays(mode, first, count); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -753,7 +753,7 @@ inline void QOpenGLFunctions::glDrawArrays(GLenum mode, GLint first, GLsizei cou inline void QOpenGLFunctions::glDrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid* indices) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glDrawElements(mode, count, type, indices); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -764,7 +764,7 @@ inline void QOpenGLFunctions::glDrawElements(GLenum mode, GLsizei count, GLenum inline void QOpenGLFunctions::glEnable(GLenum cap) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glEnable(cap); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -775,7 +775,7 @@ inline void QOpenGLFunctions::glEnable(GLenum cap) inline void QOpenGLFunctions::glFinish() { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glFinish(); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -786,7 +786,7 @@ inline void QOpenGLFunctions::glFinish() inline void QOpenGLFunctions::glFlush() { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glFlush(); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -797,7 +797,7 @@ inline void QOpenGLFunctions::glFlush() inline void QOpenGLFunctions::glFrontFace(GLenum mode) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glFrontFace(mode); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -808,7 +808,7 @@ inline void QOpenGLFunctions::glFrontFace(GLenum mode) inline void QOpenGLFunctions::glGenTextures(GLsizei n, GLuint* textures) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGenTextures(n, textures); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -819,7 +819,7 @@ inline void QOpenGLFunctions::glGenTextures(GLsizei n, GLuint* textures) inline void QOpenGLFunctions::glGetBooleanv(GLenum pname, GLboolean* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetBooleanv(pname, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -830,7 +830,7 @@ inline void QOpenGLFunctions::glGetBooleanv(GLenum pname, GLboolean* params) inline GLenum QOpenGLFunctions::glGetError() { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) GLenum result = ::glGetError(); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -841,7 +841,7 @@ inline GLenum QOpenGLFunctions::glGetError() inline void QOpenGLFunctions::glGetFloatv(GLenum pname, GLfloat* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetFloatv(pname, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -852,7 +852,7 @@ inline void QOpenGLFunctions::glGetFloatv(GLenum pname, GLfloat* params) inline void QOpenGLFunctions::glGetIntegerv(GLenum pname, GLint* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetIntegerv(pname, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -863,7 +863,7 @@ inline void QOpenGLFunctions::glGetIntegerv(GLenum pname, GLint* params) inline const GLubyte *QOpenGLFunctions::glGetString(GLenum name) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) const GLubyte *result = ::glGetString(name); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -875,7 +875,7 @@ inline const GLubyte *QOpenGLFunctions::glGetString(GLenum name) inline void QOpenGLFunctions::glGetTexParameterfv(GLenum target, GLenum pname, GLfloat* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetTexParameterfv(target, pname, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -886,7 +886,7 @@ inline void QOpenGLFunctions::glGetTexParameterfv(GLenum target, GLenum pname, G inline void QOpenGLFunctions::glGetTexParameteriv(GLenum target, GLenum pname, GLint* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetTexParameteriv(target, pname, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -897,7 +897,7 @@ inline void QOpenGLFunctions::glGetTexParameteriv(GLenum target, GLenum pname, G inline void QOpenGLFunctions::glHint(GLenum target, GLenum mode) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glHint(target, mode); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -908,7 +908,7 @@ inline void QOpenGLFunctions::glHint(GLenum target, GLenum mode) inline GLboolean QOpenGLFunctions::glIsEnabled(GLenum cap) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) GLboolean result = ::glIsEnabled(cap); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -920,7 +920,7 @@ inline GLboolean QOpenGLFunctions::glIsEnabled(GLenum cap) inline GLboolean QOpenGLFunctions::glIsTexture(GLuint texture) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) GLboolean result = ::glIsTexture(texture); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -932,7 +932,7 @@ inline GLboolean QOpenGLFunctions::glIsTexture(GLuint texture) inline void QOpenGLFunctions::glLineWidth(GLfloat width) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glLineWidth(width); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -943,7 +943,7 @@ inline void QOpenGLFunctions::glLineWidth(GLfloat width) inline void QOpenGLFunctions::glPixelStorei(GLenum pname, GLint param) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glPixelStorei(pname, param); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -954,7 +954,7 @@ inline void QOpenGLFunctions::glPixelStorei(GLenum pname, GLint param) inline void QOpenGLFunctions::glPolygonOffset(GLfloat factor, GLfloat units) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glPolygonOffset(factor, units); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -965,7 +965,7 @@ inline void QOpenGLFunctions::glPolygonOffset(GLfloat factor, GLfloat units) inline void QOpenGLFunctions::glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid* pixels) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glReadPixels(x, y, width, height, format, type, pixels); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -976,7 +976,7 @@ inline void QOpenGLFunctions::glReadPixels(GLint x, GLint y, GLsizei width, GLsi inline void QOpenGLFunctions::glScissor(GLint x, GLint y, GLsizei width, GLsizei height) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glScissor(x, y, width, height); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -987,7 +987,7 @@ inline void QOpenGLFunctions::glScissor(GLint x, GLint y, GLsizei width, GLsizei inline void QOpenGLFunctions::glStencilFunc(GLenum func, GLint ref, GLuint mask) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glStencilFunc(func, ref, mask); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -998,7 +998,7 @@ inline void QOpenGLFunctions::glStencilFunc(GLenum func, GLint ref, GLuint mask) inline void QOpenGLFunctions::glStencilMask(GLuint mask) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glStencilMask(mask); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1009,7 +1009,7 @@ inline void QOpenGLFunctions::glStencilMask(GLuint mask) inline void QOpenGLFunctions::glStencilOp(GLenum fail, GLenum zfail, GLenum zpass) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glStencilOp(fail, zfail, zpass); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1020,7 +1020,7 @@ inline void QOpenGLFunctions::glStencilOp(GLenum fail, GLenum zfail, GLenum zpas inline void QOpenGLFunctions::glTexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid* pixels) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glTexImage2D(target, level, internalformat, width,height, border, format, type, pixels); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1031,7 +1031,7 @@ inline void QOpenGLFunctions::glTexImage2D(GLenum target, GLint level, GLint int inline void QOpenGLFunctions::glTexParameterf(GLenum target, GLenum pname, GLfloat param) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glTexParameterf(target, pname, param); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1042,7 +1042,7 @@ inline void QOpenGLFunctions::glTexParameterf(GLenum target, GLenum pname, GLflo inline void QOpenGLFunctions::glTexParameterfv(GLenum target, GLenum pname, const GLfloat* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glTexParameterfv(target, pname, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1053,7 +1053,7 @@ inline void QOpenGLFunctions::glTexParameterfv(GLenum target, GLenum pname, cons inline void QOpenGLFunctions::glTexParameteri(GLenum target, GLenum pname, GLint param) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glTexParameteri(target, pname, param); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1064,7 +1064,7 @@ inline void QOpenGLFunctions::glTexParameteri(GLenum target, GLenum pname, GLint inline void QOpenGLFunctions::glTexParameteriv(GLenum target, GLenum pname, const GLint* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glTexParameteriv(target, pname, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1075,7 +1075,7 @@ inline void QOpenGLFunctions::glTexParameteriv(GLenum target, GLenum pname, cons inline void QOpenGLFunctions::glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid* pixels) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, type, pixels); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1086,7 +1086,7 @@ inline void QOpenGLFunctions::glTexSubImage2D(GLenum target, GLint level, GLint inline void QOpenGLFunctions::glViewport(GLint x, GLint y, GLsizei width, GLsizei height) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glViewport(x, y, width, height); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1099,7 +1099,7 @@ inline void QOpenGLFunctions::glViewport(GLint x, GLint y, GLsizei width, GLsize inline void QOpenGLFunctions::glActiveTexture(GLenum texture) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glActiveTexture(texture); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1110,7 +1110,7 @@ inline void QOpenGLFunctions::glActiveTexture(GLenum texture) inline void QOpenGLFunctions::glAttachShader(GLuint program, GLuint shader) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glAttachShader(program, shader); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1121,7 +1121,7 @@ inline void QOpenGLFunctions::glAttachShader(GLuint program, GLuint shader) inline void QOpenGLFunctions::glBindAttribLocation(GLuint program, GLuint index, const char* name) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glBindAttribLocation(program, index, name); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1132,7 +1132,7 @@ inline void QOpenGLFunctions::glBindAttribLocation(GLuint program, GLuint index, inline void QOpenGLFunctions::glBindBuffer(GLenum target, GLuint buffer) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glBindBuffer(target, buffer); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1145,7 +1145,7 @@ inline void QOpenGLFunctions::glBindFramebuffer(GLenum target, GLuint framebuffe { if (framebuffer == 0) framebuffer = QOpenGLContext::currentContext()->defaultFramebufferObject(); -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glBindFramebuffer(target, framebuffer); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1156,7 +1156,7 @@ inline void QOpenGLFunctions::glBindFramebuffer(GLenum target, GLuint framebuffe inline void QOpenGLFunctions::glBindRenderbuffer(GLenum target, GLuint renderbuffer) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glBindRenderbuffer(target, renderbuffer); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1167,7 +1167,7 @@ inline void QOpenGLFunctions::glBindRenderbuffer(GLenum target, GLuint renderbuf inline void QOpenGLFunctions::glBlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glBlendColor(red, green, blue, alpha); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1178,7 +1178,7 @@ inline void QOpenGLFunctions::glBlendColor(GLclampf red, GLclampf green, GLclamp inline void QOpenGLFunctions::glBlendEquation(GLenum mode) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glBlendEquation(mode); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1189,7 +1189,7 @@ inline void QOpenGLFunctions::glBlendEquation(GLenum mode) inline void QOpenGLFunctions::glBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glBlendEquationSeparate(modeRGB, modeAlpha); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1200,7 +1200,7 @@ inline void QOpenGLFunctions::glBlendEquationSeparate(GLenum modeRGB, GLenum mod inline void QOpenGLFunctions::glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, GLenum srcAlpha, GLenum dstAlpha) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1211,7 +1211,7 @@ inline void QOpenGLFunctions::glBlendFuncSeparate(GLenum srcRGB, GLenum dstRGB, inline void QOpenGLFunctions::glBufferData(GLenum target, qopengl_GLsizeiptr size, const void* data, GLenum usage) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glBufferData(target, size, data, usage); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1222,7 +1222,7 @@ inline void QOpenGLFunctions::glBufferData(GLenum target, qopengl_GLsizeiptr siz inline void QOpenGLFunctions::glBufferSubData(GLenum target, qopengl_GLintptr offset, qopengl_GLsizeiptr size, const void* data) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glBufferSubData(target, offset, size, data); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1233,7 +1233,7 @@ inline void QOpenGLFunctions::glBufferSubData(GLenum target, qopengl_GLintptr of inline GLenum QOpenGLFunctions::glCheckFramebufferStatus(GLenum target) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) GLenum result = ::glCheckFramebufferStatus(target); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1245,7 +1245,7 @@ inline GLenum QOpenGLFunctions::glCheckFramebufferStatus(GLenum target) inline void QOpenGLFunctions::glClearDepthf(GLclampf depth) { -#if defined(QT_OPENGL_ES) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glClearDepthf(depth); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1256,7 +1256,7 @@ inline void QOpenGLFunctions::glClearDepthf(GLclampf depth) inline void QOpenGLFunctions::glCompileShader(GLuint shader) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glCompileShader(shader); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1267,7 +1267,7 @@ inline void QOpenGLFunctions::glCompileShader(GLuint shader) inline void QOpenGLFunctions::glCompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glCompressedTexImage2D(target, level, internalformat, width, height, border, imageSize, data); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1278,7 +1278,7 @@ inline void QOpenGLFunctions::glCompressedTexImage2D(GLenum target, GLint level, inline void QOpenGLFunctions::glCompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glCompressedTexSubImage2D(target, level, xoffset, yoffset, width, height, format, imageSize, data); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1289,7 +1289,7 @@ inline void QOpenGLFunctions::glCompressedTexSubImage2D(GLenum target, GLint lev inline GLuint QOpenGLFunctions::glCreateProgram() { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) GLuint result = ::glCreateProgram(); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1301,7 +1301,7 @@ inline GLuint QOpenGLFunctions::glCreateProgram() inline GLuint QOpenGLFunctions::glCreateShader(GLenum type) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) GLuint result = ::glCreateShader(type); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1313,7 +1313,7 @@ inline GLuint QOpenGLFunctions::glCreateShader(GLenum type) inline void QOpenGLFunctions::glDeleteBuffers(GLsizei n, const GLuint* buffers) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glDeleteBuffers(n, buffers); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1324,7 +1324,7 @@ inline void QOpenGLFunctions::glDeleteBuffers(GLsizei n, const GLuint* buffers) inline void QOpenGLFunctions::glDeleteFramebuffers(GLsizei n, const GLuint* framebuffers) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glDeleteFramebuffers(n, framebuffers); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1335,7 +1335,7 @@ inline void QOpenGLFunctions::glDeleteFramebuffers(GLsizei n, const GLuint* fram inline void QOpenGLFunctions::glDeleteProgram(GLuint program) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glDeleteProgram(program); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1346,7 +1346,7 @@ inline void QOpenGLFunctions::glDeleteProgram(GLuint program) inline void QOpenGLFunctions::glDeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glDeleteRenderbuffers(n, renderbuffers); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1357,7 +1357,7 @@ inline void QOpenGLFunctions::glDeleteRenderbuffers(GLsizei n, const GLuint* ren inline void QOpenGLFunctions::glDeleteShader(GLuint shader) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glDeleteShader(shader); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1368,7 +1368,7 @@ inline void QOpenGLFunctions::glDeleteShader(GLuint shader) inline void QOpenGLFunctions::glDepthRangef(GLclampf zNear, GLclampf zFar) { -#if defined(QT_OPENGL_ES) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glDepthRangef(zNear, zFar); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1379,7 +1379,7 @@ inline void QOpenGLFunctions::glDepthRangef(GLclampf zNear, GLclampf zFar) inline void QOpenGLFunctions::glDetachShader(GLuint program, GLuint shader) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glDetachShader(program, shader); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1390,7 +1390,7 @@ inline void QOpenGLFunctions::glDetachShader(GLuint program, GLuint shader) inline void QOpenGLFunctions::glDisableVertexAttribArray(GLuint index) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glDisableVertexAttribArray(index); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1401,7 +1401,7 @@ inline void QOpenGLFunctions::glDisableVertexAttribArray(GLuint index) inline void QOpenGLFunctions::glEnableVertexAttribArray(GLuint index) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glEnableVertexAttribArray(index); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1412,7 +1412,7 @@ inline void QOpenGLFunctions::glEnableVertexAttribArray(GLuint index) inline void QOpenGLFunctions::glFramebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1423,7 +1423,7 @@ inline void QOpenGLFunctions::glFramebufferRenderbuffer(GLenum target, GLenum at inline void QOpenGLFunctions::glFramebufferTexture2D(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glFramebufferTexture2D(target, attachment, textarget, texture, level); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1434,7 +1434,7 @@ inline void QOpenGLFunctions::glFramebufferTexture2D(GLenum target, GLenum attac inline void QOpenGLFunctions::glGenBuffers(GLsizei n, GLuint* buffers) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGenBuffers(n, buffers); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1445,7 +1445,7 @@ inline void QOpenGLFunctions::glGenBuffers(GLsizei n, GLuint* buffers) inline void QOpenGLFunctions::glGenerateMipmap(GLenum target) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGenerateMipmap(target); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1456,7 +1456,7 @@ inline void QOpenGLFunctions::glGenerateMipmap(GLenum target) inline void QOpenGLFunctions::glGenFramebuffers(GLsizei n, GLuint* framebuffers) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGenFramebuffers(n, framebuffers); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1467,7 +1467,7 @@ inline void QOpenGLFunctions::glGenFramebuffers(GLsizei n, GLuint* framebuffers) inline void QOpenGLFunctions::glGenRenderbuffers(GLsizei n, GLuint* renderbuffers) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGenRenderbuffers(n, renderbuffers); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1478,7 +1478,7 @@ inline void QOpenGLFunctions::glGenRenderbuffers(GLsizei n, GLuint* renderbuffer inline void QOpenGLFunctions::glGetActiveAttrib(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetActiveAttrib(program, index, bufsize, length, size, type, name); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1489,7 +1489,7 @@ inline void QOpenGLFunctions::glGetActiveAttrib(GLuint program, GLuint index, GL inline void QOpenGLFunctions::glGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, char* name) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetActiveUniform(program, index, bufsize, length, size, type, name); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1500,7 +1500,7 @@ inline void QOpenGLFunctions::glGetActiveUniform(GLuint program, GLuint index, G inline void QOpenGLFunctions::glGetAttachedShaders(GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetAttachedShaders(program, maxcount, count, shaders); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1511,7 +1511,7 @@ inline void QOpenGLFunctions::glGetAttachedShaders(GLuint program, GLsizei maxco inline GLint QOpenGLFunctions::glGetAttribLocation(GLuint program, const char* name) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) GLint result = ::glGetAttribLocation(program, name); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1523,7 +1523,7 @@ inline GLint QOpenGLFunctions::glGetAttribLocation(GLuint program, const char* n inline void QOpenGLFunctions::glGetBufferParameteriv(GLenum target, GLenum pname, GLint* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetBufferParameteriv(target, pname, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1534,7 +1534,7 @@ inline void QOpenGLFunctions::glGetBufferParameteriv(GLenum target, GLenum pname inline void QOpenGLFunctions::glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetFramebufferAttachmentParameteriv(target, attachment, pname, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1545,7 +1545,7 @@ inline void QOpenGLFunctions::glGetFramebufferAttachmentParameteriv(GLenum targe inline void QOpenGLFunctions::glGetProgramiv(GLuint program, GLenum pname, GLint* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetProgramiv(program, pname, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1556,7 +1556,7 @@ inline void QOpenGLFunctions::glGetProgramiv(GLuint program, GLenum pname, GLint inline void QOpenGLFunctions::glGetProgramInfoLog(GLuint program, GLsizei bufsize, GLsizei* length, char* infolog) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetProgramInfoLog(program, bufsize, length, infolog); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1567,7 +1567,7 @@ inline void QOpenGLFunctions::glGetProgramInfoLog(GLuint program, GLsizei bufsiz inline void QOpenGLFunctions::glGetRenderbufferParameteriv(GLenum target, GLenum pname, GLint* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetRenderbufferParameteriv(target, pname, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1578,7 +1578,7 @@ inline void QOpenGLFunctions::glGetRenderbufferParameteriv(GLenum target, GLenum inline void QOpenGLFunctions::glGetShaderiv(GLuint shader, GLenum pname, GLint* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetShaderiv(shader, pname, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1589,7 +1589,7 @@ inline void QOpenGLFunctions::glGetShaderiv(GLuint shader, GLenum pname, GLint* inline void QOpenGLFunctions::glGetShaderInfoLog(GLuint shader, GLsizei bufsize, GLsizei* length, char* infolog) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetShaderInfoLog(shader, bufsize, length, infolog); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1600,7 +1600,7 @@ inline void QOpenGLFunctions::glGetShaderInfoLog(GLuint shader, GLsizei bufsize, inline void QOpenGLFunctions::glGetShaderPrecisionFormat(GLenum shadertype, GLenum precisiontype, GLint* range, GLint* precision) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetShaderPrecisionFormat(shadertype, precisiontype, range, precision); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1611,7 +1611,7 @@ inline void QOpenGLFunctions::glGetShaderPrecisionFormat(GLenum shadertype, GLen inline void QOpenGLFunctions::glGetShaderSource(GLuint shader, GLsizei bufsize, GLsizei* length, char* source) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetShaderSource(shader, bufsize, length, source); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1622,7 +1622,7 @@ inline void QOpenGLFunctions::glGetShaderSource(GLuint shader, GLsizei bufsize, inline void QOpenGLFunctions::glGetUniformfv(GLuint program, GLint location, GLfloat* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetUniformfv(program, location, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1633,7 +1633,7 @@ inline void QOpenGLFunctions::glGetUniformfv(GLuint program, GLint location, GLf inline void QOpenGLFunctions::glGetUniformiv(GLuint program, GLint location, GLint* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetUniformiv(program, location, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1644,7 +1644,7 @@ inline void QOpenGLFunctions::glGetUniformiv(GLuint program, GLint location, GLi inline GLint QOpenGLFunctions::glGetUniformLocation(GLuint program, const char* name) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) GLint result = ::glGetUniformLocation(program, name); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1656,7 +1656,7 @@ inline GLint QOpenGLFunctions::glGetUniformLocation(GLuint program, const char* inline void QOpenGLFunctions::glGetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetVertexAttribfv(index, pname, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1667,7 +1667,7 @@ inline void QOpenGLFunctions::glGetVertexAttribfv(GLuint index, GLenum pname, GL inline void QOpenGLFunctions::glGetVertexAttribiv(GLuint index, GLenum pname, GLint* params) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetVertexAttribiv(index, pname, params); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1678,7 +1678,7 @@ inline void QOpenGLFunctions::glGetVertexAttribiv(GLuint index, GLenum pname, GL inline void QOpenGLFunctions::glGetVertexAttribPointerv(GLuint index, GLenum pname, void** pointer) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glGetVertexAttribPointerv(index, pname, pointer); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1689,7 +1689,7 @@ inline void QOpenGLFunctions::glGetVertexAttribPointerv(GLuint index, GLenum pna inline GLboolean QOpenGLFunctions::glIsBuffer(GLuint buffer) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) GLboolean result = ::glIsBuffer(buffer); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1701,7 +1701,7 @@ inline GLboolean QOpenGLFunctions::glIsBuffer(GLuint buffer) inline GLboolean QOpenGLFunctions::glIsFramebuffer(GLuint framebuffer) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) GLboolean result = ::glIsFramebuffer(framebuffer); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1713,7 +1713,7 @@ inline GLboolean QOpenGLFunctions::glIsFramebuffer(GLuint framebuffer) inline GLboolean QOpenGLFunctions::glIsProgram(GLuint program) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) GLboolean result = ::glIsProgram(program); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1725,7 +1725,7 @@ inline GLboolean QOpenGLFunctions::glIsProgram(GLuint program) inline GLboolean QOpenGLFunctions::glIsRenderbuffer(GLuint renderbuffer) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) GLboolean result = ::glIsRenderbuffer(renderbuffer); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1737,7 +1737,7 @@ inline GLboolean QOpenGLFunctions::glIsRenderbuffer(GLuint renderbuffer) inline GLboolean QOpenGLFunctions::glIsShader(GLuint shader) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) GLboolean result = ::glIsShader(shader); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1749,7 +1749,7 @@ inline GLboolean QOpenGLFunctions::glIsShader(GLuint shader) inline void QOpenGLFunctions::glLinkProgram(GLuint program) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glLinkProgram(program); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1760,7 +1760,7 @@ inline void QOpenGLFunctions::glLinkProgram(GLuint program) inline void QOpenGLFunctions::glReleaseShaderCompiler() { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glReleaseShaderCompiler(); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1771,7 +1771,7 @@ inline void QOpenGLFunctions::glReleaseShaderCompiler() inline void QOpenGLFunctions::glRenderbufferStorage(GLenum target, GLenum internalformat, GLsizei width, GLsizei height) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glRenderbufferStorage(target, internalformat, width, height); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1782,7 +1782,7 @@ inline void QOpenGLFunctions::glRenderbufferStorage(GLenum target, GLenum intern inline void QOpenGLFunctions::glSampleCoverage(GLclampf value, GLboolean invert) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glSampleCoverage(value, invert); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1793,7 +1793,7 @@ inline void QOpenGLFunctions::glSampleCoverage(GLclampf value, GLboolean invert) inline void QOpenGLFunctions::glShaderBinary(GLint n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLint length) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glShaderBinary(n, shaders, binaryformat, binary, length); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1804,7 +1804,7 @@ inline void QOpenGLFunctions::glShaderBinary(GLint n, const GLuint* shaders, GLe inline void QOpenGLFunctions::glShaderSource(GLuint shader, GLsizei count, const char** string, const GLint* length) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glShaderSource(shader, count, string, length); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1815,7 +1815,7 @@ inline void QOpenGLFunctions::glShaderSource(GLuint shader, GLsizei count, const inline void QOpenGLFunctions::glStencilFuncSeparate(GLenum face, GLenum func, GLint ref, GLuint mask) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glStencilFuncSeparate(face, func, ref, mask); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1826,7 +1826,7 @@ inline void QOpenGLFunctions::glStencilFuncSeparate(GLenum face, GLenum func, GL inline void QOpenGLFunctions::glStencilMaskSeparate(GLenum face, GLuint mask) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glStencilMaskSeparate(face, mask); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1837,7 +1837,7 @@ inline void QOpenGLFunctions::glStencilMaskSeparate(GLenum face, GLuint mask) inline void QOpenGLFunctions::glStencilOpSeparate(GLenum face, GLenum fail, GLenum zfail, GLenum zpass) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glStencilOpSeparate(face, fail, zfail, zpass); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1848,7 +1848,7 @@ inline void QOpenGLFunctions::glStencilOpSeparate(GLenum face, GLenum fail, GLen inline void QOpenGLFunctions::glUniform1f(GLint location, GLfloat x) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform1f(location, x); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1859,7 +1859,7 @@ inline void QOpenGLFunctions::glUniform1f(GLint location, GLfloat x) inline void QOpenGLFunctions::glUniform1fv(GLint location, GLsizei count, const GLfloat* v) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform1fv(location, count, v); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1870,7 +1870,7 @@ inline void QOpenGLFunctions::glUniform1fv(GLint location, GLsizei count, const inline void QOpenGLFunctions::glUniform1i(GLint location, GLint x) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform1i(location, x); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1881,7 +1881,7 @@ inline void QOpenGLFunctions::glUniform1i(GLint location, GLint x) inline void QOpenGLFunctions::glUniform1iv(GLint location, GLsizei count, const GLint* v) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform1iv(location, count, v); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1892,7 +1892,7 @@ inline void QOpenGLFunctions::glUniform1iv(GLint location, GLsizei count, const inline void QOpenGLFunctions::glUniform2f(GLint location, GLfloat x, GLfloat y) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform2f(location, x, y); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1903,7 +1903,7 @@ inline void QOpenGLFunctions::glUniform2f(GLint location, GLfloat x, GLfloat y) inline void QOpenGLFunctions::glUniform2fv(GLint location, GLsizei count, const GLfloat* v) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform2fv(location, count, v); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1914,7 +1914,7 @@ inline void QOpenGLFunctions::glUniform2fv(GLint location, GLsizei count, const inline void QOpenGLFunctions::glUniform2i(GLint location, GLint x, GLint y) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform2i(location, x, y); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1925,7 +1925,7 @@ inline void QOpenGLFunctions::glUniform2i(GLint location, GLint x, GLint y) inline void QOpenGLFunctions::glUniform2iv(GLint location, GLsizei count, const GLint* v) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform2iv(location, count, v); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1936,7 +1936,7 @@ inline void QOpenGLFunctions::glUniform2iv(GLint location, GLsizei count, const inline void QOpenGLFunctions::glUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform3f(location, x, y, z); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1947,7 +1947,7 @@ inline void QOpenGLFunctions::glUniform3f(GLint location, GLfloat x, GLfloat y, inline void QOpenGLFunctions::glUniform3fv(GLint location, GLsizei count, const GLfloat* v) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform3fv(location, count, v); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1958,7 +1958,7 @@ inline void QOpenGLFunctions::glUniform3fv(GLint location, GLsizei count, const inline void QOpenGLFunctions::glUniform3i(GLint location, GLint x, GLint y, GLint z) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform3i(location, x, y, z); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1969,7 +1969,7 @@ inline void QOpenGLFunctions::glUniform3i(GLint location, GLint x, GLint y, GLin inline void QOpenGLFunctions::glUniform3iv(GLint location, GLsizei count, const GLint* v) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform3iv(location, count, v); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1980,7 +1980,7 @@ inline void QOpenGLFunctions::glUniform3iv(GLint location, GLsizei count, const inline void QOpenGLFunctions::glUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform4f(location, x, y, z, w); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -1991,7 +1991,7 @@ inline void QOpenGLFunctions::glUniform4f(GLint location, GLfloat x, GLfloat y, inline void QOpenGLFunctions::glUniform4fv(GLint location, GLsizei count, const GLfloat* v) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform4fv(location, count, v); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2002,7 +2002,7 @@ inline void QOpenGLFunctions::glUniform4fv(GLint location, GLsizei count, const inline void QOpenGLFunctions::glUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform4i(location, x, y, z, w); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2013,7 +2013,7 @@ inline void QOpenGLFunctions::glUniform4i(GLint location, GLint x, GLint y, GLin inline void QOpenGLFunctions::glUniform4iv(GLint location, GLsizei count, const GLint* v) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniform4iv(location, count, v); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2024,7 +2024,7 @@ inline void QOpenGLFunctions::glUniform4iv(GLint location, GLsizei count, const inline void QOpenGLFunctions::glUniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniformMatrix2fv(location, count, transpose, value); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2035,7 +2035,7 @@ inline void QOpenGLFunctions::glUniformMatrix2fv(GLint location, GLsizei count, inline void QOpenGLFunctions::glUniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniformMatrix3fv(location, count, transpose, value); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2046,7 +2046,7 @@ inline void QOpenGLFunctions::glUniformMatrix3fv(GLint location, GLsizei count, inline void QOpenGLFunctions::glUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose, const GLfloat* value) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUniformMatrix4fv(location, count, transpose, value); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2057,7 +2057,7 @@ inline void QOpenGLFunctions::glUniformMatrix4fv(GLint location, GLsizei count, inline void QOpenGLFunctions::glUseProgram(GLuint program) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glUseProgram(program); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2068,7 +2068,7 @@ inline void QOpenGLFunctions::glUseProgram(GLuint program) inline void QOpenGLFunctions::glValidateProgram(GLuint program) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glValidateProgram(program); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2079,7 +2079,7 @@ inline void QOpenGLFunctions::glValidateProgram(GLuint program) inline void QOpenGLFunctions::glVertexAttrib1f(GLuint indx, GLfloat x) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glVertexAttrib1f(indx, x); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2090,7 +2090,7 @@ inline void QOpenGLFunctions::glVertexAttrib1f(GLuint indx, GLfloat x) inline void QOpenGLFunctions::glVertexAttrib1fv(GLuint indx, const GLfloat* values) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glVertexAttrib1fv(indx, values); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2101,7 +2101,7 @@ inline void QOpenGLFunctions::glVertexAttrib1fv(GLuint indx, const GLfloat* valu inline void QOpenGLFunctions::glVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glVertexAttrib2f(indx, x, y); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2112,7 +2112,7 @@ inline void QOpenGLFunctions::glVertexAttrib2f(GLuint indx, GLfloat x, GLfloat y inline void QOpenGLFunctions::glVertexAttrib2fv(GLuint indx, const GLfloat* values) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glVertexAttrib2fv(indx, values); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2123,7 +2123,7 @@ inline void QOpenGLFunctions::glVertexAttrib2fv(GLuint indx, const GLfloat* valu inline void QOpenGLFunctions::glVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glVertexAttrib3f(indx, x, y, z); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2134,7 +2134,7 @@ inline void QOpenGLFunctions::glVertexAttrib3f(GLuint indx, GLfloat x, GLfloat y inline void QOpenGLFunctions::glVertexAttrib3fv(GLuint indx, const GLfloat* values) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glVertexAttrib3fv(indx, values); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2145,7 +2145,7 @@ inline void QOpenGLFunctions::glVertexAttrib3fv(GLuint indx, const GLfloat* valu inline void QOpenGLFunctions::glVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y, GLfloat z, GLfloat w) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glVertexAttrib4f(indx, x, y, z, w); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2156,7 +2156,7 @@ inline void QOpenGLFunctions::glVertexAttrib4f(GLuint indx, GLfloat x, GLfloat y inline void QOpenGLFunctions::glVertexAttrib4fv(GLuint indx, const GLfloat* values) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glVertexAttrib4fv(indx, values); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); @@ -2167,7 +2167,7 @@ inline void QOpenGLFunctions::glVertexAttrib4fv(GLuint indx, const GLfloat* valu inline void QOpenGLFunctions::glVertexAttribPointer(GLuint indx, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const void* ptr) { -#if defined(QT_OPENGL_ES_2) && defined(Q_OS_ANDROID) +#if QT_CONFIG(opengles2) && defined(Q_OS_ANDROID) ::glVertexAttribPointer(indx, size, type, normalized, stride, ptr); #else Q_ASSERT(QOpenGLFunctions::isInitialized(d_ptr)); -- cgit v1.2.3