[Mesa-dev] [PATCH 1/2] mesa: don't set ES versions to GLSLVersion in _mesa_init_constants

[Brian Paul]

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


On 09/19/2014 01:03 PM, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
>
> No place in Mesa expects an ES version there.
> Drivers don't even set it like this.
> ---
>   src/mesa/main/context.c | 12 ++----------
>   src/mesa/main/mtypes.h  |  2 +-
>   2 files changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
> index 682b9c7..53fb9c6 100644
> --- a/src/mesa/main/context.c
> +++ b/src/mesa/main/context.c
> @@ -642,16 +642,8 @@ _mesa_init_constants(struct gl_constants *consts, gl_api api)
>      consts->MaxGeometryTotalOutputComponents = MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS;
>
>      /* Shading language version */
> -   if (api == API_OPENGL_COMPAT || api == API_OPENGL_CORE) {
> -      consts->GLSLVersion = 120;
> -      _mesa_override_glsl_version(consts);
> -   }
> -   else if (api == API_OPENGLES2) {
> -      consts->GLSLVersion = 100;
> -   }
> -   else if (api == API_OPENGLES) {
> -      consts->GLSLVersion = 0; /* GLSL not supported */
> -   }
> +   consts->GLSLVersion = 120;
> +   _mesa_override_glsl_version(consts);
>
>      /* GL_ARB_framebuffer_object */
>      consts->MaxSamples = 0;
> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
> index 553a216..7c237bd 100644
> --- a/src/mesa/main/mtypes.h
> +++ b/src/mesa/main/mtypes.h
> @@ -3452,7 +3452,7 @@ struct gl_constants
>      GLuint MaxGeometryOutputVertices;
>      GLuint MaxGeometryTotalOutputComponents;
>
> -   GLuint GLSLVersion;  /**< GLSL version supported (ex: 120 = 1.20) */
> +   GLuint GLSLVersion;  /**< Desktop GLSL version supported (ex: 120 = 1.20) */
>
>      /**
>       * Changes default GLSL extension behavior from "error" to "warn".  It's out
>