From e09310711540f44315871c3ffcb5059f8c3bec76 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Mon, 8 Apr 2024 11:03:44 -0400 Subject: [PATCH] lavapipe: lvp_indirect_command_layout -> lvp_indirect_command_layout_nv Part-of: --- .../frontends/lavapipe/lvp_device_generated_commands.c | 10 +++++----- src/gallium/frontends/lavapipe/lvp_execute.c | 4 ++-- src/gallium/frontends/lavapipe/lvp_private.h | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gallium/frontends/lavapipe/lvp_device_generated_commands.c b/src/gallium/frontends/lavapipe/lvp_device_generated_commands.c index 08189d11bff..0ff0fd209ca 100644 --- a/src/gallium/frontends/lavapipe/lvp_device_generated_commands.c +++ b/src/gallium/frontends/lavapipe/lvp_device_generated_commands.c @@ -30,12 +30,12 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateIndirectCommandsLayoutNV( VkIndirectCommandsLayoutNV* pIndirectCommandsLayout) { LVP_FROM_HANDLE(lvp_device, device, _device); - struct lvp_indirect_command_layout *dlayout; + struct lvp_indirect_command_layout_nv *dlayout; size_t size = sizeof(*dlayout) + pCreateInfo->tokenCount * sizeof(VkIndirectCommandsLayoutTokenNV); dlayout = - vk_zalloc2(&device->vk.alloc, pAllocator, size, alignof(struct lvp_indirect_command_layout), + vk_zalloc2(&device->vk.alloc, pAllocator, size, alignof(struct lvp_indirect_command_layout_nv), VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); if (!dlayout) return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); @@ -48,7 +48,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateIndirectCommandsLayoutNV( dlayout->stream_strides[i] = pCreateInfo->pStreamStrides[i]; typed_memcpy(dlayout->tokens, pCreateInfo->pTokens, pCreateInfo->tokenCount); - *pIndirectCommandsLayout = lvp_indirect_command_layout_to_handle(dlayout); + *pIndirectCommandsLayout = lvp_indirect_command_layout_nv_to_handle(dlayout); return VK_SUCCESS; } @@ -58,7 +58,7 @@ VKAPI_ATTR void VKAPI_CALL lvp_DestroyIndirectCommandsLayoutNV( const VkAllocationCallbacks* pAllocator) { LVP_FROM_HANDLE(lvp_device, device, _device); - VK_FROM_HANDLE(lvp_indirect_command_layout, layout, indirectCommandsLayout); + VK_FROM_HANDLE(lvp_indirect_command_layout_nv, layout, indirectCommandsLayout); if (!layout) return; @@ -106,7 +106,7 @@ VKAPI_ATTR void VKAPI_CALL lvp_GetGeneratedCommandsMemoryRequirementsNV( const VkGeneratedCommandsMemoryRequirementsInfoNV* pInfo, VkMemoryRequirements2* pMemoryRequirements) { - VK_FROM_HANDLE(lvp_indirect_command_layout, dlayout, pInfo->indirectCommandsLayout); + VK_FROM_HANDLE(lvp_indirect_command_layout_nv, dlayout, pInfo->indirectCommandsLayout); size_t size = sizeof(struct list_head); diff --git a/src/gallium/frontends/lavapipe/lvp_execute.c b/src/gallium/frontends/lavapipe/lvp_execute.c index 20267cbff3e..2b7986e91a0 100644 --- a/src/gallium/frontends/lavapipe/lvp_execute.c +++ b/src/gallium/frontends/lavapipe/lvp_execute.c @@ -3920,7 +3920,7 @@ get_buffer(struct rendering_state *state, const uint8_t *ptr, size_t *offset) static size_t process_sequence(struct rendering_state *state, - VkPipeline pipeline, struct lvp_indirect_command_layout *dlayout, + VkPipeline pipeline, struct lvp_indirect_command_layout_nv *dlayout, struct list_head *list, uint8_t *pbuf, size_t max_size, uint8_t **map_streams, const VkIndirectCommandsStreamNV *pstreams, uint32_t seq, bool print_cmds) { @@ -4068,7 +4068,7 @@ static void handle_preprocess_generated_commands(struct vk_cmd_queue_entry *cmd, struct rendering_state *state, bool print_cmds) { VkGeneratedCommandsInfoNV *pre = cmd->u.preprocess_generated_commands_nv.generated_commands_info; - VK_FROM_HANDLE(lvp_indirect_command_layout, dlayout, pre->indirectCommandsLayout); + VK_FROM_HANDLE(lvp_indirect_command_layout_nv, dlayout, pre->indirectCommandsLayout); struct pipe_transfer *stream_maps[16]; uint8_t *streams[16]; for (unsigned i = 0; i < pre->streamCount; i++) { diff --git a/src/gallium/frontends/lavapipe/lvp_private.h b/src/gallium/frontends/lavapipe/lvp_private.h index 5bbf294a5af..94aaaf2e014 100644 --- a/src/gallium/frontends/lavapipe/lvp_private.h +++ b/src/gallium/frontends/lavapipe/lvp_private.h @@ -649,7 +649,7 @@ struct lvp_cmd_buffer { uint8_t push_constants[MAX_PUSH_CONSTANTS_SIZE]; }; -struct lvp_indirect_command_layout { +struct lvp_indirect_command_layout_nv { struct vk_object_base base; uint8_t stream_count; uint8_t token_count; @@ -716,7 +716,7 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(lvp_query_pool, base, VkQueryPool, VK_OBJECT_TYPE_QUERY_POOL) VK_DEFINE_NONDISP_HANDLE_CASTS(lvp_sampler, vk.base, VkSampler, VK_OBJECT_TYPE_SAMPLER) -VK_DEFINE_NONDISP_HANDLE_CASTS(lvp_indirect_command_layout, base, VkIndirectCommandsLayoutNV, +VK_DEFINE_NONDISP_HANDLE_CASTS(lvp_indirect_command_layout_nv, base, VkIndirectCommandsLayoutNV, VK_OBJECT_TYPE_INDIRECT_COMMANDS_LAYOUT_NV) void lvp_add_enqueue_cmd_entrypoints(struct vk_device_dispatch_table *disp);