diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-11-13 16:35:11 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2019-11-27 21:50:52 +0100 |
| commit | df0cb0edac85db1fe12442d332bafc1d508bc3ae (patch) | |
| tree | 843ccc014623b0200a698b6916f7a926bc88ede4 /src/quick/scenegraph/util | |
| parent | f6e90ba533b9b4b98cfcae3d31731c1cb794ee77 (diff) | |
Fix Metal usage on iOS
Also enable the two Metal-specific scenegraph examples on iOS.
Change-Id: I0e1e6d527544ea4a5bfb0d08ca2d32c762d3c699
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/quick/scenegraph/util')
| -rw-r--r-- | src/quick/scenegraph/util/qsgrhinativetextureimporter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/scenegraph/util/qsgrhinativetextureimporter.cpp b/src/quick/scenegraph/util/qsgrhinativetextureimporter.cpp index 7a7c19f587..85a88326ca 100644 --- a/src/quick/scenegraph/util/qsgrhinativetextureimporter.cpp +++ b/src/quick/scenegraph/util/qsgrhinativetextureimporter.cpp @@ -48,7 +48,7 @@ void QSGRhiNativeTextureImporter::buildWrapper(QRhi *rhi, QRhiTexture *t, #if !QT_CONFIG(vulkan) Q_UNUSED(nativeLayout); #endif -#if !QT_CONFIG(opengl) && !QT_CONFIG(vulkan) && !defined(Q_OS_WIN) && !defined(Q_OS_DARWIN) +#if !QT_CONFIG(opengl) && !QT_CONFIG(vulkan) && !defined(Q_OS_WIN) && !defined(Q_OS_MACOS) && !defined(Q_OS_IOS) Q_UNUSED(nativeObjectPtr); #endif @@ -83,7 +83,7 @@ void QSGRhiNativeTextureImporter::buildWrapper(QRhi *rhi, QRhiTexture *t, break; case QRhi::Metal: { -#ifdef Q_OS_DARWIN +#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) QRhiMetalTextureNativeHandles h; h.texture = *reinterpret_cast<void * const *>(nativeObjectPtr); t->buildFrom(&h); |