From 23bda2d476612c0d69a6b8040b684cfb84beaeb5 Mon Sep 17 00:00:00 2001
From: Kelsi <kelsihates2fa@gmail.com>
Date: Fri, 3 Apr 2026 21:20:37 -0700
Subject: [PATCH] fix(vulkan): enable missing device features for FSR2 compute
 shaders

AMD RADV validation flagged missing shaderStorageImageWriteWithoutFormat,
shaderInt16, shaderFloat16, and deviceCoherentMemory. The first two are
now required device features; shaderFloat16 is optionally enabled via
Vulkan 1.2 feature query; AMD device coherent memory extension and
feature are enabled when available to prevent VMA memory type errors.
---
 src/rendering/vk_context.cpp | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/rendering/vk_context.cpp b/src/rendering/vk_context.cpp
index 4add9549..d3da4698 100644
--- a/src/rendering/vk_context.cpp
+++ b/src/rendering/vk_context.cpp
@@ -316,6 +316,8 @@ bool VkContext::selectPhysicalDevice() {
     VkPhysicalDeviceFeatures requiredFeatures{};
     requiredFeatures.samplerAnisotropy = VK_TRUE;
     requiredFeatures.fillModeNonSolid = VK_TRUE;  // wireframe debug pipelines
+    requiredFeatures.shaderStorageImageWriteWithoutFormat = VK_TRUE;  // FSR2 compute shaders
+    requiredFeatures.shaderInt16 = VK_TRUE;  // FSR2 compute shaders
     selector.set_surface(surface)
             .set_minimum_version(1, 1)
             .set_required_features(requiredFeatures)
@@ -390,6 +392,33 @@ bool VkContext::selectPhysicalDevice() {
 bool VkContext::createLogicalDevice() {
     vkb::DeviceBuilder deviceBuilder{vkbPhysicalDevice_};
 
+    // Enable optional Vulkan 1.2 features for FSR2 compute shaders (shaderFloat16)
+    VkPhysicalDeviceVulkan12Features enabled12{};
+    enabled12.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES;
+    if (instanceApiVersion_ >= VK_API_VERSION_1_2) {
+        VkPhysicalDeviceVulkan12Features supported12{};
+        supported12.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES;
+        VkPhysicalDeviceFeatures2 features2{};
+        features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
+        features2.pNext = &supported12;
+        vkGetPhysicalDeviceFeatures2(physicalDevice, &features2);
+        if (supported12.shaderFloat16) {
+            enabled12.shaderFloat16 = VK_TRUE;
+            LOG_INFO("Enabling shaderFloat16 for FSR2 compute shaders");
+        }
+        deviceBuilder.add_pNext(&enabled12);
+    }
+
+    // Enable AMD device coherent memory feature if the extension was enabled
+    // (prevents validation errors when VMA selects memory types with DEVICE_COHERENT_BIT_AMD)
+    VkPhysicalDeviceCoherentMemoryFeaturesAMD coherentFeatures{};
+    coherentFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COHERENT_MEMORY_FEATURES_AMD;
+    if (vkbPhysicalDevice_.enable_extension_if_present(VK_AMD_DEVICE_COHERENT_MEMORY_EXTENSION_NAME)) {
+        coherentFeatures.deviceCoherentMemory = VK_TRUE;
+        deviceBuilder.add_pNext(&coherentFeatures);
+        LOG_INFO("Enabling AMD device coherent memory");
+    }
+
     // If the graphics queue family supports >= 2 queues, request a second one
     // for parallel texture/buffer uploads.  Both queues share the same family
     // so no queue-ownership-transfer barriers are needed.