v2: Also convert the calculations.
Signed-off-by: Bas Nieuwenhuizen <ba...@google.com>
---
src/amd/vulkan/radv_descriptor_set.c | 4 ++--
src/amd/vulkan/radv_private.h | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/amd/vulkan/radv_descriptor_set.c
b/src/amd/vulkan/radv_descriptor_set.c
index c048a4c7f53..f585061b4f4 100644
--- a/src/amd/vulkan/radv_descriptor_set.c
+++ b/src/amd/vulkan/radv_descriptor_set.c
@@ -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 */
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 00190e7eee0..2afc0cbedfc 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -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;
--
2.12.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
