Vulkan validation fixes (#383)

* add shaderDrawParametersFeatures

* formatting

Author: skallweitNV

src/vulkan/vk-api.h

@@ -333,6 +333,11 @@ struct VulkanExtendedFeatureProperties
     // Vulkan 1.4 features.
     VkPhysicalDeviceVulkan14Features vulkan14Features = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_FEATURES};
 
+    // Draw parameters features
+    VkPhysicalDeviceShaderDrawParametersFeatures shaderDrawParametersFeatures = {
+        VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_DRAW_PARAMETERS_FEATURES
+    };
+
     // Dynamic rendering features
     VkPhysicalDeviceDynamicRenderingFeaturesKHR dynamicRenderingFeatures = {
         VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DYNAMIC_RENDERING_FEATURES_KHR
@@ -402,7 +407,7 @@ struct VulkanExtendedFeatureProperties
 
     // Shader subgroup rotate features
     VkPhysicalDeviceShaderSubgroupRotateFeatures shaderSubgroupRotateFeatures = {
-       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES_KHR
+        VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_ROTATE_FEATURES_KHR
     };
 };
 

src/vulkan/vk-command.cpp

@@ -1524,13 +1524,15 @@ void CommandRecorder::accelerationStructureBarrier(
     if (m_device->m_api.m_extendedFeatures.rayQueryFeatures.rayQuery)
     {
         // for VUID-vkCmdPipelineBarrier-dstAccessMask-06257
-        // If the rayQuery feature is not enabled and a memory barrier dstAccessMask includes VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR,
-        // dstStageMask must not include any of the VK_PIPELINE_STAGE_*_SHADER_BIT stages except VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR
-        dstStageMask = (VkPipelineStageFlagBits)(VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR |
-            VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT |
-            VK_PIPELINE_STAGE_TRANSFER_BIT | VK_PIPELINE_STAGE_VERTEX_SHADER_BIT |
-            VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |
-            VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR);
+        // If the rayQuery feature is not enabled and a memory barrier dstAccessMask includes
+        // VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR, dstStageMask must not include any of the
+        // VK_PIPELINE_STAGE_*_SHADER_BIT stages except VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR
+        dstStageMask =
+            (VkPipelineStageFlagBits)(VK_PIPELINE_STAGE_ACCELERATION_STRUCTURE_BUILD_BIT_KHR |
+                                      VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT | VK_PIPELINE_STAGE_TRANSFER_BIT |
+                                      VK_PIPELINE_STAGE_VERTEX_SHADER_BIT | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT |
+                                      VK_PIPELINE_STAGE_COMPUTE_SHADER_BIT |
+                                      VK_PIPELINE_STAGE_RAY_TRACING_SHADER_BIT_KHR);
     }
     m_device->m_api.vkCmdPipelineBarrier(
         m_cmdBuffer,

src/vulkan/vk-device.cpp

@@ -499,6 +499,10 @@ Result DeviceImpl::initVulkanInstanceAndDevice(
         extendedFeatures.rayTracingValidationFeatures.pNext = deviceFeatures2.pNext;
         deviceFeatures2.pNext = &extendedFeatures.rayTracingValidationFeatures;
 
+        // shader draw parameters features
+        extendedFeatures.shaderDrawParametersFeatures.pNext = deviceFeatures2.pNext;
+        deviceFeatures2.pNext = &extendedFeatures.shaderDrawParametersFeatures;
+
         // dynamic rendering features
         extendedFeatures.dynamicRenderingFeatures.pNext = deviceFeatures2.pNext;
         deviceFeatures2.pNext = &extendedFeatures.dynamicRenderingFeatures;
@@ -610,6 +614,13 @@ Result DeviceImpl::initVulkanInstanceAndDevice(
         }                                                                                                              \
     }
 
+        SIMPLE_EXTENSION_FEATURE(
+            extendedFeatures.shaderDrawParametersFeatures,
+            shaderDrawParameters,
+            VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME,
+            {}
+        );
+
         SIMPLE_EXTENSION_FEATURE(
             extendedFeatures.dynamicRenderingFeatures,
             dynamicRendering,
@@ -678,7 +689,7 @@ Result DeviceImpl::initVulkanInstanceAndDevice(
             extensionNames.count(VK_KHR_SHADER_SUBGROUP_ROTATE_EXTENSION_NAME))
         {
             extendedFeatures.shaderSubgroupRotateFeatures.shaderSubgroupRotate = VK_TRUE;
-            extendedFeatures.shaderSubgroupRotateFeatures.shaderSubgroupRotateClustered  = VK_TRUE;
+            extendedFeatures.shaderSubgroupRotateFeatures.shaderSubgroupRotateClustered = VK_TRUE;
             extendedFeatures.shaderSubgroupRotateFeatures.pNext = (void*)deviceCreateInfo.pNext;
             deviceCreateInfo.pNext = &extendedFeatures.shaderSubgroupRotateFeatures;
             deviceExtensions.push_back(VK_KHR_SHADER_SUBGROUP_ROTATE_EXTENSION_NAME);

src/vulkan/vk-helper-functions.cpp

@@ -195,8 +195,7 @@ VkAccessFlags translateAccelerationStructureAccessFlag(AccessFlag access)
 {
     VkAccessFlags result = 0;
     if ((uint32_t)access & (uint32_t)AccessFlag::Read)
-        result |=
-            VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR | VK_ACCESS_SHADER_READ_BIT;
+        result |= VK_ACCESS_ACCELERATION_STRUCTURE_READ_BIT_KHR | VK_ACCESS_SHADER_READ_BIT;
     if ((uint32_t)access & (uint32_t)AccessFlag::Write)
         result |= VK_ACCESS_ACCELERATION_STRUCTURE_WRITE_BIT_KHR;
     return result;