fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 02:28:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

hk: switch to common VK_COPY/PRINT_STR

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33826>
This commit is contained in:
Alyssa Rosenzweig 2025-02-26 11:15:05 -05:00 • committed by Marge Bot
parent e331efd4fe
commit 0bca84c3a1
1 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/asahi/vulkan/hk_shader.c
View file

@ -1419,13 +1419,6 @@ hk_api_shader_serialize(struct vk_device *vk_dev,
return !blob->out_of_memory; return !blob->out_of_memory;
} }
#define WRITE_STR(field, ...) \
({ \
memset(field, 0, sizeof(field)); \
UNUSED int i = snprintf(field, sizeof(field), __VA_ARGS__); \
assert(i > 0 && i < sizeof(field)); \
})
static VkResult static VkResult
hk_shader_get_executable_properties( hk_shader_get_executable_properties(
UNUSED struct vk_device *device, const struct vk_shader *vk_shader, UNUSED struct vk_device *device, const struct vk_shader *vk_shader,
@ -1441,9 +1434,9 @@ hk_shader_get_executable_properties(
{ {
props->stages = mesa_to_vk_shader_stage(obj->vk.stage); props->stages = mesa_to_vk_shader_stage(obj->vk.stage);
props->subgroupSize = 32; props->subgroupSize = 32;
WRITE_STR(props->name, "%s", _mesa_shader_stage_to_string(obj->vk.stage)); VK_COPY_STR(props->name, _mesa_shader_stage_to_string(obj->vk.stage));
WRITE_STR(props->description, "%s shader", VK_PRINT_STR(props->description, "%s shader",
_mesa_shader_stage_to_string(obj->vk.stage)); _mesa_shader_stage_to_string(obj->vk.stage));
} }
return vk_outarray_status(&out); return vk_outarray_status(&out);
@ -1470,17 +1463,17 @@ hk_shader_get_executable_statistics(
vk_outarray_append_typed(VkPipelineExecutableStatisticKHR, &out, stat) vk_outarray_append_typed(VkPipelineExecutableStatisticKHR, &out, stat)
{ {
WRITE_STR(stat->name, "Code Size"); VK_COPY_STR(stat->name, "Code Size");
WRITE_STR(stat->description, VK_COPY_STR(stat->description,
"Size of the compiled shader binary, in bytes"); "Size of the compiled shader binary, in bytes");
stat->format = VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_UINT64_KHR; stat->format = VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_UINT64_KHR;
stat->value.u64 = shader->code_size; stat->value.u64 = shader->code_size;
} }
vk_outarray_append_typed(VkPipelineExecutableStatisticKHR, &out, stat) vk_outarray_append_typed(VkPipelineExecutableStatisticKHR, &out, stat)
{ {
WRITE_STR(stat->name, "Number of GPRs"); VK_COPY_STR(stat->name, "Number of GPRs");
WRITE_STR(stat->description, "Number of GPRs used by this pipeline"); VK_COPY_STR(stat->description, "Number of GPRs used by this pipeline");
stat->format = VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_UINT64_KHR; stat->format = VK_PIPELINE_EXECUTABLE_STATISTIC_FORMAT_UINT64_KHR;
stat->value.u64 = shader->b.info.nr_gprs; stat->value.u64 = shader->b.info.nr_gprs;
} }
@ -1525,8 +1518,8 @@ hk_shader_get_executable_internal_representations(
/* TODO */ /* TODO */
#if 0 #if 0
vk_outarray_append_typed(VkPipelineExecutableInternalRepresentationKHR, &out, ir) { vk_outarray_append_typed(VkPipelineExecutableInternalRepresentationKHR, &out, ir) {
WRITE_STR(ir->name, "AGX assembly"); VK_COPY_STR(ir->name, "AGX assembly");
WRITE_STR(ir->description, "AGX assembly"); VK_COPY_STR(ir->description, "AGX assembly");
if (!write_ir_text(ir, TODO)) if (!write_ir_text(ir, TODO))
incomplete_text = true; incomplete_text = true;
} }