From 5cd34f03c0a38fffe776a57521dad8ca24453bf1 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 1 Mar 2018 11:54:19 +0100 Subject: [PATCH] ac/shader: scan output usage mask for VS and TES Signed-off-by: Samuel Pitoiset Reviewed-by: Dave Airlie --- 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 57d7edec764..98de963147b 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 60ddfd2d71b..12a1dcf9156 100644 --- a/src/amd/common/ac_shader_info.h +++ b/src/amd/common/ac_shader_info.h @@ -37,10 +37,14 @@ 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; -- 2.30.2