From 77265157de3c238d0f4cee61cb3dab753070dcec Mon Sep 17 00:00:00 2001 From: CamilleLaVey Date: Thu, 25 Dec 2025 23:03:27 -0400 Subject: [PATCH] Revert "fix it goddamn" --- src/video_core/vulkan_common/vulkan_device.cpp | 8 -------- src/video_core/vulkan_common/vulkan_device.h | 4 ---- 2 files changed, 12 deletions(-) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 8219bd07a3..6c143a6974 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -1188,13 +1188,9 @@ bool Device::GetSuitability(bool requires_swapchain) { SetNext(next, properties.float_controls); } if (extensions.shader_float_controls2) { -#ifdef VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_2_KHR properties.float_controls2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_2_KHR; SetNext(next, properties.float_controls2); -#else - LOG_INFO(Render_Vulkan, "VK_KHR_shader_float_controls2 available but Vulkan headers lack VkPhysicalDeviceFloatControlsProperties2KHR; skipping properties2 chaining"); -#endif } if (extensions.push_descriptor) { properties.push_descriptor.sType = @@ -1228,15 +1224,11 @@ bool Device::GetSuitability(bool requires_swapchain) { // If VK_KHR_shader_float_controls2 is available, copy its inner properties for // backwards compatibility with code that expects VkPhysicalDeviceFloatControlsProperties. if (extensions.shader_float_controls2) { -#ifdef VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_2_KHR properties.float_controls = properties.float_controls2.floatControls; LOG_INFO(Render_Vulkan, "VK_KHR_shader_float_controls2 supported: denormBehaviorIndependence={}, roundingModeIndependence={}", properties.float_controls.denormBehaviorIndependence, properties.float_controls.roundingModeIndependence); -#else - LOG_INFO(Render_Vulkan, "VK_KHR_shader_float_controls2 present but float_controls2 struct not available in headers; cannot copy floatControls"); -#endif } // Store base properties diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h index 4794058aa5..d66364d9c4 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h @@ -345,12 +345,10 @@ public: return properties.float_controls; } -#ifdef VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_2_KHR /// Returns float control properties (KHR v2) of the device. const VkPhysicalDeviceFloatControlsProperties2KHR& FloatControlProperties2() const { return properties.float_controls2; } -#endif /// Returns true if ASTC is natively supported. @@ -1057,9 +1055,7 @@ private: VkPhysicalDeviceDriverProperties driver{}; VkPhysicalDeviceSubgroupProperties subgroup_properties{}; VkPhysicalDeviceFloatControlsProperties float_controls{}; -#ifdef VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_2_KHR VkPhysicalDeviceFloatControlsProperties2KHR float_controls2{}; -#endif VkPhysicalDevicePushDescriptorPropertiesKHR push_descriptor{}; VkPhysicalDeviceSubgroupSizeControlProperties subgroup_size_control{}; VkPhysicalDeviceTransformFeedbackPropertiesEXT transform_feedback{};