From e61a98877ccdaf7ec1f9f890f0f7c1a993ee70a1 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 2 Jun 2020 10:44:13 +0200 Subject: [PATCH] nir: reuse existing psiz-variable For shaders where there's already a psiz-variable, we should rather reuse it than create a second one. This can happen if a shader writes gl_PointSize, but disables GL_PROGRAM_POINT_SIZE. Fixes: 878c94288a8 ("nir: add lowering-pass for point-size mov") Reviewed-by: Alyssa Rosenzweig Part-of: --- src/compiler/nir/nir_lower_point_size_mov.c | 26 ++++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/compiler/nir/nir_lower_point_size_mov.c b/src/compiler/nir/nir_lower_point_size_mov.c index 56cee7746fd..0b9226b60fa 100644 --- a/src/compiler/nir/nir_lower_point_size_mov.c +++ b/src/compiler/nir/nir_lower_point_size_mov.c @@ -33,11 +33,12 @@ static bool lower_impl(nir_function_impl *impl, - const gl_state_index16 *pointsize_state_tokens) + const gl_state_index16 *pointsize_state_tokens, + nir_variable *out) { nir_shader *shader = impl->function->shader; nir_builder b; - nir_variable *in, *out; + nir_variable *in; nir_builder_init(&b, impl); b.cursor = nir_before_cf_list(&impl->body); @@ -50,9 +51,11 @@ lower_impl(nir_function_impl *impl, pointsize_state_tokens, sizeof(in->state_slots[0].tokens)); - out = nir_variable_create(shader, nir_var_shader_out, - glsl_float_type(), "gl_PointSize"); - out->data.location = VARYING_SLOT_PSIZ; + if (!out) { + out = nir_variable_create(shader, nir_var_shader_out, + glsl_float_type(), "gl_PointSize"); + out->data.location = VARYING_SLOT_PSIZ; + } nir_copy_var(&b, out, in); @@ -65,5 +68,16 @@ void nir_lower_point_size_mov(nir_shader *shader, const gl_state_index16 *pointsize_state_tokens) { - lower_impl(nir_shader_get_entrypoint(shader), pointsize_state_tokens); + assert(shader->info.stage == MESA_SHADER_VERTEX); + + nir_variable *out = NULL; + nir_foreach_variable(var, &shader->outputs) { + if (var->data.location == VARYING_SLOT_PSIZ) { + out = var; + break; + } + } + + lower_impl(nir_shader_get_entrypoint(shader), pointsize_state_tokens, + out); } -- 2.30.2