wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d: Avoid allocating memory in d3d12_command_list_update_uav_counter_descriptors().

Browse Source 
Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2019-06-11 10:13:34 +02:00 committed by Alexandre Julliard
parent 6862f34004
commit 28f99600a5
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/vkd3d/command.c
View File

@ -2721,11 +2721,11 @@ done:
static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_command_list *list, static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_command_list *list,
VkPipelineBindPoint bind_point) VkPipelineBindPoint bind_point)
{ {
VkWriteDescriptorSet vk_descriptor_writes[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS];
struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point];
const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs;
const struct d3d12_pipeline_state *state = list->state; const struct d3d12_pipeline_state *state = list->state;
VkDevice vk_device = list->device->vk_device; VkDevice vk_device = list->device->vk_device;
VkWriteDescriptorSet *vk_descriptor_writes;
VkDescriptorSet vk_descriptor_set; VkDescriptorSet vk_descriptor_set;
unsigned int uav_counter_count; unsigned int uav_counter_count;
unsigned int i; unsigned int i;
@ -2734,14 +2734,12 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma
return; return;
uav_counter_count = vkd3d_popcount(state->uav_counter_mask); uav_counter_count = vkd3d_popcount(state->uav_counter_mask);
assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes));
vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout); vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout);
if (!vk_descriptor_set) if (!vk_descriptor_set)
return; return;
if (!(vk_descriptor_writes = vkd3d_calloc(uav_counter_count, sizeof(*vk_descriptor_writes))))
return;
for (i = 0; i < uav_counter_count; ++i) for (i = 0; i < uav_counter_count; ++i)
{ {
const struct vkd3d_shader_uav_counter_binding *uav_counter = &state->uav_counters[i]; const struct vkd3d_shader_uav_counter_binding *uav_counter = &state->uav_counters[i];
@ -2762,7 +2760,6 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma
} }
VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL)); VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL));
vkd3d_free(vk_descriptor_writes);
VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point, VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bind_point,
state->vk_pipeline_layout, state->set_index, 1, &vk_descriptor_set, 0, NULL)); state->vk_pipeline_layout, state->set_index, 1, &vk_descriptor_set, 0, NULL));