diff options
| author | Mike Blumenkrantz <michael.blumenkrantz@gmail.com> | 2023-05-05 12:06:05 -0400 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2023-05-09 16:56:36 +0100 |
| commit | 2fd817966875bf6e9116082044a00abe40314604 (patch) | |
| tree | b44745bc26f27569be775ce6dd376ce2c206a723 | |
| parent | 4d9874ce8b14c7afd2d36aa9db0377af7fc06d49 (diff) | |
| download | mesa-2fd817966875bf6e9116082044a00abe40314604.tar.gz | |
zink: don't init mutable resource bit for swapchain images
these are either already mutable (for srgb) or invalid usage
fixes #8970
cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22876>
(cherry picked from commit d2c63624c179685cd14e4dc90f253b70a343d7b6)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/zink/zink_context.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 2338eb34b03..0cb2b6963ce 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -454,7 +454,7 @@ "description": "zink: don't init mutable resource bit for swapchain images", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c index 09d6126736c..d0032dbf2ad 100644 --- a/src/gallium/drivers/zink/zink_context.c +++ b/src/gallium/drivers/zink/zink_context.c @@ -2042,7 +2042,7 @@ zink_set_sampler_views(struct pipe_context *pctx, if (!ctx->unordered_blitting) res->obj->unordered_read = false; } else if (!res->obj->is_buffer) { - if (res->base.b.format != b->image_view->base.format) + if (!res->obj->dt && 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) { |