Mesa (staging/22.1): zink: fix dual_src_blend driconf workaround

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Thu Jun 23 16:19:36 UTC 2022


Module: Mesa
Branch: staging/22.1
Commit: c49c481ca6fc136050d96ce47d649236957984a9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c49c481ca6fc136050d96ce47d649236957984a9

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Mon Jun 20 21:31:31 2022 -0400

zink: fix dual_src_blend driconf workaround

not sure when this broke but it broke

cc: mesa-stable

Reviewed-by: Dave Airlie <airlied at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17156>
(cherry picked from commit e8fc5cca9039e7d4ea08cc6d99fe9c4f8cc49f8b)

---

 .pick_status.json                     | 2 +-
 src/gallium/drivers/zink/zink_state.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 4e9734571a9..e7733577739 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -643,7 +643,7 @@
         "description": "zink: fix dual_src_blend driconf workaround",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/gallium/drivers/zink/zink_state.c b/src/gallium/drivers/zink/zink_state.c
index a9cb615cc37..909c0edd7be 100644
--- a/src/gallium/drivers/zink/zink_state.c
+++ b/src/gallium/drivers/zink/zink_state.c
@@ -419,7 +419,7 @@ zink_bind_blend_state(struct pipe_context *pctx, void *cso)
       state->blend_id = blend ? blend->hash : 0;
       state->dirty = true;
       bool force_dual_color_blend = zink_screen(pctx->screen)->driconf.dual_color_blend_by_location &&
-                                    blend && blend->dual_src_blend && state->blend_state->attachments[1].blendEnable;
+                                    blend && blend->dual_src_blend && state->blend_state->attachments[0].blendEnable;
       if (force_dual_color_blend != zink_get_fs_key(ctx)->force_dual_color_blend)
          zink_set_fs_key(ctx)->force_dual_color_blend = force_dual_color_blend;
       ctx->blend_state_changed = true;



More information about the mesa-commit mailing list