From 0c17eadac003f74c5637ccb646f608a30d7d64a2 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 14 Jun 2023 10:46:01 -0400 Subject: [PATCH] zink: drop dt checks for mutable format init these are no longer applicable Part-of: --- src/gallium/drivers/zink/zink_blit.c | 4 ++-- src/gallium/drivers/zink/zink_context.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gallium/drivers/zink/zink_blit.c b/src/gallium/drivers/zink/zink_blit.c index ac9ea058c6c..d371b85391a 100644 --- a/src/gallium/drivers/zink/zink_blit.c +++ b/src/gallium/drivers/zink/zink_blit.c @@ -418,9 +418,9 @@ zink_blit(struct pipe_context *pctx, zink_select_draw_vbo(ctx); } zink_blit_begin(ctx, ZINK_BLIT_SAVE_FB | ZINK_BLIT_SAVE_FS | ZINK_BLIT_SAVE_TEXTURES); - if (!zink_is_swapchain(src) && zink_format_needs_mutable(info->src.format, info->src.resource->format)) + if (zink_format_needs_mutable(info->src.format, info->src.resource->format)) zink_resource_object_init_mutable(ctx, src); - if (!zink_is_swapchain(dst) && zink_format_needs_mutable(info->dst.format, info->dst.resource->format)) + if (zink_format_needs_mutable(info->dst.format, info->dst.resource->format)) zink_resource_object_init_mutable(ctx, dst); zink_blit_barriers(ctx, src, dst, whole); ctx->blitting = true; diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index dde801cc766..505ef0208e2 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -1771,7 +1771,7 @@ create_image_surface(struct zink_context *ctx, const struct pipe_image_view *vie break; default: break; } - if (!res->obj->dt && zink_format_needs_mutable(view->resource->format, view->format)) + if (zink_format_needs_mutable(view->resource->format, view->format)) /* mutable not set by default */ zink_resource_object_init_mutable(ctx, res); VkImageViewCreateInfo ivci = create_ivci(screen, res, &tmpl, target); @@ -2035,7 +2035,7 @@ zink_set_sampler_views(struct pipe_context *pctx, if (!ctx->unordered_blitting) res->obj->unordered_read = false; } else { - if (!res->obj->dt && zink_format_needs_mutable(res->base.b.format, b->image_view->base.format)) + if (zink_format_needs_mutable(res->base.b.format, b->image_view->base.format)) /* mutable not set by default */ zink_resource_object_init_mutable(ctx, res); if (res->obj != b->image_view->obj) {