mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

turnip: rename tu_queue_submit struct to follow ODR 

Signed-off-by: David Heidelberg <david@ixit.cz>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28728>
This commit is contained in:
David Heidelberg 2024-04-13 19:02:01 +02:00 committed by David Heidelberg
parent ea863c0c1c
commit 42b992cfab
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/freedreno/vulkan/tu_knl_drm_msm.cc
View File

@ -26,7 +26,7 @@
#include "tu_rmv.h"
#include "redump.h"
struct tu_queue_submit
struct tu_msm_queue_submit
{
struct vk_queue_submit *vk_submit;
struct tu_u_trace_submission_data *u_trace_submission_data;
@ -705,7 +705,7 @@ tu_queue_submit_create_locked(struct tu_queue *queue,
const uint32_t nr_in_syncobjs,
const uint32_t nr_out_syncobjs,
uint32_t perf_pass_index,
struct tu_queue_submit *new_submit)
struct tu_msm_queue_submit *new_submit)
{
VkResult result;
@ -714,7 +714,7 @@ tu_queue_submit_create_locked(struct tu_queue *queue,
struct vk_command_buffer **vk_cmd_buffers = vk_submit->command_buffers;
memset(new_submit, 0, sizeof(struct tu_queue_submit));
memset(new_submit, 0, sizeof(struct tu_msm_queue_submit));
new_submit->cmd_buffers = (struct tu_cmd_buffer **) vk_cmd_buffers;
new_submit->nr_cmd_buffers = vk_submit->command_buffer_count;
@ -807,7 +807,7 @@ fail_cmds:
}
static void
tu_queue_submit_finish(struct tu_queue *queue, struct tu_queue_submit *submit)
tu_queue_submit_finish(struct tu_queue *queue, struct tu_msm_queue_submit *submit)
{
vk_free(&queue->device->vk.alloc, submit->cmds);
vk_free(&queue->device->vk.alloc, submit->in_syncobjs);
@ -832,7 +832,7 @@ tu_fill_msm_gem_submit(struct tu_device *dev,
static void
tu_queue_build_msm_gem_submit_cmds(struct tu_queue *queue,
struct tu_queue_submit *submit,
struct tu_msm_queue_submit *submit,
struct tu_cs *autotune_cs)
{
struct tu_device *dev = queue->device;
@ -874,7 +874,7 @@ tu_queue_build_msm_gem_submit_cmds(struct tu_queue *queue,
}
static VkResult
tu_queue_submit_locked(struct tu_queue *queue, struct tu_queue_submit *submit)
tu_queue_submit_locked(struct tu_queue *queue, struct tu_msm_queue_submit *submit)
{
uint32_t submit_idx = queue->device->submit_count++;
@ -1051,7 +1051,7 @@ msm_queue_submit(struct tu_queue *queue, struct vk_queue_submit *submit)
MESA_TRACE_FUNC();
uint32_t perf_pass_index = queue->device->perfcntrs_pass_cs ?
submit->perf_pass_index : ~0;
struct tu_queue_submit submit_req;
struct tu_msm_queue_submit submit_req;
if (TU_DEBUG(LOG_SKIP_GMEM_OPS)) {
tu_dbg_log_gmem_load_store_skips(queue->device);

14
src/freedreno/vulkan/tu_knl_drm_virtio.cc
View File

@ -45,7 +45,7 @@ struct tu_userspace_fence_cmds {
struct tu_userspace_fence_cmd cmds[64];
};
struct tu_queue_submit {
struct tu_virtio_queue_submit {
struct vk_queue_submit *vk_submit;
struct tu_u_trace_submission_data *u_trace_submission_data;
@ -750,7 +750,7 @@ tu_queue_submit_create_locked(struct tu_queue *queue,
const uint32_t nr_in_syncobjs,
const uint32_t nr_out_syncobjs,
uint32_t perf_pass_index,
struct tu_queue_submit *new_submit)
struct tu_virtio_queue_submit *new_submit)
{
VkResult result;
@ -759,7 +759,7 @@ tu_queue_submit_create_locked(struct tu_queue *queue,
struct vk_command_buffer **vk_cmd_buffers = vk_submit->command_buffers;
memset(new_submit, 0, sizeof(struct tu_queue_submit));
memset(new_submit, 0, sizeof(struct tu_virtio_queue_submit));
new_submit->cmd_buffers = (struct tu_cmd_buffer **) vk_cmd_buffers;
new_submit->nr_cmd_buffers = vk_submit->command_buffer_count;
@ -855,7 +855,7 @@ fail_cmds:
}
static void
tu_queue_submit_finish(struct tu_queue *queue, struct tu_queue_submit *submit)
tu_queue_submit_finish(struct tu_queue *queue, struct tu_virtio_queue_submit *submit)
{
vk_free(&queue->device->vk.alloc, submit->cmds);
vk_free(&queue->device->vk.alloc, submit->in_syncobjs);
@ -880,7 +880,7 @@ tu_fill_msm_gem_submit(struct tu_device *dev,
static void
tu_queue_build_msm_gem_submit_cmds(struct tu_queue *queue,
struct tu_queue_submit *submit,
struct tu_virtio_queue_submit *submit,
struct tu_cs *autotune_cs)
{
struct tu_device *dev = queue->device;
@ -979,7 +979,7 @@ setup_fence_cmds(struct tu_device *dev)
}
static VkResult
tu_queue_submit_locked(struct tu_queue *queue, struct tu_queue_submit *submit)
tu_queue_submit_locked(struct tu_queue *queue, struct tu_virtio_queue_submit *submit)
{
struct tu_virtio_device *vdev = queue->device->vdev;
@ -1153,7 +1153,7 @@ virtio_queue_submit(struct tu_queue *queue, struct vk_queue_submit *submit)
MESA_TRACE_FUNC();
uint32_t perf_pass_index = queue->device->perfcntrs_pass_cs ?
submit->perf_pass_index : ~0;
struct tu_queue_submit submit_req;
struct tu_virtio_queue_submit submit_req;
if (TU_DEBUG(LOG_SKIP_GMEM_OPS)) {
tu_dbg_log_gmem_load_store_skips(queue->device);