Mesa (staging/22.1): d3d12: Keep access masks up-to-date when removing vars in d3d12_disable_multisampling()
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jun 16 22:19:30 UTC 2022
Module: Mesa
Branch: staging/22.1
Commit: aa0a47d14a839a9fc317d047aa94a3ebd5f2f041
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=aa0a47d14a839a9fc317d047aa94a3ebd5f2f041
Author: Boris Brezillon <boris.brezillon at collabora.com>
Date: Wed Jun 15 08:17:08 2022 -0700
d3d12: Keep access masks up-to-date when removing vars in d3d12_disable_multisampling()
Fixes: e5cf19fced6 ("d3d12: Modify shaders when MSAA is disabled")
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17039>
(cherry picked from commit c9b2c79d16d0e7d79712483bf979a8eff2b42ea9)
---
.pick_status.json | 2 +-
src/gallium/drivers/d3d12/d3d12_nir_passes.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/.pick_status.json b/.pick_status.json
index 081c7b5225e..c6eabc080f1 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -373,7 +373,7 @@
"description": "d3d12: Keep access masks up-to-date when removing vars in d3d12_disable_multisampling()",
"nominated": true,
"nomination_type": 1,
- "resolution": 0,
+ "resolution": 1,
"main_sha": null,
"because_sha": "e5cf19fced6feff07bcd6b288f6370feb21a496f"
},
diff --git a/src/gallium/drivers/d3d12/d3d12_nir_passes.c b/src/gallium/drivers/d3d12/d3d12_nir_passes.c
index b2a28834a4f..2ecef979d55 100644
--- a/src/gallium/drivers/d3d12/d3d12_nir_passes.c
+++ b/src/gallium/drivers/d3d12/d3d12_nir_passes.c
@@ -1004,6 +1004,7 @@ d3d12_disable_multisampling(nir_shader *s)
nir_foreach_variable_with_modes_safe(var, s, nir_var_shader_out) {
if (var->data.location == FRAG_RESULT_SAMPLE_MASK) {
exec_node_remove(&var->node);
+ s->info.outputs_written &= ~(1ull << FRAG_RESULT_SAMPLE_MASK);
progress = true;
}
}
More information about the mesa-commit
mailing list