summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>2021-04-14 11:58:06 +0300
committerMarge Bot <eric+marge@anholt.net>2021-04-14 18:52:48 +0000
commit23c4b59b46e403e21851ffc04ee0cfb0146df4c9 (patch)
treee710bdf344ca38da9ab934d167f12a8e9b027be1
parent97e7b21c4229636bc9f9bc55334ca7416f9fce4f (diff)
anv: bump internal descriptor index fields to 32bits21.1-branchpoint
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: 6e230d7607f9b3 ("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>
-rw-r--r--src/intel/vulkan/anv_private.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index 35bc5ba0cdf..44ce29127f8 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -1834,16 +1834,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;
@@ -1872,16 +1872,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;