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/opengl/qopenglvertexarrayobject.cpp | |
| 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/opengl/qopenglvertexarrayobject.cpp')
| -rw-r--r-- | src/opengl/qopenglvertexarrayobject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/opengl/qopenglvertexarrayobject.cpp b/src/opengl/qopenglvertexarrayobject.cpp index e4bd24ef58..9c85d73c22 100644 --- a/src/opengl/qopenglvertexarrayobject.cpp +++ b/src/opengl/qopenglvertexarrayobject.cpp @@ -171,7 +171,7 @@ bool QOpenGLVertexArrayObjectPrivate::create() vaoFuncs.core_3_0 = nullptr; vaoFuncsType = NotSupported; QSurfaceFormat format = ctx->format(); -#ifndef QT_OPENGL_ES_2 +#if !QT_CONFIG(opengles2) if (format.version() >= qMakePair<int, int>(3,2)) { vaoFuncs.core_3_2 = QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_3_2_Core>(ctx); vaoFuncsType = Core_3_2; @@ -236,7 +236,7 @@ void QOpenGLVertexArrayObjectPrivate::destroy() if (vao && ctx) { switch (vaoFuncsType) { -#ifndef QT_OPENGL_ES_2 +#if !QT_CONFIG(opengles2) case Core_3_2: vaoFuncs.core_3_2->glDeleteVertexArrays(1, &vao); break; @@ -273,7 +273,7 @@ void QOpenGLVertexArrayObjectPrivate::_q_contextAboutToBeDestroyed() void QOpenGLVertexArrayObjectPrivate::bind() { switch (vaoFuncsType) { -#ifndef QT_OPENGL_ES_2 +#if !QT_CONFIG(opengles2) case Core_3_2: vaoFuncs.core_3_2->glBindVertexArray(vao); break; @@ -294,7 +294,7 @@ void QOpenGLVertexArrayObjectPrivate::bind() void QOpenGLVertexArrayObjectPrivate::release() { switch (vaoFuncsType) { -#ifndef QT_OPENGL_ES_2 +#if !QT_CONFIG(opengles2) case Core_3_2: vaoFuncs.core_3_2->glBindVertexArray(0); break; |