radv: update VK_EXT_descriptor_indexing for Vulkan 1.2

Promoted to Vulkan 1.2 with the EXT suffix omitted.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>

diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c
index 8a6f2fc2121a1c5a8e0774ef7b66818d301f8463..473503b978999f2d2b5c425adbd88b8ecddc4657 100644 (file)
--- a/src/amd/vulkan/radv_descriptor_set.c
+++ b/src/amd/vulkan/radv_descriptor_set.c
@@ -78,8 +78,8 @@ VkResult radv_CreateDescriptorSetLayout(
        struct radv_descriptor_set_layout *set_layout;
 
        assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_CREATE_INFO);
-       const VkDescriptorSetLayoutBindingFlagsCreateInfoEXT *variable_flags =
-               vk_find_struct_const(pCreateInfo->pNext, DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT);
+       const VkDescriptorSetLayoutBindingFlagsCreateInfo *variable_flags =
+               vk_find_struct_const(pCreateInfo->pNext, DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO);
 
        uint32_t max_binding = 0;
        uint32_t immutable_sampler_count = 0;
@@ -310,10 +310,10 @@ void radv_GetDescriptorSetLayoutSupport(VkDevice device,
                return;
        }
 
-       const VkDescriptorSetLayoutBindingFlagsCreateInfoEXT *variable_flags =
-               vk_find_struct_const(pCreateInfo->pNext, DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO_EXT);
-       VkDescriptorSetVariableDescriptorCountLayoutSupportEXT *variable_count =
-               vk_find_struct((void*)pCreateInfo->pNext, DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT_EXT);
+       const VkDescriptorSetLayoutBindingFlagsCreateInfo *variable_flags =
+               vk_find_struct_const(pCreateInfo->pNext, DESCRIPTOR_SET_LAYOUT_BINDING_FLAGS_CREATE_INFO);
+       VkDescriptorSetVariableDescriptorCountLayoutSupport *variable_count =
+               vk_find_struct((void*)pCreateInfo->pNext, DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_LAYOUT_SUPPORT);
        if (variable_count) {
                variable_count->maxVariableDescriptorCount = 0;
        }
@@ -770,8 +770,8 @@ VkResult radv_AllocateDescriptorSets(
        uint32_t i;
        struct radv_descriptor_set *set = NULL;
 
-       const VkDescriptorSetVariableDescriptorCountAllocateInfoEXT *variable_counts =
-               vk_find_struct_const(pAllocateInfo->pNext, DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO_EXT);
+       const VkDescriptorSetVariableDescriptorCountAllocateInfo *variable_counts =
+               vk_find_struct_const(pAllocateInfo->pNext, DESCRIPTOR_SET_VARIABLE_DESCRIPTOR_COUNT_ALLOCATE_INFO);
        const uint32_t zero = 0;
 
        /* allocate a set of buffers for each shader to contain descriptors */

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index a7906919ecd9faf4857ce1afab9bf45a0a7fd4fb..2e691443b300626537b746d4ce1e88899fdf41eb 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -998,9 +998,9 @@ void radv_GetPhysicalDeviceFeatures2(
                        features->samplerYcbcrConversion = true;
                        break;
                }
-               case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT: {
-                       VkPhysicalDeviceDescriptorIndexingFeaturesEXT *features =
-                               (VkPhysicalDeviceDescriptorIndexingFeaturesEXT*)ext;
+               case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES: {
+                       VkPhysicalDeviceDescriptorIndexingFeatures *features =
+                               (VkPhysicalDeviceDescriptorIndexingFeatures*)ext;
                        features->shaderInputAttachmentArrayDynamicIndexing = true;
                        features->shaderUniformTexelBufferArrayDynamicIndexing = true;
                        features->shaderStorageTexelBufferArrayDynamicIndexing = true;
@@ -1499,9 +1499,9 @@ void radv_GetPhysicalDeviceProperties2(
                        properties->maxVertexAttribDivisor = UINT32_MAX;
                        break;
                }
-               case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES_EXT: {
-                       VkPhysicalDeviceDescriptorIndexingPropertiesEXT *properties =
-                               (VkPhysicalDeviceDescriptorIndexingPropertiesEXT*)ext;
+               case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_PROPERTIES: {
+                       VkPhysicalDeviceDescriptorIndexingProperties *properties =
+                               (VkPhysicalDeviceDescriptorIndexingProperties*)ext;
                        properties->maxUpdateAfterBindDescriptorsInAllPools = UINT32_MAX / 64;
                        properties->shaderUniformBufferArrayNonUniformIndexingNative = false;
                        properties->shaderSampledImageArrayNonUniformIndexingNative = false;