Module: Mesa
Branch: master
Commit: 5cd34f03c0a38fffe776a57521dad8ca24453bf1
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5cd34f03c0a38fffe776a57521dad8ca24453bf1

Author: Samuel Pitoiset <samuel.pitoi...@gmail.com>
Date:   Thu Mar  1 11:54:19 2018 +0100

ac/shader: scan output usage mask for VS and TES

Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com>
Reviewed-by: Dave Airlie <airl...@redhat.com>

---

 src/amd/common/ac_shader_info.c | 18 ++++++++++++++++++
 src/amd/common/ac_shader_info.h |  4 ++++
 2 files changed, 22 insertions(+)

diff --git a/src/amd/common/ac_shader_info.c b/src/amd/common/ac_shader_info.c
index 57d7edec76..98de963147 100644
--- a/src/amd/common/ac_shader_info.c
+++ b/src/amd/common/ac_shader_info.c
@@ -146,6 +146,24 @@ gather_intrinsic_info(const nir_shader *nir, const 
nir_intrinsic_instr *instr,
                        }
                }
                break;
+       case nir_intrinsic_store_var: {
+               nir_deref_var *dvar = instr->variables[0];
+               nir_variable *var = dvar->var;
+
+               if (var->data.mode == nir_var_shader_out) {
+                       unsigned idx = var->data.location;
+                       unsigned comp = var->data.location_frac;
+
+                       if (nir->info.stage == MESA_SHADER_VERTEX) {
+                               info->vs.output_usage_mask[idx] |=
+                                       instr->const_index[0] << comp;
+                       } else if (nir->info.stage == MESA_SHADER_TESS_EVAL) {
+                               info->tes.output_usage_mask[idx] |=
+                                       instr->const_index[0] << comp;
+                       }
+               }
+               break;
+       }
        default:
                break;
        }
diff --git a/src/amd/common/ac_shader_info.h b/src/amd/common/ac_shader_info.h
index 60ddfd2d71..12a1dcf915 100644
--- a/src/amd/common/ac_shader_info.h
+++ b/src/amd/common/ac_shader_info.h
@@ -37,11 +37,15 @@ struct ac_shader_info {
        bool uses_prim_id;
        struct {
                uint8_t input_usage_mask[VERT_ATTRIB_MAX];
+               uint8_t output_usage_mask[VARYING_SLOT_VAR31 + 1];
                bool has_vertex_buffers; /* needs vertex buffers and base/start 
*/
                bool needs_draw_id;
                bool needs_instance_id;
        } vs;
        struct {
+               uint8_t output_usage_mask[VARYING_SLOT_VAR31 + 1];
+       } tes;
+       struct {
                bool force_persample;
                bool needs_sample_positions;
                bool uses_input_attachments;

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to