diff options
| author | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2017-04-13 23:49:00 +0200 |
|---|---|---|
| committer | Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> | 2017-04-14 14:14:07 +0200 |
| commit | e20eb91e2bfef045d6806838e6453bc6ddb2e238 (patch) | |
| tree | 86995217b72c3785936e9edfb6d819395632d61c /src/amd | |
| parent | 7c83d44d541b688020d31353fd3765845f7ce6a9 (diff) | |
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>
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/vulkan/radv_descriptor_set.c | 4 | ||||
| -rw-r--r-- | 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 c048a4c7f5..f585061b4f 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 00190e7eee..2afc0cbedf 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; |