fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-10 06:00:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

anv: bump internal descriptor index fields to 32bits

Browse source 
Prior to supporting VK_EXT_descriptor_indexing all of our descriptor
limits where below 64k which fitted a uint16_t. Now all of those can
go up to 2^20 entries so we need 32bits indexes to keep track of them.

This change leaves the dynamic indexes at 16bits. We could arguably
bump them too, up to the reviewer's taste.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 6e230d7607 ("anv: Implement VK_EXT_descriptor_indexing")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4636
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10228>
(cherry picked from commit 23c4b59b46)
This commit is contained in:
Lionel Landwerlin 2021-04-14 11:58:06 +03:00 • committed by Dylan Baker
parent 31d4c961bd
commit 93169249b7
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1264,7 +1264,7 @@
"description": "anv: bump internal descriptor index fields to 32bits",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"master_sha": null,
"because_sha": "6e230d7607f9b3e082d00859bd7725c4dc87e5cf"
},

12
src/intel/vulkan/anv_private.h
View file

@ -1967,16 +1967,16 @@ struct anv_descriptor_set_binding_layout {
/* Number of array elements in this binding (or size in bytes for inline
* uniform data)
*/
uint16_t array_size;
uint32_t array_size;
/* Index into the flattend descriptor set */
uint16_t descriptor_index;
uint32_t descriptor_index;
/* Index into the dynamic state array for a dynamic buffer */
int16_t dynamic_offset_index;
/* Index into the descriptor set buffer views */
int16_t buffer_view_index;
int32_t buffer_view_index;
/* Offset into the descriptor buffer where this descriptor lives */
uint32_t descriptor_offset;
@ -2005,16 +2005,16 @@ struct anv_descriptor_set_layout {
uint32_t ref_cnt;
/* Number of bindings in this descriptor set */
uint16_t binding_count;
uint32_t binding_count;
/* Total number of descriptors */
uint16_t descriptor_count;
uint32_t descriptor_count;
/* Shader stages affected by this descriptor set */
uint16_t shader_stages;
/* Number of buffer views in this descriptor set */
uint16_t buffer_view_count;
uint32_t buffer_view_count;
/* Number of dynamic offsets used by this descriptor set */
uint16_t dynamic_offset_count;