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/gui/opengl/qopenglprogrambinarycache.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/gui/opengl/qopenglprogrambinarycache.cpp')
| -rw-r--r-- | src/gui/opengl/qopenglprogrambinarycache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/opengl/qopenglprogrambinarycache.cpp b/src/gui/opengl/qopenglprogrambinarycache.cpp index 89c44e72c0..631c3d151b 100644 --- a/src/gui/opengl/qopenglprogrambinarycache.cpp +++ b/src/gui/opengl/qopenglprogrambinarycache.cpp @@ -190,7 +190,7 @@ bool QOpenGLProgramBinaryCache::setProgramBinary(uint programId, uint blobFormat if (error == GL_NO_ERROR || error == GL_CONTEXT_LOST) break; } -#if defined(QT_OPENGL_ES_2) +#if QT_CONFIG(opengles2) if (context->isOpenGLES() && context->format().majorVersion() < 3) { initializeProgramBinaryOES(context); programBinaryOES(programId, blobFormat, p, blobSize); @@ -412,7 +412,7 @@ void QOpenGLProgramBinaryCache::save(const QByteArray &cacheKey, uint programId) *p++ = 0; GLint outSize = 0; -#if defined(QT_OPENGL_ES_2) +#if QT_CONFIG(opengles2) if (context->isOpenGLES() && context->format().majorVersion() < 3) { QMutexLocker lock(&m_mutex); initializeProgramBinaryOES(context); @@ -443,7 +443,7 @@ void QOpenGLProgramBinaryCache::save(const QByteArray &cacheKey, uint programId) } } -#if defined(QT_OPENGL_ES_2) +#if QT_CONFIG(opengles2) void QOpenGLProgramBinaryCache::initializeProgramBinaryOES(QOpenGLContext *context) { if (m_programBinaryOESInitialized) |