From 57bcfe64f43c1b93cb62c0965e441d6b063ff9c3 Mon Sep 17 00:00:00 2001 From: Chip Davis Date: Tue, 6 Aug 2019 15:49:34 -0500 Subject: [PATCH] Fix name of Display-P3 linear color space. The old `DCI_P3_LINEAR` enum is deprecated. Use `VK_COLOR_SPACE_DISPLAY_P3_LINEAR_EXT` instead. This is a closer match for the Core Graphics name anyhow. --- MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm | 2 +- MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm index c512f30b..1360e4ec 100644 --- a/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm +++ b/MoltenVK/MoltenVK/GPUObjects/MVKDevice.mm @@ -497,7 +497,7 @@ VkResult MVKPhysicalDevice::getSurfaceFormats(MVKSurface* surface, colorSpaces.push_back(VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT); } if (mvkOSVersion() >= 10.14) { - colorSpaces.push_back(VK_COLOR_SPACE_DCI_P3_LINEAR_EXT); + colorSpaces.push_back(VK_COLOR_SPACE_DISPLAY_P3_LINEAR_EXT); colorSpaces.push_back(VK_COLOR_SPACE_BT2020_LINEAR_EXT); colorSpaces.push_back(VK_COLOR_SPACE_HDR10_ST2084_EXT); colorSpaces.push_back(VK_COLOR_SPACE_HDR10_HLG_EXT); diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm b/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm index 29c93b6c..ca26e351 100644 --- a/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm +++ b/MoltenVK/MoltenVK/GPUObjects/MVKSwapchain.mm @@ -308,7 +308,7 @@ void MVKSwapchain::initCAMetalLayer(const VkSwapchainCreateInfoKHR* pCreateInfo, _mtlLayer.colorspace = CGColorSpaceCreateWithName(kCGColorSpaceExtendedSRGB); _mtlLayer.wantsExtendedDynamicRangeContentMVK = YES; break; - case VK_COLOR_SPACE_DCI_P3_LINEAR_EXT: + case VK_COLOR_SPACE_DISPLAY_P3_LINEAR_EXT: _mtlLayer.colorspace = CGColorSpaceCreateWithName(kCGColorSpaceExtendedLinearDisplayP3); _mtlLayer.wantsExtendedDynamicRangeContentMVK = YES; break;