AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pvr: Don't print inactive bindings.

Browse Source 
Previously all bindings were printed out and an "X" was used to
indicate if a binding was not active for a particular stage.
This commit just skips those bindings entirely reducing possible
confusion.

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>
This commit is contained in:
Karmjit Mahil
2022-11-09 17:15:40 +00:00
parent 6d9a7d1597
commit 02626072e2
1 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/imagination/vulkan/pvr_descriptor_set.c
+22 -26
View File
@@ -706,29 +706,25 @@ pvr_dump_in_register_layout_sizes(const struct pvr_device *device,
for (uint32_t i = 0; i < set_layout->binding_count; i++) {
const struct pvr_descriptor_set_layout_binding *const binding =
&set_layout->bindings[i];
bool valid = !!(binding->shader_stage_mask & (1U << stage));
struct pvr_descriptor_size_info size_info;
if (!(binding->shader_stage_mask & BITFIELD_BIT(stage)))
continue;
if (binding->type != VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC &&
binding->type != VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC)
continue;
mesa_logd("| %s %04u | %u:%03u | %-26s[%3u] |",
(valid) ? " " : "X",
mesa_logd("| %04u | %u:%03u | %-26s[%3u] |",
dynamic_offset,
set_num,
i,
descriptor_names[binding->type],
binding->descriptor_count);
if (valid) {
struct pvr_descriptor_size_info size_info;
pvr_descriptor_size_info_init(device, binding->type, &size_info);
pvr_descriptor_size_info_init(device,
binding->type,
&size_info);
dynamic_offset += size_info.primary;
}
dynamic_offset += size_info.primary;
}
}
}
@@ -746,29 +742,25 @@ pvr_dump_in_register_layout_sizes(const struct pvr_device *device,
for (uint32_t i = 0; i < set_layout->binding_count; i++) {
const struct pvr_descriptor_set_layout_binding *const binding =
&set_layout->bindings[i];
bool valid = !!(binding->shader_stage_mask & (1U << stage));
struct pvr_descriptor_size_info size_info;
if (!(binding->shader_stage_mask & BITFIELD_BIT(stage)))
continue;
if (binding->type != VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC &&
binding->type != VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC)
continue;
mesa_logd("| %s %04u | %u:%03u | %-26s[%3u] |",
(valid) ? " " : "X",
mesa_logd("| %04u | %u:%03u | %-26s[%3u] |",
dynamic_offset,
set_num,
i,
descriptor_names[binding->type],
binding->descriptor_count);
if (valid) {
struct pvr_descriptor_size_info size_info;
pvr_descriptor_size_info_init(device, binding->type, &size_info);
pvr_descriptor_size_info_init(device,
binding->type,
&size_info);
dynamic_offset += size_info.secondary;
}
dynamic_offset += size_info.secondary;
}
}
}
@@ -789,12 +781,14 @@ pvr_dump_in_register_layout_sizes(const struct pvr_device *device,
const struct pvr_descriptor_set_layout_binding *const binding =
&set_layout->bindings[i];
if (!(binding->shader_stage_mask & BITFIELD_BIT(stage)))
continue;
if (binding->type == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC ||
binding->type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC)
continue;
mesa_logd("| %s %04u | %u:%03u | %-26s[%3u] |",
(binding->shader_stage_mask & (1U << stage)) ? " " : "X",
mesa_logd("| %04u | %u:%03u | %-26s[%3u] |",
base + binding->per_stage_offset_in_dwords[stage].primary,
set_num,
i,
@@ -819,12 +813,14 @@ pvr_dump_in_register_layout_sizes(const struct pvr_device *device,
const struct pvr_descriptor_set_layout_binding *const binding =
&set_layout->bindings[i];
if (!(binding->shader_stage_mask & BITFIELD_BIT(stage)))
continue;
if (binding->type == VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC ||
binding->type == VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC)
continue;
mesa_logd("| %s %04u | %u:%03u | %-26s[%3u] |",
(binding->shader_stage_mask & (1U << stage)) ? " " : "X",
mesa_logd("| %04u | %u:%03u | %-26s[%3u] |",
base +
binding->per_stage_offset_in_dwords[stage].secondary,
set_num,