lavapipe: drop device pointer from lvp_cmd_buffer

just get it from the vk object.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38198>
This commit is contained in:
Dave Airlie 2025-11-02 05:38:44 +10:00
parent 8e01a11a00
commit 8fae2cb67f
3 changed files with 10 additions and 7 deletions

View file

@ -730,13 +730,13 @@ lvp_CmdBuildAccelerationStructuresKHR(VkCommandBuffer commandBuffer, uint32_t in
const VkAccelerationStructureBuildRangeInfoKHR *const *ppBuildRangeInfos)
{
VK_FROM_HANDLE(lvp_cmd_buffer, cmd_buffer, commandBuffer);
lvp_init_radix_sort(cmd_buffer->device);
struct lvp_device *device = lvp_cmd_buffer_device(cmd_buffer);
lvp_init_radix_sort(device);
lvp_enqueue_save_state(commandBuffer);
vk_cmd_build_acceleration_structures(commandBuffer, &cmd_buffer->device->vk, &cmd_buffer->device->meta,
infoCount, pInfos, ppBuildRangeInfos, &cmd_buffer->device->accel_struct_args);
vk_cmd_build_acceleration_structures(commandBuffer, &device->vk, &device->meta,
infoCount, pInfos, ppBuildRangeInfos, &device->accel_struct_args);
lvp_enqueue_restore_state(commandBuffer);
}

View file

@ -55,8 +55,6 @@ lvp_create_cmd_buffer(struct vk_command_pool *pool,
return result;
}
cmd_buffer->device = device;
*cmd_buffer_out = &cmd_buffer->vk;
return VK_SUCCESS;

View file

@ -597,10 +597,15 @@ struct lvp_query_pool {
struct lvp_cmd_buffer {
struct vk_command_buffer vk;
struct lvp_device *device;
uint8_t push_constants[MAX_PUSH_CONSTANTS_SIZE];
};
static inline struct lvp_device *
lvp_cmd_buffer_device(const struct lvp_cmd_buffer *cmd_buffer)
{
return (struct lvp_device *)cmd_buffer->vk.base.device;
}
struct lvp_indirect_command_layout_nv {
struct vk_object_base base;
uint8_t stream_count;