Module: Mesa Branch: main Commit: 24c755316ba10999ae0de8ad1d92ed3d777c27fd URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=24c755316ba10999ae0de8ad1d92ed3d777c27fd
Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Tue Dec 5 18:03:42 2023 +0100 vulkan/runtime: promote VK_EXT_vertex_attribute_divisor to KHR Just rename existing structs. Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26595> --- src/vulkan/runtime/vk_graphics_state.c | 6 +++--- src/vulkan/runtime/vk_graphics_state.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/vulkan/runtime/vk_graphics_state.c b/src/vulkan/runtime/vk_graphics_state.c index 407fabe3ad8..2bfc3833153 100644 --- a/src/vulkan/runtime/vk_graphics_state.c +++ b/src/vulkan/runtime/vk_graphics_state.c @@ -337,12 +337,12 @@ vk_vertex_input_state_init(struct vk_vertex_input_state *vi, vi->attributes[a].offset = desc->offset; } - const VkPipelineVertexInputDivisorStateCreateInfoEXT *vi_div_state = + const VkPipelineVertexInputDivisorStateCreateInfoKHR *vi_div_state = vk_find_struct_const(vi_info->pNext, - PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_EXT); + PIPELINE_VERTEX_INPUT_DIVISOR_STATE_CREATE_INFO_KHR); if (vi_div_state) { for (uint32_t i = 0; i < vi_div_state->vertexBindingDivisorCount; i++) { - const VkVertexInputBindingDivisorDescriptionEXT *desc = + const VkVertexInputBindingDivisorDescriptionKHR *desc = &vi_div_state->pVertexBindingDivisors[i]; assert(desc->binding < MESA_VK_MAX_VERTEX_BINDINGS); diff --git a/src/vulkan/runtime/vk_graphics_state.h b/src/vulkan/runtime/vk_graphics_state.h index d6c8c68b020..628db8f8dd1 100644 --- a/src/vulkan/runtime/vk_graphics_state.h +++ b/src/vulkan/runtime/vk_graphics_state.h @@ -128,7 +128,7 @@ struct vk_vertex_binding_state { /** VkVertexInputBindingDescription::inputRate */ uint16_t input_rate; - /** VkVertexInputBindingDivisorDescriptionEXT::divisor or 1 */ + /** VkVertexInputBindingDivisorDescriptionKHR::divisor or 1 */ uint32_t divisor; };
