From 6a7effe059545539836e4f452590fddde29fe025 Mon Sep 17 00:00:00 2001 From: Xaver Hugl Date: Tue, 29 Jul 2025 16:10:42 +0200 Subject: [PATCH] vulkan/wsi: remove support for VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT It's not really clear whether or not it should use gamma 2.2 or the piece-wise transfer function, or how clients would use it for wider gamut in general. Currently no compositors I know of support ext_srgb, so this shouldn't affect applications in practice. Signed-off-by: Xaver Hugl Fixes: 4b663d56 ("vulkan/wsi: implement support for VK_EXT_hdr_metadata on Wayland") (cherry picked from commit 14fcf145e3d95975b9d93d8c91b20331709b9d22) Part-of: --- .pick_status.json | 2 +- src/vulkan/wsi/wsi_common_wayland.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 71f862f49cb..13f54a61142 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -594,7 +594,7 @@ "description": "vulkan/wsi: remove support for VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "4b663d561b877c24fe1f500e14cf7efc62fd5373", "notes": null diff --git a/src/vulkan/wsi/wsi_common_wayland.c b/src/vulkan/wsi/wsi_common_wayland.c index 9d5e246d133..ae9aa257bf6 100644 --- a/src/vulkan/wsi/wsi_common_wayland.c +++ b/src/vulkan/wsi/wsi_common_wayland.c @@ -1002,12 +1002,9 @@ struct Colorspace colorspace_mapping[] = { /* VK_COLOR_SPACE_ADOBERGB_NONLINEAR_EXT is left out because there's no * exactly matching transfer function in the Wayland protocol */ /* VK_COLOR_SPACE_PASS_THROUGH_EXT is handled elsewhere */ - { - .colorspace = VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT, - .primaries = WP_COLOR_MANAGER_V1_PRIMARIES_SRGB, - .tf = WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_EXT_SRGB, - .should_use_hdr_metadata = true, - }, + /* VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT is intentionally not added + * as it's a bit unclear how exactly it should be used + * and whether or not the transfer function should be gamma 2.2 or piece-wise */ /* VK_COLOR_SPACE_DISPLAY_NATIVE_AMD isn't supported */ /* VK_COLORSPACE_SRGB_NONLINEAR_KHR is just an alias */ /* VK_COLOR_SPACE_DCI_P3_LINEAR_EXT is just an alias */