From e8f96dd0b01df9c7e9e48b68eb846d93bd5036a9 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Mon, 29 Apr 2024 08:57:35 +0200 Subject: [PATCH] v3dv: fix VK_KHR_vertex_attribute_divisor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When this was promoted to EXT it expanded its properties struct to add a new supportsNonZeroFirstInstance field. Fixes: d38ff02c03 ("v3dv: mark some promoted extensions as supported") Fixes: dEQP-VK.api.info.vulkan1p2_limits_validation.khr_vertex_attribute_divisor Reviewed-by: Alejandro Piñeiro Part-of: --- src/broadcom/ci/broadcom-rpi4-fails.txt | 3 --- src/broadcom/ci/broadcom-rpi5-fails.txt | 2 -- src/broadcom/vulkan/v3dv_device.c | 7 +++++++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/broadcom/ci/broadcom-rpi4-fails.txt b/src/broadcom/ci/broadcom-rpi4-fails.txt index bac3d618634..c7569cc5ff4 100644 --- a/src/broadcom/ci/broadcom-rpi4-fails.txt +++ b/src/broadcom/ci/broadcom-rpi4-fails.txt @@ -597,6 +597,3 @@ spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader 512 42 8 8 8,Fai dEQP-VK.api.get_device_proc_addr.non_enabled,Fail # This is a bug in CTS: https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5096 dEQP-VK.api.command_buffers.many_indirect_draws_on_secondary,Fail - -# New CTS failures in 1.3.8.2 -dEQP-VK.api.info.vulkan1p2_limits_validation.khr_vertex_attribute_divisor,Fail diff --git a/src/broadcom/ci/broadcom-rpi5-fails.txt b/src/broadcom/ci/broadcom-rpi5-fails.txt index 3241bf827dc..b0e1f35b70b 100644 --- a/src/broadcom/ci/broadcom-rpi5-fails.txt +++ b/src/broadcom/ci/broadcom-rpi5-fails.txt @@ -7,5 +7,3 @@ dEQP-VK.query_pool.performance_query.query_graphic_copy,Fail dEQP-VK.api.get_device_proc_addr.non_enabled,Fail # This is a bug in CTS: https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/5096 dEQP-VK.api.command_buffers.many_indirect_draws_on_secondary,Fail - -dEQP-VK.api.info.vulkan1p2_limits_validation.khr_vertex_attribute_divisor,Fail diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c index 7992cab59ff..b88923ca51b 100644 --- a/src/broadcom/vulkan/v3dv_device.c +++ b/src/broadcom/vulkan/v3dv_device.c @@ -1462,6 +1462,13 @@ v3dv_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice, props->maxVertexAttribDivisor = 0xffff; break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VERTEX_ATTRIBUTE_DIVISOR_PROPERTIES_KHR: { + VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR *props = + (VkPhysicalDeviceVertexAttributeDivisorPropertiesKHR *)ext; + props->maxVertexAttribDivisor = 0xffff; + props->supportsNonZeroFirstInstance = true; + break; + } case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_PROPERTIES_KHR : { VkPhysicalDevicePerformanceQueryPropertiesKHR *props = (VkPhysicalDevicePerformanceQueryPropertiesKHR *)ext;