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

zink: use undefined layout for first scanout obj transition

Browse source 
doesn't really matter, but technically an error

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10213>
(cherry picked from commit 7c2c0813c5)
This commit is contained in:
Mike Blumenkrantz 2021-04-13 09:14:15 -04:00 • committed by Eric Engestrom
parent a8ee300289
commit c0e63f4abe
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -301,7 +301,7 @@
"description": "zink: use undefined layout for first scanout obj transition",
"nominated": false,
"nomination_type": null,
"resolution": 4,
"resolution": 1,
"master_sha": null,
"because_sha": null
},

4
src/gallium/drivers/zink/zink_context.c
View file

@ -1771,7 +1771,7 @@ copy_scanout(struct zink_context *ctx, struct zink_resource *res)
NULL,
0,
VK_ACCESS_TRANSFER_WRITE_BIT,
VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
res->scanout_obj_init ? VK_IMAGE_LAYOUT_PRESENT_SRC_KHR : VK_IMAGE_LAYOUT_UNDEFINED,
VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
VK_QUEUE_FAMILY_IGNORED,
VK_QUEUE_FAMILY_IGNORED,
@ -1804,6 +1804,8 @@ copy_scanout(struct zink_context *ctx, struct zink_resource *res)
0, NULL,
1, &imb
);
/* separate flag to avoid annoying validation errors for new scanout objs */
res->scanout_obj_init = true;
}
static void

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

@ -89,6 +89,7 @@ struct zink_resource {
struct zink_resource_object *obj;
struct zink_resource_object *scanout_obj; //TODO: remove for wsi
bool scanout_obj_init;
union {
struct util_range valid_buffer_range;
struct {