From 4d9c5ebd978036cc1da587deda3ed8d7dcb174a8 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Wed, 9 Jul 2025 13:24:31 +0200 Subject: [PATCH] Vulkan: Move Wayland/HDR support out of experimental This PR moves Wayland/HDR support out of experimental. This allows more people to test and provide feedback. We can always decide later to disable it for the release, but so far we only got positive feedback. Pull Request: https://projects.blender.org/blender/blender/pulls/141666 --- scripts/startup/bl_ui/space_userpref.py | 7 ------- source/blender/gpu/vulkan/vk_context.cc | 3 +-- source/blender/makesdna/DNA_userdef_types.h | 3 +-- source/blender/makesrna/intern/rna_userdef.cc | 6 ------ 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/scripts/startup/bl_ui/space_userpref.py b/scripts/startup/bl_ui/space_userpref.py index be8e15f0af0..0b774e6612b 100644 --- a/scripts/startup/bl_ui/space_userpref.py +++ b/scripts/startup/bl_ui/space_userpref.py @@ -2880,13 +2880,6 @@ class USERPREF_PT_experimental_prototypes(ExperimentalPanel, Panel): ({"property": "write_legacy_blend_file_format"}, ("/blender/blender/issues/129309", "#129309")), ), ) - import sys - if sys.platform == "linux": - self._draw_items( - context, ( - ({"property": "use_vulkan_hdr"}, ("/blender/blender/issues/140277", "#140277")), - ), - ) # Keep this as tweaks can be useful to restore. diff --git a/source/blender/gpu/vulkan/vk_context.cc b/source/blender/gpu/vulkan/vk_context.cc index d5f7754464f..39104973158 100644 --- a/source/blender/gpu/vulkan/vk_context.cc +++ b/source/blender/gpu/vulkan/vk_context.cc @@ -98,8 +98,7 @@ void VKContext::sync_backbuffer(bool cycle_resource_pool) swap_chain_format_ = swap_chain_data.surface_format; vk_extent_ = swap_chain_data.extent; - GCaps.hdr_viewport_support = U.experimental.use_vulkan_hdr && - (swap_chain_format_.format == VK_FORMAT_R16G16B16A16_SFLOAT) && + GCaps.hdr_viewport_support = (swap_chain_format_.format == VK_FORMAT_R16G16B16A16_SFLOAT) && ELEM(swap_chain_format_.colorSpace, VK_COLOR_SPACE_EXTENDED_SRGB_NONLINEAR_EXT, VK_COLOR_SPACE_SRGB_NONLINEAR_KHR); diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 07156ae2799..631ca25bfba 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -227,8 +227,7 @@ typedef struct UserDef_Experimental { char use_shader_node_previews; char use_bundle_and_closure_nodes; char use_socket_structure_type; - char use_vulkan_hdr; - char _pad[4]; + char _pad[5]; } UserDef_Experimental; #define USER_EXPERIMENTAL_TEST(userdef, member) \ diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc index e02cf1ead6a..beda7c72241 100644 --- a/source/blender/makesrna/intern/rna_userdef.cc +++ b/source/blender/makesrna/intern/rna_userdef.cc @@ -7610,12 +7610,6 @@ static void rna_def_userdef_experimental(BlenderRNA *brna) "Recompute all ID usercounts before saving to a blendfile. Allows to " "work around invalid usercount handling in code that may lead to loss " "of data due to wrongly detected unused data-blocks"); - - prop = RNA_def_property(srna, "use_vulkan_hdr", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_ui_text( - prop, - "Vulkan HDR support Linux/Wayland", - "Enables HDR on Linux/Wayland on HDR capable setups. Requires a restart"); } static void rna_def_userdef_addon_collection(BlenderRNA *brna, PropertyRNA *cprop)