Mesa (staging/22.0): intel/fs: Copy color_outputs_valid into wm_prog_data

[GitLab Mirror]

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

Author: Jason Ekstrand <jason.ekstrand at collabora.com>
Date:   Fri May 13 16:54:26 2022 -0500

intel/fs: Copy color_outputs_valid into wm_prog_data

Fixes: 36ee2fd61c8f ("anv: Implement the basic form of VK_EXT_transform_feedback")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16506>
(cherry picked from commit 1b9248e761d7ff04415326de18f8fc2468bcbcd3)

---

 .pick_status.json                 | 2 +-
 src/intel/compiler/brw_compiler.h | 1 +
 src/intel/compiler/brw_fs.cpp     | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 0b5b6737576..85a29c93272 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1428,7 +1428,7 @@
         "description": "intel/fs: Copy color_outputs_valid into wm_prog_data",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "36ee2fd61c8f943be1d1e2b0354f7a121ffef28f"
     },
     {
diff --git a/src/intel/compiler/brw_compiler.h b/src/intel/compiler/brw_compiler.h
index 3ea7ae81b15..eb7fe1e6142 100644
--- a/src/intel/compiler/brw_compiler.h
+++ b/src/intel/compiler/brw_compiler.h
@@ -850,6 +850,7 @@ struct brw_wm_prog_data {
       /** @} */
    } binding_table;
 
+   uint8_t color_outputs_written;
    uint8_t computed_depth_mode;
    bool computed_stencil;
 
diff --git a/src/intel/compiler/brw_fs.cpp b/src/intel/compiler/brw_fs.cpp
index 6be5e66d37f..ba6828ba4bd 100644
--- a/src/intel/compiler/brw_fs.cpp
+++ b/src/intel/compiler/brw_fs.cpp
@@ -9683,6 +9683,7 @@ brw_nir_populate_wm_prog_data(const nir_shader *shader,
                           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->color_outputs_written = key->color_outputs_valid;
    prog_data->computed_depth_mode = computed_depth_mode(shader);
    prog_data->computed_stencil =
       shader->info.outputs_written & BITFIELD64_BIT(FRAG_RESULT_STENCIL);