[Mesa-dev] [PATCH 16a/16] mesa/st: move things around a bit in st_create_fp_variant()

[Marek Olšák]

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

Marek

On Tue, Mar 29, 2016 at 4:20 PM, Rob Clark <robdclark at gmail.com> wrote:
> From: Rob Clark <robclark at freedesktop.org>
>
> Prep work for next patch.
>
> Signed-off-by: Rob Clark <robclark at freedesktop.org>
> ---
>  src/mesa/state_tracker/st_program.c | 20 ++++++++------------
>  1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c
> index 94dc489..8e9c521 100644
> --- a/src/mesa/state_tracker/st_program.c
> +++ b/src/mesa/state_tracker/st_program.c
> @@ -857,6 +857,13 @@ st_create_fp_variant(struct st_context *st,
>     struct pipe_context *pipe = st->pipe;
>     struct st_fp_variant *variant = CALLOC_STRUCT(st_fp_variant);
>     struct pipe_shader_state tgsi = {0};
> +   struct gl_program_parameter_list *params = stfp->Base.Base.Parameters;
> +   static const gl_state_index texcoord_state[STATE_LENGTH] =
> +      { STATE_INTERNAL, STATE_CURRENT_ATTRIB, VERT_ATTRIB_TEX0 };
> +   static const gl_state_index scale_state[STATE_LENGTH] =
> +      { STATE_INTERNAL, STATE_PT_SCALE };
> +   static const gl_state_index bias_state[STATE_LENGTH] =
> +      { STATE_INTERNAL, STATE_PT_BIAS };
>
>     if (!variant)
>        return NULL;
> @@ -917,7 +924,6 @@ st_create_fp_variant(struct st_context *st,
>     if (key->drawpixels) {
>        const struct tgsi_token *tokens;
>        unsigned scale_const = 0, bias_const = 0, texcoord_const = 0;
> -      struct gl_program_parameter_list *params = stfp->Base.Base.Parameters;
>
>        /* Find the first unused slot. */
>        variant->drawpix_sampler = ffs(~stfp->Base.Base.SamplersUsed) - 1;
> @@ -930,21 +936,11 @@ st_create_fp_variant(struct st_context *st,
>        }
>
>        if (key->scaleAndBias) {
> -         static const gl_state_index scale_state[STATE_LENGTH] =
> -            { STATE_INTERNAL, STATE_PT_SCALE };
> -         static const gl_state_index bias_state[STATE_LENGTH] =
> -            { STATE_INTERNAL, STATE_PT_BIAS };
> -
>           scale_const = _mesa_add_state_reference(params, scale_state);
>           bias_const = _mesa_add_state_reference(params, bias_state);
>        }
>
> -      {
> -         static const gl_state_index state[STATE_LENGTH] =
> -            { STATE_INTERNAL, STATE_CURRENT_ATTRIB, VERT_ATTRIB_TEX0 };
> -
> -         texcoord_const = _mesa_add_state_reference(params, state);
> -      }
> +      texcoord_const = _mesa_add_state_reference(params, texcoord_state);
>
>        tokens = st_get_drawpix_shader(tgsi.tokens,
>                                       st->needs_texcoord_semantic,
> --
> 2.5.5
>