[Mesa-dev] [PATCH v2 12/12] st/glsl_to_nir: disable io lowering and array splitting of fs inputs

[Marek Olšák]

If you fix the possible NULL function call in patch 9, the series is:

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Tue, Jan 30, 2018 at 4:55 AM, Timothy Arceri <tarceri at itsqueeze.com> wrote:
> We need this to be able to support the interpolateAt builtins in a
> sane way. It also leads to the generation of more optimal code.
>
> The lowering and splitting is made conditional on lower_all_io_to_temps
> because vc4 and freedreno both expect these passes to be enabled and
> niether support glsl 400 so don't need to deal with the interpolateAt
> builtins.
>
> We leave the other stages for now as to avoid regressions. Ideally we
> could remove the stage checks and just set the nir options correctly
> for each stage. However all gallium drivers currently just use return
> the same nir compiler options for all stages, and it's probably more
> trouble than its worth to change this.
> ---
>  src/mesa/state_tracker/st_glsl_to_nir.cpp | 22 ++++++++++++++++++----
>  1 file changed, 18 insertions(+), 4 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
> index a3d447c5a4..65931bfa33 100644
> --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
> +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
> @@ -451,6 +451,8 @@ st_nir_get_mesa_program(struct gl_context *ctx,
>                          struct gl_linked_shader *shader)
>  {
>     struct st_context *st = st_context(ctx);
> +   const nir_shader_compiler_options *options =
> +      ctx->Const.ShaderCompilerOptions[shader->Program->info.stage].NirOptions;
>     struct gl_program *prog;
>
>     validate_ir_tree(shader->ir);
> @@ -480,12 +482,18 @@ st_nir_get_mesa_program(struct gl_context *ctx,
>     set_st_program(prog, shader_program, nir);
>     prog->nir = nir;
>
> -   if (nir->info.stage != MESA_SHADER_TESS_CTRL &&
> -       nir->info.stage != MESA_SHADER_TESS_EVAL) {
> +   if (options->lower_all_io_to_temps ||
> +       nir->info.stage == MESA_SHADER_VERTEX ||
> +       nir->info.stage == MESA_SHADER_GEOMETRY) {
>        NIR_PASS_V(nir, nir_lower_io_to_temporaries,
>                   nir_shader_get_entrypoint(nir),
>                   true, true);
> +   } else if (nir->info.stage == MESA_SHADER_FRAGMENT) {
> +      NIR_PASS_V(nir, nir_lower_io_to_temporaries,
> +                 nir_shader_get_entrypoint(nir),
> +                 true, false);
>     }
> +
>     NIR_PASS_V(nir, nir_lower_global_vars_to_local);
>     NIR_PASS_V(nir, nir_split_var_copies);
>     NIR_PASS_V(nir, nir_lower_var_copies);
> @@ -655,12 +663,18 @@ st_finalize_nir(struct st_context *st, struct gl_program *prog,
>                  struct gl_shader_program *shader_program, nir_shader *nir)
>  {
>     struct pipe_screen *screen = st->pipe->screen;
> +   const nir_shader_compiler_options *options =
> +      st->ctx->Const.ShaderCompilerOptions[prog->info.stage].NirOptions;
>
>     NIR_PASS_V(nir, nir_split_var_copies);
>     NIR_PASS_V(nir, nir_lower_var_copies);
> -   if (nir->info.stage != MESA_SHADER_TESS_CTRL &&
> -       nir->info.stage != MESA_SHADER_TESS_EVAL)
> +   if (options->lower_all_io_to_temps ||
> +       nir->info.stage == MESA_SHADER_VERTEX ||
> +       nir->info.stage == MESA_SHADER_GEOMETRY) {
>        NIR_PASS_V(nir, nir_lower_io_arrays_to_elements_no_indirects, false);
> +   } else if (nir->info.stage == MESA_SHADER_FRAGMENT) {
> +      NIR_PASS_V(nir, nir_lower_io_arrays_to_elements_no_indirects, true);
> +   }
>
>     if (nir->info.stage == MESA_SHADER_VERTEX) {
>        /* Needs special handling so drvloc matches the vbo state: */
> --
> 2.14.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev