[Mesa-dev] [PATCH 2/4] mesa: (trivial) remove unused ignore_sample_qualifier_parameter

[Brian Paul]

Reviewed-by: Brian Paul <brianp at vmware.com>


On 02/04/2018 04:01 PM, sroland at vmware.com wrote:
> From: Roland Scheidegger <sroland at vmware.com>
> 
> This parameter for _mesa_get_min_incations_per_fragment() was once used
> by the intel driver, but it's long gone.
> ---
>   src/mesa/program/program.c            | 11 ++++-------
>   src/mesa/program/program.h            |  3 +--
>   src/mesa/state_tracker/st_atom_msaa.c |  2 +-
>   3 files changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c
> index 220efc3539..6aba3cb3f1 100644
> --- a/src/mesa/program/program.c
> +++ b/src/mesa/program/program.c
> @@ -515,8 +515,7 @@ _mesa_find_free_register(const GLboolean used[],
>    */
>   GLint
>   _mesa_get_min_invocations_per_fragment(struct gl_context *ctx,
> -                                       const struct gl_program *prog,
> -                                       bool ignore_sample_qualifier)
> +                                       const struct gl_program *prog)
>   {
>      /* From ARB_sample_shading specification:
>       * "Using gl_SampleID in a fragment shader causes the entire shader
> @@ -534,11 +533,9 @@ _mesa_get_min_invocations_per_fragment(struct gl_context *ctx,
>          * "Use of the "sample" qualifier on a fragment shader input
>          *  forces per-sample shading"
>          */
> -      if (prog->info.fs.uses_sample_qualifier && !ignore_sample_qualifier)
> -         return MAX2(_mesa_geometric_samples(ctx->DrawBuffer), 1);
> -
> -      if (prog->info.system_values_read & (SYSTEM_BIT_SAMPLE_ID |
> -                                           SYSTEM_BIT_SAMPLE_POS))
> +      if (prog->info.fs.uses_sample_qualifier ||
> +          (prog->info.system_values_read & (SYSTEM_BIT_SAMPLE_ID |
> +                                            SYSTEM_BIT_SAMPLE_POS)))
>            return MAX2(_mesa_geometric_samples(ctx->DrawBuffer), 1);
>         else if (ctx->Multisample.SampleShading)
>            return MAX2(ceil(ctx->Multisample.MinSampleShadingValue *
> diff --git a/src/mesa/program/program.h b/src/mesa/program/program.h
> index 376da7b2d4..659385f55b 100644
> --- a/src/mesa/program/program.h
> +++ b/src/mesa/program/program.h
> @@ -108,8 +108,7 @@ _mesa_find_free_register(const GLboolean used[],
>   
>   extern GLint
>   _mesa_get_min_invocations_per_fragment(struct gl_context *ctx,
> -                                       const struct gl_program *prog,
> -                                       bool ignore_sample_qualifier);
> +                                       const struct gl_program *prog);
>   
>   static inline GLuint
>   _mesa_program_enum_to_shader_stage(GLenum v)
> diff --git a/src/mesa/state_tracker/st_atom_msaa.c b/src/mesa/state_tracker/st_atom_msaa.c
> index 589e328ac5..556c7c5889 100644
> --- a/src/mesa/state_tracker/st_atom_msaa.c
> +++ b/src/mesa/state_tracker/st_atom_msaa.c
> @@ -77,5 +77,5 @@ st_update_sample_shading(struct st_context *st)
>         return;
>   
>      cso_set_min_samples(st->cso_context,
> -         _mesa_get_min_invocations_per_fragment(st->ctx, &st->fp->Base, false));
> +         _mesa_get_min_invocations_per_fragment(st->ctx, &st->fp->Base));
>   }
>