OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: use local screen variable in zink_prep_fb_attachment

Browse Source 
no functional changes

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30261>
This commit is contained in:
Mike Blumenkrantz
2024-07-09 11:59:43 -04:00
committed by Marge Bot
parent cdc70013a2
commit 991244dad4
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gallium/drivers/zink/zink_context.c
View File

@@ -3171,6 +3171,7 @@ zink_prep_fb_attachment(struct zink_context *ctx, struct zink_surface *surf, uns
layout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
}
}
struct zink_screen *screen = zink_screen(ctx->base.screen);
/*
The image subresources for a storage image must be in the VK_IMAGE_LAYOUT_SHARED_PRESENT_KHR or
VK_IMAGE_LAYOUT_GENERAL layout in order to access its data in a shader.
@@ -3178,11 +3179,11 @@ zink_prep_fb_attachment(struct zink_context *ctx, struct zink_surface *surf, uns
*/
if (res->image_bind_count[0])
layout = VK_IMAGE_LAYOUT_GENERAL;
else if (!zink_screen(ctx->base.screen)->info.have_EXT_attachment_feedback_loop_layout &&
else if (!screen->info.have_EXT_attachment_feedback_loop_layout &&
layout == VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT)
layout = VK_IMAGE_LAYOUT_GENERAL;
if (res->valid || res->layout != layout)
zink_screen(ctx->base.screen)->image_barrier(ctx, res, layout, access, pipeline);
screen->image_barrier(ctx, res, layout, access, pipeline);
if (!(res->aspect & VK_IMAGE_ASPECT_COLOR_BIT))
ctx->zsbuf_readonly = res->layout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL;
res->obj->unordered_read = res->obj->unordered_write = false;