fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 06:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: remove tmp buffer rebinds

Browse source 
this is no longer used/necessary

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14689>
This commit is contained in:
Mike Blumenkrantz 2022-01-21 10:35:38 -05:00 • committed by Marge Bot
parent 5c28afdc7f
commit be5311972f
2 changed files with 0 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/gallium/drivers/zink/zink_resource.c
View file

@ -93,15 +93,12 @@ void
zink_destroy_resource_object(struct zink_screen *screen, struct zink_resource_object *obj)
{
if (obj->is_buffer) {
util_dynarray_foreach(&obj->tmp, VkBuffer, buffer)
VKSCR(DestroyBuffer)(screen->dev, *buffer, NULL);
VKSCR(DestroyBuffer)(screen->dev, obj->buffer, NULL);
VKSCR(DestroyBuffer)(screen->dev, obj->storage_buffer, NULL);
} else {
VKSCR(DestroyImage)(screen->dev, obj->image, NULL);
}
util_dynarray_fini(&obj->tmp);
zink_descriptor_set_refs_clear(&obj->desc_set_refs, obj);
zink_bo_unref(screen, obj->bo);
FREE(obj);
@ -507,7 +504,6 @@ resource_object_create(struct zink_screen *screen, const struct pipe_resource *t
bool scanout = templ->bind & PIPE_BIND_SCANOUT;
pipe_reference_init(&obj->reference, 1);
util_dynarray_init(&obj->tmp, NULL);
util_dynarray_init(&obj->desc_set_refs.refs, NULL);
if (templ->target == PIPE_BUFFER) {
VkBufferCreateInfo bci = create_bci(screen, templ, templ->bind);
@ -1788,28 +1784,6 @@ zink_resource_get_separate_stencil(struct pipe_resource *pres)
}
VkBuffer
zink_resource_tmp_buffer(struct zink_screen *screen, struct zink_resource *res, unsigned offset_add, unsigned add_binds, unsigned *offset_out)
{
VkBufferCreateInfo bci = create_bci(screen, &res->base.b, res->base.b.bind | add_binds);
VkDeviceSize size = bci.size - offset_add;
VkDeviceSize offset = offset_add;
if (offset_add) {
assert(bci.size > offset_add);
align_offset_size(res->obj->alignment, &offset, &size, bci.size);
}
bci.size = size;
VkBuffer buffer;
if (VKSCR(CreateBuffer)(screen->dev, &bci, NULL, &buffer) != VK_SUCCESS)
return VK_NULL_HANDLE;
VKSCR(BindBufferMemory)(screen->dev, buffer, zink_bo_get_mem(res->obj->bo), res->obj->offset + offset);
if (offset_out)
*offset_out = offset_add - offset;
return buffer;
}
bool
zink_resource_object_init_storage(struct zink_context *ctx, struct zink_resource *res)
{

4
src/gallium/drivers/zink/zink_resource.h
View file

@ -64,7 +64,6 @@ struct zink_resource_object {
unsigned persistent_maps; //if nonzero, requires vkFlushMappedMemoryRanges during batch use
struct zink_descriptor_refs desc_set_refs;
struct util_dynarray tmp;
VkBuffer storage_buffer;
union {
@ -196,9 +195,6 @@ zink_resource_object_reference(struct zink_screen *screen,
if (dst) *dst = src;
}
VkBuffer
zink_resource_tmp_buffer(struct zink_screen *screen, struct zink_resource *res, unsigned offset_add, unsigned add_binds, unsigned *offset);
bool
zink_resource_object_init_storage(struct zink_context *ctx, struct zink_resource *res);