diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-04-14 13:48:28 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2020-04-17 11:50:24 +0200 |
| commit | ad5aee2e34fad45d1d90bb059fa00a791d4ba3e2 (patch) | |
| tree | 0df5be078e937caf0cec39b312449128300735dc /src/platformsupport | |
| parent | 009d583eef20e7732225cdeae32925ac676d3a47 (diff) | |
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 <lars.knoll@qt.io>
Diffstat (limited to 'src/platformsupport')
| -rw-r--r-- | src/platformsupport/eglconvenience/qeglplatformcontext.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp index 63cf771f32..d38a850065 100644 --- a/src/platformsupport/eglconvenience/qeglplatformcontext.cpp +++ b/src/platformsupport/eglconvenience/qeglplatformcontext.cpp @@ -466,7 +466,7 @@ QFunctionPointer QEGLPlatformContext::getProcAddress(const char *procName) const char *name; QFunctionPointer func; } standardFuncs[] = { -#ifdef QT_OPENGL_ES_2 +#if QT_CONFIG(opengles2) { "glBindTexture", (QFunctionPointer) ::glBindTexture }, { "glBlendFunc", (QFunctionPointer) ::glBlendFunc }, { "glClear", (QFunctionPointer) ::glClear }, @@ -611,9 +611,9 @@ QFunctionPointer QEGLPlatformContext::getProcAddress(const char *procName) { "glClearDepthf", (QFunctionPointer) ::glClearDepthf }, { "glDepthRangef", (QFunctionPointer) ::glDepthRangef }, -#endif // QT_OPENGL_ES_2 +#endif // QT_CONFIG(opengles2) -#ifdef QT_OPENGL_ES_3 +#if QT_CONFIG(opengles3) { "glBeginQuery", (QFunctionPointer) ::glBeginQuery }, { "glBeginTransformFeedback", (QFunctionPointer) ::glBeginTransformFeedback }, { "glBindBufferBase", (QFunctionPointer) ::glBindBufferBase }, @@ -718,9 +718,9 @@ QFunctionPointer QEGLPlatformContext::getProcAddress(const char *procName) { "glVertexAttribI4uiv", (QFunctionPointer) ::glVertexAttribI4uiv }, { "glVertexAttribIPointer", (QFunctionPointer) ::glVertexAttribIPointer }, { "glWaitSync", (QFunctionPointer) ::glWaitSync }, -#endif // QT_OPENGL_ES_3 +#endif // QT_CONFIG(opengles3) -#ifdef QT_OPENGL_ES_3_1 +#if QT_CONFIG(opengles31) { "glActiveShaderProgram", (QFunctionPointer) ::glActiveShaderProgram }, { "glBindImageTexture", (QFunctionPointer) ::glBindImageTexture }, { "glBindProgramPipeline", (QFunctionPointer) ::glBindProgramPipeline }, @@ -789,9 +789,9 @@ QFunctionPointer QEGLPlatformContext::getProcAddress(const char *procName) { "glVertexAttribFormat", (QFunctionPointer) ::glVertexAttribFormat }, { "glVertexAttribIFormat", (QFunctionPointer) ::glVertexAttribIFormat }, { "glVertexBindingDivisor", (QFunctionPointer) ::glVertexBindingDivisor }, -#endif // QT_OPENGL_ES_3_1 +#endif // QT_CONFIG(opengles31) -#ifdef QT_OPENGL_ES_3_2 +#if QT_CONFIG(opengles32) { "glBlendBarrier", (QFunctionPointer) ::glBlendBarrier }, { "glCopyImageSubData", (QFunctionPointer) ::glCopyImageSubData }, { "glDebugMessageControl", (QFunctionPointer) ::glDebugMessageControl }, @@ -836,7 +836,7 @@ QFunctionPointer QEGLPlatformContext::getProcAddress(const char *procName) { "glTexBuffer", (QFunctionPointer) ::glTexBuffer }, { "glTexBufferRange", (QFunctionPointer) ::glTexBufferRange }, { "glTexStorage3DMultisample", (QFunctionPointer) ::glTexStorage3DMultisample }, -#endif // QT_OPENGL_ES_3_2 +#endif // QT_CONFIG(opengles32) }; for (size_t i = 0; i < sizeof(standardFuncs) / sizeof(StdFunc); ++i) { |