fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 17:58:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

anv: Fix anv_descriptor_set reference error on deletion

Browse source 
anv_descriptor_set_destroy uses the descriptor sets's set_layout member
to iterate the set's buffer views.  However, the set_layout reference
may have previously been freed.

On 64 bit builds, this bug generated valgrind errors but did not affect
CTS test results.  On 32 bit builds, it reliably produces assertions and
memory corruption.
This commit is contained in:
Mark Janes 2016-02-01 17:13:02 -08:00
parent 5a06bac4a0
commit ea8c2d118a
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/vulkan/anv_descriptor_set.c
View file

@ -391,7 +391,7 @@ anv_descriptor_set_create(struct anv_device *device,
set->buffer_views[b].surface_state =
anv_state_pool_alloc(&device->surface_state_pool, 64, 64);
}
set->buffer_count = layout->buffer_count;
*out_set = set;
return VK_SUCCESS;
@ -402,7 +402,7 @@ anv_descriptor_set_destroy(struct anv_device *device,
struct anv_descriptor_set *set)
{
/* XXX: Use the pool */
for (uint32_t b = 0; b < set->layout->buffer_count; b++)
for (uint32_t b = 0; b < set->buffer_count; b++)
anv_state_pool_free(&device->surface_state_pool,
set->buffer_views[b].surface_state);
@ -589,5 +589,6 @@ void anv_UpdateDescriptorSets(
dest->descriptors[copy->dstBinding + j] =
src->descriptors[copy->srcBinding + j];
}
dest->buffer_count = src->buffer_count;
}
}

1
src/vulkan/anv_private.h
View file

@ -928,6 +928,7 @@ struct anv_descriptor {
struct anv_descriptor_set {
const struct anv_descriptor_set_layout *layout;
uint32_t buffer_count;
struct anv_buffer_view *buffer_views;
struct anv_descriptor descriptors[0];
};