fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-08 04:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: add a driver workaround to disable copy box optimizations

Browse source 
turnip is nonconformant regarding cache access (see noted issue),
meaning that any attempt to omit barriers breaks things

qcom proprietary may also be affected

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21779>
This commit is contained in:
Mike Blumenkrantz 2023-03-07 15:15:44 -05:00 • committed by Marge Bot
parent 46f98da188
commit fe469a7618
3 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3837,7 +3837,9 @@ zink_resource_image_transfer_dst_barrier(struct zink_context *ctx, struct zink_r
if (res->obj->copies_need_reset)
zink_resource_copies_reset(res);
/* skip TRANSFER_DST barrier if no intersection from previous copies */
if (res->layout != VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL || zink_resource_copy_box_intersects(res, level, box)) {
if (res->layout != VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL ||
zink_screen(ctx->base.screen)->driver_workarounds.broken_cache_semantics ||
zink_resource_copy_box_intersects(res, level, box)) {
zink_screen(ctx->base.screen)->image_barrier(ctx, res, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, VK_ACCESS_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
} else {
res->obj->access = VK_ACCESS_TRANSFER_WRITE_BIT;
@ -3855,7 +3857,8 @@ zink_resource_buffer_transfer_dst_barrier(struct zink_context *ctx, struct zink_
struct pipe_box box = {offset, 0, 0, size, 0, 0};
/* must barrier if something read the valid buffer range */
bool valid_read = res->obj->access && util_ranges_intersect(&res->valid_buffer_range, offset, offset + size) && !unordered_res_exec(ctx, res, true);
if (zink_check_transfer_dst_barrier(res, 0, &box) || valid_read) {
if (zink_screen(ctx->base.screen)->driver_workarounds.broken_cache_semantics ||
zink_check_transfer_dst_barrier(res, 0, &box) || valid_read) {
zink_screen(ctx->base.screen)->buffer_barrier(ctx, res, VK_ACCESS_TRANSFER_WRITE_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT);
} else {
res->obj->access = VK_ACCESS_TRANSFER_WRITE_BIT;

12
src/gallium/drivers/zink/zink_screen.c
View file

@ -2548,6 +2548,16 @@ init_driver_workarounds(struct zink_screen *screen)
screen->driver_workarounds.track_renderpasses = true;
else if (zink_debug & ZINK_DEBUG_NORP)
screen->driver_workarounds.track_renderpasses = false;
/* these drivers can't optimize non-overlapping copy ops */
switch (screen->info.driver_props.driverID) {
case VK_DRIVER_ID_MESA_TURNIP:
case VK_DRIVER_ID_QUALCOMM_PROPRIETARY:
screen->driver_workarounds.broken_cache_semantics = true;
break;
default:
break;
}
}
static struct disk_cache *
@ -3113,4 +3123,4 @@ zink_screen_debug_marker_end(struct zink_screen *screen, bool emitted)
{
if (emitted)
VKSCR(QueueEndDebugUtilsLabelEXT)(screen->queue);
}
}

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

@ -1398,6 +1398,10 @@ struct zink_screen {
struct {
bool broken_l4a4;
/* https://gitlab.khronos.org/vulkan/vulkan/-/issues/3306
* HI TURNIP
*/
bool broken_cache_semantics;
bool implicit_sync;
bool always_feedback_loop;
bool always_feedback_loop_zs;