=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: vkd3d: Add asserts() for root descriptor indices.

Alexandre Julliard julliard at winehq.org
Wed Oct 17 18:15:32 CDT 2018


Module: vkd3d
Branch: master
Commit: 5a2dc97a5a1ee11f054bdc807a3885b473f1d502
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=5a2dc97a5a1ee11f054bdc807a3885b473f1d502

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Wed Oct 17 17:59:33 2018 +0200

vkd3d: Add asserts() for root descriptor indices.

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/vkd3d/command.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c
index 27c8ad0..e17fca9 100644
--- a/libs/vkd3d/command.c
+++ b/libs/vkd3d/command.c
@@ -3405,6 +3405,7 @@ static void d3d12_command_list_set_root_cbv(struct d3d12_command_list *list,
                 root_parameter, bindings->descriptor_set, NULL, &buffer_info);
         VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL));
 
+        assert(index < ARRAY_SIZE(bindings->push_descriptors));
         bindings->push_descriptors[index].u.cbv.vk_buffer = buffer_info.buffer;
         bindings->push_descriptors[index].u.cbv.offset = buffer_info.offset;
         bindings->push_descriptor_dirty_mask |= 1u << index;
@@ -3478,6 +3479,7 @@ static void d3d12_command_list_set_root_descriptor(struct d3d12_command_list *li
                 root_parameter, bindings->descriptor_set, &vk_buffer_view,  NULL);
         VK_CALL(vkUpdateDescriptorSets(list->device->vk_device, 1, &descriptor_write, 0, NULL));
 
+        assert(index < ARRAY_SIZE(bindings->push_descriptors));
         bindings->push_descriptors[index].u.vk_buffer_view = vk_buffer_view;
         bindings->push_descriptor_dirty_mask |= 1u << index;
         bindings->push_descriptor_active_mask |= 1u << index;




More information about the wine-cvs mailing list