anv: Add a descriptor_count to descriptor sets

This is useful for asserting in-bounds descriptor set access.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7180>
This commit is contained in:
Jason Ekstrand
2020-10-16 12:52:46 -05:00
committed by Marge Bot
parent dd1971c9d8
commit 215218f32f
4 changed files with 8 additions and 2 deletions

View File

@@ -2600,8 +2600,10 @@ emit_binding_table(struct anv_cmd_buffer *cmd_buffer,
default: {
assert(binding->set < MAX_SETS);
const struct anv_descriptor *desc =
&pipe_state->descriptors[binding->set]->descriptors[binding->index];
const struct anv_descriptor_set *set =
pipe_state->descriptors[binding->set];
assert(binding->index < set->descriptor_count);
const struct anv_descriptor *desc = &set->descriptors[binding->index];
switch (desc->type) {
case VK_DESCRIPTOR_TYPE_SAMPLER: