radv: make sizes & offsets 32 bit in radv_descriptor_update_template_entry.

v2: Also convert the calculations.

Signed-off-by: Bas Nieuwenhuizen <basni@google.com>
Reviewed-by: Fredrik Höglund <fredrik@kde.org>
This commit is contained in:
Bas Nieuwenhuizen 2017-04-13 23:49:00 +02:00
parent 7c83d44d54
commit e20eb91e2b
2 changed files with 7 additions and 7 deletions

View file

@ -775,8 +775,8 @@ VkResult radv_CreateDescriptorUpdateTemplateKHR(VkDevice _device,
const uint32_t buffer_offset = binding_layout->buffer_offset +
binding_layout->buffer_count * entry->dstArrayElement;
const uint32_t *immutable_samplers = NULL;
uint16_t dst_offset;
uint16_t dst_stride;
uint32_t dst_offset;
uint32_t dst_stride;
/* dst_offset is an offset into dynamic_descriptors when the descriptor
is dynamic, and an offset into mapped_ptr otherwise */

View file

@ -576,16 +576,16 @@ struct radv_descriptor_update_template_entry {
VkDescriptorType descriptor_type;
/* The number of descriptors to update */
uint16_t descriptor_count;
uint32_t descriptor_count;
/* Into mapped_ptr or dynamic_descriptors, in units of the respective array */
uint16_t dst_offset;
uint32_t dst_offset;
/* In dwords. Not valid/used for dynamic descriptors */
uint16_t dst_stride;
uint32_t dst_stride;
uint16_t buffer_offset;
uint16_t buffer_count;
uint32_t buffer_offset;
uint32_t buffer_count;
/* Only valid for combined image samplers and samplers */
uint16_t has_sampler;