diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-10-18 11:58:47 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-10-18 12:38:23 +0200 |
| commit | 3f880c6174af2f96c5517ce1b5ba9098a9961c27 (patch) | |
| tree | 85b8d80a78d48cf95661af55e38b435b4ac62723 | |
| parent | 4ecf5c36a29c416321fbc040471085494dd17987 (diff) | |
Fix compilation with -no-opengl on macOS/iOS
Fixes: QTBUG-97485
Pick-to: 6.2
Change-Id: I3b51300677765f99248d8e88eccc3081733a053a
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
| -rw-r--r-- | src/multimedia/platform/darwin/avfvideobuffer.mm | 2 | ||||
| -rw-r--r-- | src/multimedia/platform/darwin/avfvideosink.mm | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/multimedia/platform/darwin/avfvideobuffer.mm b/src/multimedia/platform/darwin/avfvideobuffer.mm index 67cd42d50..e74dc10a8 100644 --- a/src/multimedia/platform/darwin/avfvideobuffer.mm +++ b/src/multimedia/platform/darwin/avfvideobuffer.mm @@ -190,6 +190,7 @@ quint64 AVFVideoBuffer::textureHandle(int plane) const // qDebug() << " -> " << quint64(CVMetalTextureGetTexture(cvMetalTexture[plane])); return cvMetalTexture[plane] ? quint64(CVMetalTextureGetTexture(cvMetalTexture[plane])) : 0; } else if (rhi->backend() == QRhi::OpenGLES2) { +#if QT_CONFIG(opengl) #ifdef Q_OS_MACOS CVOpenGLTextureCacheFlush(sink->cvOpenGLTextureCache, 0); CVReturn cvret; @@ -226,6 +227,7 @@ quint64 AVFVideoBuffer::textureHandle(int plane) const // Get an OpenGL texture name from the CVPixelBuffer-backed OpenGL texture image. return CVOpenGLESTextureGetName(cvOpenGLESTexture); #endif +#endif } return 0; } diff --git a/src/multimedia/platform/darwin/avfvideosink.mm b/src/multimedia/platform/darwin/avfvideosink.mm index ac4367140..53eefec28 100644 --- a/src/multimedia/platform/darwin/avfvideosink.mm +++ b/src/multimedia/platform/darwin/avfvideosink.mm @@ -150,6 +150,7 @@ void AVFVideoSinkInterface::setRhi(QRhi *rhi) m_rhi = nullptr; } } else if (rhi->backend() == QRhi::OpenGLES2) { +#if QT_CONFIG(opengl) #ifdef Q_OS_MACOS const auto *gl = static_cast<const QRhiGles2NativeHandles *>(rhi->nativeHandles()); @@ -180,6 +181,9 @@ void AVFVideoSinkInterface::setRhi(QRhi *rhi) m_rhi = nullptr; } #endif +#else + m_rhi = nullptr; +#endif // QT_CONFIG(opengl) } } |