From 95ec0c050bfb3c919c4657d1b0877ff7d286385a Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 26 Nov 2019 14:01:43 +0100 Subject: [PATCH] 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 Reviewed-by: Bas Nieuwenhuizen --- src/amd/vulkan/radv_descriptor_set.c | 16 ++++++++-------- src/amd/vulkan/radv_device.c | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c index 8a6f2fc2121..473503b9789 100644 --- 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 a7906919ecd..2e691443b30 100644 --- 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; -- 2.30.2