summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarmjit Mahil <Karmjit.Mahil@imgtec.com>2022-11-10 09:31:14 +0000
committerKarmjit Mahil <Karmjit.Mahil@imgtec.com>2022-11-28 09:12:36 +0000
commit8a690192777b747e890205f161c91b8c0a5dc2a9 (patch)
tree52d0281cdfe7e638ecc74a55127f51f60bd2c267
parent260db8112a8efa06f2a9d1e6e1170d7fff70c89d (diff)
pvr: Use glsl syntax to show set and binding number.
This makes the descriptor set debug output's descriptor set number and binding number more obvious. The previous format wasn't as obvious unless you knew how to read it. Signed-off-by: Karmjit Mahil <Karmjit.Mahil@imgtec.com> Reviewed-by: Frank Binns <frank.binns@imgtec.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20008>
-rw-r--r--src/imagination/vulkan/pvr_descriptor_set.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/imagination/vulkan/pvr_descriptor_set.c b/src/imagination/vulkan/pvr_descriptor_set.c
index 0d1c83262e5..5a0b0d4a41a 100644
--- a/src/imagination/vulkan/pvr_descriptor_set.c
+++ b/src/imagination/vulkan/pvr_descriptor_set.c
@@ -684,7 +684,7 @@ static void
pvr_dump_in_register_layout_sizes(const struct pvr_device *device,
const struct pvr_pipeline_layout *layout)
{
-# define SEPARATOR_LENGTH 52
+# define SEPARATOR_LENGTH 67
# define LOGD_CHAR_NTIMES(c, times) \
do { \
char _c_buffer[times + 1]; \
@@ -704,7 +704,7 @@ pvr_dump_in_register_layout_sizes(const struct pvr_device *device,
stage++) {
uint32_t dynamic_offset = 0;
- mesa_logd("| %-48s |", stage_names[stage].primary_dynamic);
+ mesa_logd("| %-63s |", stage_names[stage].primary_dynamic);
LOGD_CHAR_NTIMES('-', SEPARATOR_LENGTH);
if (layout->per_stage_reg_info[stage].primary_dynamic_size_in_dwords) {
@@ -725,7 +725,7 @@ pvr_dump_in_register_layout_sizes(const struct pvr_device *device,
binding->type != VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC)
continue;
- mesa_logd("| %04u | %u:%03u | %-26s[%3u] |",
+ mesa_logd("| %04u | set = %u, binding = %03u | %-26s[%3u] |",
dynamic_offset,
set_num,
i,
@@ -740,7 +740,7 @@ pvr_dump_in_register_layout_sizes(const struct pvr_device *device,
}
LOGD_CHAR_NTIMES('-', SEPARATOR_LENGTH);
- mesa_logd("| %-48s |", stage_names[stage].secondary_dynamic);
+ mesa_logd("| %-63s |", stage_names[stage].secondary_dynamic);
LOGD_CHAR_NTIMES('-', SEPARATOR_LENGTH);
if (layout->per_stage_reg_info[stage].secondary_dynamic_size_in_dwords) {
@@ -761,7 +761,7 @@ pvr_dump_in_register_layout_sizes(const struct pvr_device *device,
binding->type != VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC)
continue;
- mesa_logd("| %04u | %u:%03u | %-26s[%3u] |",
+ mesa_logd("| %04u | set = %u, binding = %03u | %-26s[%3u] |",
dynamic_offset,
set_num,
i,
@@ -776,7 +776,7 @@ pvr_dump_in_register_layout_sizes(const struct pvr_device *device,
}
LOGD_CHAR_NTIMES('-', SEPARATOR_LENGTH);
- mesa_logd("| %-48s |", stage_names[stage].primary);
+ mesa_logd("| %-63s |", stage_names[stage].primary);
LOGD_CHAR_NTIMES('-', SEPARATOR_LENGTH);
/* Print primaries. */
@@ -798,7 +798,7 @@ pvr_dump_in_register_layout_sizes(const struct pvr_device *device,
binding->type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC)
continue;
- mesa_logd("| %04u | %u:%03u | %-26s[%3u] |",
+ mesa_logd("| %04u | set = %u, binding = %03u | %-26s[%3u] |",
base + binding->per_stage_offset_in_dwords[stage].primary,
set_num,
i,
@@ -808,7 +808,7 @@ pvr_dump_in_register_layout_sizes(const struct pvr_device *device,
}
LOGD_CHAR_NTIMES('-', SEPARATOR_LENGTH);
- mesa_logd("| %-48s |", stage_names[stage].secondary);
+ mesa_logd("| %-63s |", stage_names[stage].secondary);
LOGD_CHAR_NTIMES('-', SEPARATOR_LENGTH);
/* Print secondaries. */
@@ -830,7 +830,7 @@ pvr_dump_in_register_layout_sizes(const struct pvr_device *device,
binding->type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC)
continue;
- mesa_logd("| %04u | %u:%03u | %-26s[%3u] |",
+ mesa_logd("| %04u | set = %u, binding = %03u | %-26s[%3u] |",
base +
binding->per_stage_offset_in_dwords[stage].secondary,
set_num,