[Mesa-dev] [PATCH 1/2] radv: Increase integer sizes in descriptor sets.

[Fredrik Höglund]

On Thursday 13 April 2017, Bas Nieuwenhuizen wrote:
> 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 at google.com>
> ---
>  src/amd/vulkan/radv_descriptor_set.h | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/src/amd/vulkan/radv_descriptor_set.h b/src/amd/vulkan/radv_descriptor_set.h
> index 8f25a1902a6..a9f4bc6497e 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;
> 

radv_descriptor_update_template_entry needs to be updated as well.

Fredrik