From a58de1b8d3a9f6ce072fdd2b07490c3def1e7372 Mon Sep 17 00:00:00 2001 From: Jonathan Marek Date: Tue, 23 Jun 2020 10:37:18 -0400 Subject: [PATCH] turnip: fix ts_cs_memory typo Signed-off-by: Jonathan Marek Part-of: --- src/freedreno/vulkan/tu_clear_blit.c | 6 +++--- src/freedreno/vulkan/tu_cmd_buffer.c | 6 +++--- src/freedreno/vulkan/tu_cs.c | 2 +- src/freedreno/vulkan/tu_cs.h | 2 +- src/freedreno/vulkan/tu_pipeline.c | 2 +- src/freedreno/vulkan/tu_private.h | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/freedreno/vulkan/tu_clear_blit.c b/src/freedreno/vulkan/tu_clear_blit.c index 9b729a562f5..be2222b407d 100644 --- a/src/freedreno/vulkan/tu_clear_blit.c +++ b/src/freedreno/vulkan/tu_clear_blit.c @@ -473,7 +473,7 @@ r3d_common(struct tu_cmd_buffer *cmd, struct tu_cs *cs, bool blit, uint32_t num_ #define GS_OFFSET (32 * sizeof(instr_t)) /* shaders */ - struct ts_cs_memory shaders = { }; + struct tu_cs_memory shaders = { }; VkResult result = tu_cs_alloc(&cmd->sub_cs, 2 + layered_clear, 16 * sizeof(instr_t), &shaders); assert(result == VK_SUCCESS); @@ -626,7 +626,7 @@ r3d_src_common(struct tu_cmd_buffer *cmd, uint32_t offset_ubwc, VkFilter filter) { - struct ts_cs_memory texture = { }; + struct tu_cs_memory texture = { }; VkResult result = tu_cs_alloc(&cmd->sub_cs, 2, /* allocate space for a sampler too */ A6XX_TEX_CONST_DWORDS, &texture); @@ -1554,7 +1554,7 @@ tu_CmdUpdateBuffer(VkCommandBuffer commandBuffer, tu_bo_list_add(&cmd->bo_list, buffer->bo, MSM_SUBMIT_BO_WRITE); - struct ts_cs_memory tmp; + struct tu_cs_memory tmp; VkResult result = tu_cs_alloc(&cmd->sub_cs, DIV_ROUND_UP(dataSize, 64), 64, &tmp); if (result != VK_SUCCESS) { cmd->record_result = result; diff --git a/src/freedreno/vulkan/tu_cmd_buffer.c b/src/freedreno/vulkan/tu_cmd_buffer.c index d6039184d8b..47e1c763043 100644 --- a/src/freedreno/vulkan/tu_cmd_buffer.c +++ b/src/freedreno/vulkan/tu_cmd_buffer.c @@ -1176,7 +1176,7 @@ tu_emit_input_attachments(struct tu_cmd_buffer *cmd, if (!subpass->input_count) return; - struct ts_cs_memory texture; + struct tu_cs_memory texture; VkResult result = tu_cs_alloc(&cmd->sub_cs, subpass->input_count * 2, A6XX_TEX_CONST_DWORDS, &texture); assert(result == VK_SUCCESS); @@ -1887,7 +1887,7 @@ tu_CmdBindDescriptorSets(VkCommandBuffer commandBuffer, if (layout->dynamic_offset_count) { /* allocate and fill out dynamic descriptor set */ - struct ts_cs_memory dynamic_desc_set; + struct tu_cs_memory dynamic_desc_set; VkResult result = tu_cs_alloc(&cmd->sub_cs, layout->dynamic_offset_count, A6XX_TEX_CONST_DWORDS, &dynamic_desc_set); assert(result == VK_SUCCESS); @@ -2175,7 +2175,7 @@ tu_EndCommandBuffer(VkCommandBuffer commandBuffer) static struct tu_cs tu_cmd_dynamic_state(struct tu_cmd_buffer *cmd, uint32_t id, uint32_t size) { - struct ts_cs_memory memory; + struct tu_cs_memory memory; struct tu_cs cs; /* TODO: share this logic with tu_pipeline_static_state */ diff --git a/src/freedreno/vulkan/tu_cs.c b/src/freedreno/vulkan/tu_cs.c index 9a9af0c3a00..809d511fa2b 100644 --- a/src/freedreno/vulkan/tu_cs.c +++ b/src/freedreno/vulkan/tu_cs.c @@ -268,7 +268,7 @@ VkResult tu_cs_alloc(struct tu_cs *cs, uint32_t count, uint32_t size, - struct ts_cs_memory *memory) + struct tu_cs_memory *memory) { assert(cs->mode == TU_CS_MODE_SUB_STREAM); assert(size && size <= 1024); diff --git a/src/freedreno/vulkan/tu_cs.h b/src/freedreno/vulkan/tu_cs.h index 0dc69196b07..9f446dacaf9 100644 --- a/src/freedreno/vulkan/tu_cs.h +++ b/src/freedreno/vulkan/tu_cs.h @@ -52,7 +52,7 @@ VkResult tu_cs_alloc(struct tu_cs *cs, uint32_t count, uint32_t size, - struct ts_cs_memory *memory); + struct tu_cs_memory *memory); struct tu_cs_entry tu_cs_end_sub_stream(struct tu_cs *cs, struct tu_cs *sub_cs); diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c index a3251621e8f..59170cbea16 100644 --- a/src/freedreno/vulkan/tu_pipeline.c +++ b/src/freedreno/vulkan/tu_pipeline.c @@ -2125,7 +2125,7 @@ static bool tu_pipeline_static_state(struct tu_pipeline *pipeline, struct tu_cs *cs, uint32_t id, uint32_t size) { - struct ts_cs_memory memory; + struct tu_cs_memory memory; if (pipeline->dynamic_state_mask & BIT(id)) return false; diff --git a/src/freedreno/vulkan/tu_private.h b/src/freedreno/vulkan/tu_private.h index 6a9e3410e2d..434b9ce980a 100644 --- a/src/freedreno/vulkan/tu_private.h +++ b/src/freedreno/vulkan/tu_private.h @@ -406,7 +406,7 @@ struct tu_cs_entry uint32_t offset; }; -struct ts_cs_memory { +struct tu_cs_memory { uint32_t *map; uint64_t iova; }; -- 2.30.2