From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Thu, 13 Apr 2017 20:18:35 +0000 (+0200)
Subject: radv: Increase integer sizes in descriptor sets.
X-Git-Tag: upstream/17.1.0~205
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=24ccf1a8b692ae039a778438dd1fe49c6e048b84;p=platform%2Fupstream%2Fmesa.git

radv: Increase integer sizes in descriptor sets.

Needed if we want to allow them taking more than 64 KiB. The calculations
of these already used 32 bits.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/amd/vulkan/radv_descriptor_set.h b/src/amd/vulkan/radv_descriptor_set.h
index 8f25a19..a9f4bc6 100644
--- a/src/amd/vulkan/radv_descriptor_set.h
+++ b/src/amd/vulkan/radv_descriptor_set.h
@@ -32,15 +32,15 @@ struct radv_descriptor_set_binding_layout {
    VkDescriptorType type;
 
    /* Number of array elements in this binding */
-   uint16_t array_size;
+   uint32_t array_size;
 
-   uint16_t offset;
-   uint16_t buffer_offset;
+   uint32_t offset;
+   uint32_t buffer_offset;
    uint16_t dynamic_offset_offset;
 
    /* redundant with the type, each for a single array element */
-   uint16_t size;
-   uint16_t buffer_count;
+   uint32_t size;
+   uint32_t buffer_count;
    uint16_t dynamic_offset_count;
 
    /* Offset in the radv_descriptor_set_layout of the immutable samplers, or 0
@@ -54,17 +54,17 @@ struct radv_descriptor_set_layout {
    VkDescriptorSetLayoutCreateFlags flags;
 
    /* Number of bindings in this descriptor set */
-   uint16_t binding_count;
+   uint32_t binding_count;
 
    /* Total size of the descriptor set with room for all array entries */
-   uint16_t size;
+   uint32_t size;
 
    /* Shader stages affected by this descriptor set */
    uint16_t shader_stages;
    uint16_t dynamic_shader_stages;
 
    /* Number of buffers in this descriptor set */
-   uint16_t buffer_count;
+   uint32_t buffer_count;
 
    /* Number of dynamic offsets used by this descriptor set */
    uint16_t dynamic_offset_count;