diff options
| author | Bas Nieuwenhuizen <[email protected]> | 2017-04-17 11:30:43 +0200 |
|---|---|---|
| committer | Bas Nieuwenhuizen <[email protected]> | 2017-04-19 20:37:57 +0200 |
| commit | 39644fa40a328811feac2821b267f209274dc911 (patch) | |
| tree | 1230a0a21f2001601833bada92db65089648a425 /src/amd | |
| parent | 51c0c213b7fa53b249e9fcb9004a3ba1076fe773 (diff) | |
radv: Don't allocate dynamic descriptors separately.
Signed-off-by: Bas Nieuwenhuizen <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src/amd')
| -rw-r--r-- | src/amd/vulkan/radv_descriptor_set.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/amd/vulkan/radv_descriptor_set.c b/src/amd/vulkan/radv_descriptor_set.c index 48cb8c2a30a..26f89152d52 100644 --- a/src/amd/vulkan/radv_descriptor_set.c +++ b/src/amd/vulkan/radv_descriptor_set.c @@ -261,8 +261,10 @@ radv_descriptor_set_create(struct radv_device *device, struct radv_descriptor_set **out_set) { struct radv_descriptor_set *set; - unsigned mem_size = sizeof(struct radv_descriptor_set) + + unsigned range_offset = sizeof(struct radv_descriptor_set) + sizeof(struct radeon_winsys_bo *) * layout->buffer_count; + unsigned mem_size = range_offset + + sizeof(struct radv_descriptor_range) * layout->dynamic_offset_count; set = vk_alloc2(&device->alloc, NULL, mem_size, 8, VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); @@ -272,15 +274,7 @@ radv_descriptor_set_create(struct radv_device *device, memset(set, 0, mem_size); if (layout->dynamic_offset_count) { - unsigned size = sizeof(struct radv_descriptor_range) * - layout->dynamic_offset_count; - set->dynamic_descriptors = vk_alloc2(&device->alloc, NULL, size, 8, - VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); - - if (!set->dynamic_descriptors) { - vk_free2(&device->alloc, NULL, set); - return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY); - } + set->dynamic_descriptors = (struct radv_descriptor_range*)((uint8_t*)set + range_offset); } set->layout = layout; @@ -350,8 +344,6 @@ radv_descriptor_set_destroy(struct radv_device *device, { if (free_bo && set->size) list_del(&set->vram_list); - if (set->dynamic_descriptors) - vk_free2(&device->alloc, NULL, set->dynamic_descriptors); vk_free2(&device->alloc, NULL, set); } |