diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2024-03-18 21:55:12 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2024-03-19 14:52:48 +0100 |
| commit | 14ec2ab89fa3347f95170d6980a6c793b7f37424 (patch) | |
| tree | 88686ff27beffaa7f98a0639777a51ab36cbd05e /src/gui/rhi | |
| parent | e8e029e2a5573eecd7358cd5ed66afa89debb306 (diff) | |
Add configure feature for Metal
Simplifies maintenance of code paths that rely on Metal.
Change-Id: I1d1f705fffc14dbafde346eeb555b43be6d5be54
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/gui/rhi')
| -rw-r--r-- | src/gui/rhi/qrhi.cpp | 8 | ||||
| -rw-r--r-- | src/gui/rhi/qrhi_platform.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp index 874484b518..25df9c6003 100644 --- a/src/gui/rhi/qrhi.cpp +++ b/src/gui/rhi/qrhi.cpp @@ -16,7 +16,7 @@ #include "qrhid3d11_p.h" #include "qrhid3d12_p.h" #endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) +#if QT_CONFIG(metal) #include "qrhimetal_p.h" #endif @@ -8477,7 +8477,7 @@ QRhi *QRhi::create(Implementation impl, QRhiInitParams *params, Flags flags, QRh break; #endif case Metal: -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) +#if QT_CONFIG(metal) r->d = new QRhiMetal(static_cast<QRhiMetalInitParams *>(params), static_cast<QRhiMetalNativeHandles *>(importDevice)); break; @@ -8536,7 +8536,7 @@ bool QRhi::probe(QRhi::Implementation impl, QRhiInitParams *params) // create() and then drop the result. if (impl == Metal) { -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) +#if QT_CONFIG(metal) ok = QRhiMetal::probe(static_cast<QRhiMetalInitParams *>(params)); #endif } else { @@ -8587,7 +8587,7 @@ bool QRhi::probe(QRhi::Implementation impl, QRhiInitParams *params) */ QRhiSwapChainProxyData QRhi::updateSwapChainProxyData(QRhi::Implementation impl, QWindow *window) { -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) +#if QT_CONFIG(metal) if (impl == Metal) return QRhiMetal::updateSwapChainProxyData(window); #else diff --git a/src/gui/rhi/qrhi_platform.h b/src/gui/rhi/qrhi_platform.h index 0268cc6e49..e7be522c52 100644 --- a/src/gui/rhi/qrhi_platform.h +++ b/src/gui/rhi/qrhi_platform.h @@ -23,7 +23,7 @@ #include <QtGui/qvulkaninstance.h> #endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_QDOC) +#if QT_CONFIG(metal) || defined(Q_QDOC) Q_FORWARD_DECLARE_OBJC_CLASS(MTLDevice); Q_FORWARD_DECLARE_OBJC_CLASS(MTLCommandQueue); Q_FORWARD_DECLARE_OBJC_CLASS(MTLCommandBuffer); @@ -150,7 +150,7 @@ struct Q_GUI_EXPORT QRhiD3D12CommandBufferNativeHandles : public QRhiNativeHandl #endif // WIN/QDOC -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) || defined(Q_QDOC) +#if QT_CONFIG(metal) || defined(Q_QDOC) struct Q_GUI_EXPORT QRhiMetalInitParams : public QRhiInitParams { |