From 61d7831405c5ea8d3df9005caaba8a1d2513262d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
Date: Wed, 7 Jun 2023 13:15:15 +0200
Subject: [PATCH] rhi: Enable HDRExtendedSrgbLinear for iOS

Change-Id: Iaff3c0d18c07cc0cd4ed57a8e6fa7fb07b130a58
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 95d10ae682f1e6e67927166c3b04adc39f6aee23)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/gui/rhi/qrhimetal.mm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/gui/rhi/qrhimetal.mm b/src/gui/rhi/qrhimetal.mm
index 7ef200649f9..ac372e10864 100644
--- a/src/gui/rhi/qrhimetal.mm
+++ b/src/gui/rhi/qrhimetal.mm
@@ -6105,9 +6105,12 @@ QSize QMetalSwapChain::surfacePixelSize()
 
 bool QMetalSwapChain::isFormatSupported(Format f)
 {
-#ifdef Q_OS_MACOS
-    return f == SDR || f == HDRExtendedSrgbLinear;
-#endif
+    if (f == HDRExtendedSrgbLinear) {
+        if (@available(macOS 10.11, iOS 16.0, *))
+            return true;
+        else
+            return false;
+    }
     return f == SDR;
 }
 
@@ -6189,13 +6192,13 @@ bool QMetalSwapChain::createOrResize()
     chooseFormats();
     if (d->colorFormat != d->layer.pixelFormat)
         d->layer.pixelFormat = d->colorFormat;
-#ifdef Q_OS_MACOS
-    // Can't enable this on iOS until wantsExtendedDynamicRangeContent is available
+
     if (m_format == HDRExtendedSrgbLinear) {
-        d->layer.colorspace = CGColorSpaceCreateWithName(kCGColorSpaceExtendedLinearSRGB);
-        d->layer.wantsExtendedDynamicRangeContent = YES;
+        if (@available(macOS 10.11, iOS 16.0, *)) {
+            d->layer.colorspace = CGColorSpaceCreateWithName(kCGColorSpaceExtendedLinearSRGB);
+            d->layer.wantsExtendedDynamicRangeContent = YES;
+        }
     }
-#endif
 
     if (m_flags.testFlag(UsedAsTransferSource))
         d->layer.framebufferOnly = NO;