diff options
| author | Iván Briano <ivan.briano@intel.com> | 2023-02-23 12:20:56 -0800 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2023-03-08 18:00:12 +0000 |
| commit | d927a1f1d0debc8f6accfd96e513a73a3ef9b2af (patch) | |
| tree | 7c20da42d13d0ddad382a35bd585634f9bae7d42 | |
| parent | ec5de835c224e3d4873106a1a82cd8972983737a (diff) | |
| download | mesa-d927a1f1d0debc8f6accfd96e513a73a3ef9b2af.tar.gz | |
anv: fix testing for dynamic color blend bits
Fixes: fc3fd7c69e8 (anv: dynamic color write mask)
Fixes: 9dc6bed9a10 (anv: dynamic state for logic op enable)
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21509>
(cherry picked from commit dd5c6446b4f7a4f8a969ec9d932242f7c6a703eb)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/intel/vulkan/gfx8_cmd_buffer.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index 53e0e6ffbfa..17b287dc46c 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -5935,7 +5935,7 @@ "description": "anv: fix testing for dynamic color blend bits", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "fc3fd7c69e80366b4510d9395decdfd83c63c99a" }, diff --git a/src/intel/vulkan/gfx8_cmd_buffer.c b/src/intel/vulkan/gfx8_cmd_buffer.c index 84ea02f48b3..9e7a2477545 100644 --- a/src/intel/vulkan/gfx8_cmd_buffer.c +++ b/src/intel/vulkan/gfx8_cmd_buffer.c @@ -679,7 +679,8 @@ genX(cmd_buffer_flush_dynamic_state)(struct anv_cmd_buffer *cmd_buffer) BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_CB_COLOR_WRITE_ENABLES) || BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_CB_LOGIC_OP_ENABLE) || BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_MS_ALPHA_TO_ONE_ENABLE) || - BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_CB_COLOR_WRITE_ENABLES) || + BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_CB_WRITE_MASKS) || + BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_CB_BLEND_ENABLES) || BITSET_TEST(dyn->dirty, MESA_VK_DYNAMIC_CB_BLEND_EQUATIONS)) { const uint8_t color_writes = dyn->cb.color_write_enables; const struct anv_cmd_graphics_state *state = &cmd_buffer->state.gfx; |