From 7d2e67b1b306e7c4772b2f420d8524df838e26da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 10 Jun 2024 14:56:51 +0200 Subject: [PATCH] QRhiMetal: Replace deprecated supportsFeatureSet with supportsFamily https://developer.apple.com/metal/Metal-Feature-Set-Tables.pdf Change-Id: Ic1d2f6056fb1eff8652d91d63c7db7cc5c6ed005 Reviewed-by: Volker Hilsheimer (cherry picked from commit cdcbed3bd63bcf5bc842c3b44a555193b98df5a4) Reviewed-by: Qt Cherry-pick Bot --- src/gui/rhi/qrhimetal.mm | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/src/gui/rhi/qrhimetal.mm b/src/gui/rhi/qrhimetal.mm index 887d40c7a59..00214d22a9f 100644 --- a/src/gui/rhi/qrhimetal.mm +++ b/src/gui/rhi/qrhimetal.mm @@ -610,23 +610,17 @@ bool QRhiMetal::create(QRhi::Flags flags) caps.maxThreadGroupSize = 1024; caps.multiView = true; #elif defined(Q_OS_TVOS) - if ([d->dev supportsFeatureSet: MTLFeatureSet(30003)]) // MTLFeatureSet_tvOS_GPUFamily2_v1 + if ([d->dev supportsFamily:MTLGPUFamilyApple3]) caps.maxTextureSize = 16384; else caps.maxTextureSize = 8192; caps.baseVertexAndInstance = false; caps.isAppleGPU = true; #elif defined(Q_OS_IOS) - // welcome to feature set hell - if ([d->dev supportsFeatureSet: MTLFeatureSet(16)] // MTLFeatureSet_iOS_GPUFamily5_v1 - || [d->dev supportsFeatureSet: MTLFeatureSet(11)] // MTLFeatureSet_iOS_GPUFamily4_v1 - || [d->dev supportsFeatureSet: MTLFeatureSet(4)]) // MTLFeatureSet_iOS_GPUFamily3_v1 - { + if ([d->dev supportsFamily:MTLGPUFamilyApple3]) { caps.maxTextureSize = 16384; caps.baseVertexAndInstance = true; - } else if ([d->dev supportsFeatureSet: MTLFeatureSet(3)] // MTLFeatureSet_iOS_GPUFamily2_v2 - || [d->dev supportsFeatureSet: MTLFeatureSet(2)]) // MTLFeatureSet_iOS_GPUFamily1_v2 - { + } else if ([d->dev supportsFamily:MTLGPUFamilyApple2]) { caps.maxTextureSize = 8192; caps.baseVertexAndInstance = false; } else { @@ -635,9 +629,9 @@ bool QRhiMetal::create(QRhi::Flags flags) } caps.isAppleGPU = true; if (@available(iOS 13, *)) { - if ([d->dev supportsFamily: MTLGPUFamilyApple4]) + if ([d->dev supportsFamily:MTLGPUFamilyApple4]) caps.maxThreadGroupSize = 1024; - if ([d->dev supportsFamily: MTLGPUFamilyApple5]) + if ([d->dev supportsFamily:MTLGPUFamilyApple5]) caps.multiView = true; } #endif