[Mesa-dev] [PATCH 3/3] st/mesa: inline get_mesa_program()

[Nicolai Hähnle]

For the series:

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

On 01.02.2017 01:58, Timothy Arceri wrote:
> From: Timothy Arceri <t_arceri at yahoo.com.au>
>
> In the past I've gotten this function confused with the one in
> ir_to_mesa.cpp of the same name. Now that the affected flag setting
> has move into a helper it makes sense just to inline this remaining
> code.
> ---
>  src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 60 ++++++++++++------------------
>  1 file changed, 23 insertions(+), 37 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> index 823a2b4..d9a4038 100644
> --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
> @@ -6951,37 +6951,6 @@ set_prog_affected_state_flags(struct gl_program *prog)
>     }
>  }
>
> -static struct gl_program *
> -get_mesa_program(struct gl_context *ctx,
> -                 struct gl_shader_program *shader_program,
> -                 struct gl_linked_shader *shader)
> -{
> -   struct pipe_screen *pscreen = ctx->st->pipe->screen;
> -   enum pipe_shader_type ptarget = st_shader_stage_to_ptarget(shader->Stage);
> -   enum pipe_shader_ir preferred_ir = (enum pipe_shader_ir)
> -      pscreen->get_shader_param(pscreen, ptarget, PIPE_SHADER_CAP_PREFERRED_IR);
> -   struct gl_program *prog = NULL;
> -
> -   if (preferred_ir == PIPE_SHADER_IR_NIR) {
> -      /* TODO only for GLSL VS/FS for now: */
> -      switch (shader->Stage) {
> -      case MESA_SHADER_VERTEX:
> -      case MESA_SHADER_FRAGMENT:
> -         prog = st_nir_get_mesa_program(ctx, shader_program, shader);
> -      default:
> -         break;
> -      }
> -   } else {
> -      prog = get_mesa_program_tgsi(ctx, shader_program, shader);
> -   }
> -
> -   if (prog) {
> -      set_prog_affected_state_flags(prog);
> -   }
> -
> -   return prog;
> -}
> -
>  /* See if there are unsupported control flow statements. */
>  class ir_control_flow_info_visitor : public ir_hierarchical_visitor {
>  private:
> @@ -7163,19 +7132,36 @@ st_link_shader(struct gl_context *ctx, struct gl_shader_program *prog)
>     build_program_resource_list(ctx, prog);
>
>     for (unsigned i = 0; i < MESA_SHADER_STAGES; i++) {
> -      struct gl_program *linked_prog;
> -
> -      if (prog->_LinkedShaders[i] == NULL)
> +      struct gl_linked_shader *shader = prog->_LinkedShaders[i];
> +      if (shader == NULL)
>           continue;
>
> -      linked_prog = get_mesa_program(ctx, prog, prog->_LinkedShaders[i]);
> +      enum pipe_shader_type ptarget =
> +         st_shader_stage_to_ptarget(shader->Stage);
> +      enum pipe_shader_ir preferred_ir = (enum pipe_shader_ir)
> +         pscreen->get_shader_param(pscreen, ptarget,
> +                                   PIPE_SHADER_CAP_PREFERRED_IR);
> +
> +      struct gl_program *linked_prog = NULL;
> +      if (preferred_ir == PIPE_SHADER_IR_NIR) {
> +         /* TODO only for GLSL VS/FS for now: */
> +         switch (shader->Stage) {
> +         case MESA_SHADER_VERTEX:
> +         case MESA_SHADER_FRAGMENT:
> +            linked_prog = st_nir_get_mesa_program(ctx, prog, shader);
> +         default:
> +            break;
> +         }
> +      } else {
> +         linked_prog = get_mesa_program_tgsi(ctx, prog, shader);
> +      }
>
>        if (linked_prog) {
> +         set_prog_affected_state_flags(shader->Program);
>           if (!ctx->Driver.ProgramStringNotify(ctx,
>                                                _mesa_shader_stage_to_program(i),
>                                                linked_prog)) {
> -            _mesa_reference_program(ctx, &prog->_LinkedShaders[i]->Program,
> -                                    NULL);
> +            _mesa_reference_program(ctx, &shader->Program, NULL);
>              return GL_FALSE;
>           }
>        }
>