[Mesa-dev] [PATCH 2/3] mesa/st: Trivial, use glsl_feature_level var consistently

[Marek Olšák]

On Wed, Mar 23, 2016 at 4:21 AM, Edward O'Callaghan
<eocallaghan at alterapraxis.com> wrote:
> Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
> ---
>  src/mesa/state_tracker/st_extensions.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
> index 2fdaba0..b03f531 100644
> --- a/src/mesa/state_tracker/st_extensions.c
> +++ b/src/mesa/state_tracker/st_extensions.c
> @@ -854,7 +854,7 @@ void st_init_extensions(struct pipe_screen *screen,
>     _mesa_override_glsl_version(consts);
>
>     if (options->force_glsl_version > 0 &&
> -       options->force_glsl_version <= consts->GLSLVersion) {
> +       options->force_glsl_version <= glsl_feature_level) {

This changes behavior. GLSLVersion is clamped, but glsl_feature_level
is unclamped.

The rest is okay.

Marek