Mesa (staging/22.0): intel/fs: Initialize the sample mask in flags register when using demote

[GitLab Mirror]

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

Author: Caio Oliveira <caio.oliveira at intel.com>
Date:   Tue Mar 15 17:15:17 2022 -0700

intel/fs: Initialize the sample mask in flags register when using demote

Without this change, a check for "is helper invocation" could read
uninitialized values.

Fixes: 45f5db5a84a ("intel/fs: Implement "demote to helper invocation"")
Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15400>
(cherry picked from commit bb311c22dfb7627111cf76cd2fb619c4c6fe8b79)

---

 src/intel/compiler/brw_fs.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index cb7713bfbb4..516b001620f 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -9652,7 +9652,8 @@ brw_nir_populate_wm_prog_data(const nir_shader *shader,
     * so the shader definitely kills pixels.
     */
    prog_data->uses_kill = shader->info.fs.uses_discard ||
-      key->emit_alpha_test;
+                          shader->info.fs.uses_demote ||
+                          key->emit_alpha_test;
    prog_data->uses_omask = !key->ignore_sample_mask_out &&
       (shader->info.outputs_written & BITFIELD64_BIT(FRAG_RESULT_SAMPLE_MASK));
    prog_data->computed_depth_mode = computed_depth_mode(shader);