[Mesa-dev] [PATCH] mesa: Remove FEATURE_ARB_shading_language_120 macro.

[Brian Paul]

On 10/20/2010 03:20 PM, Kenneth Graunke wrote:
> Everything should be able to support 1.20 at this point.
> ---
>   src/mesa/main/context.c   |    4 ----
>   src/mesa/main/mfeatures.h |    1 -
>   2 files changed, 0 insertions(+), 5 deletions(-)
>
> diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
> index 1625e4c..9401e3d 100644
> --- a/src/mesa/main/context.c
> +++ b/src/mesa/main/context.c
> @@ -592,11 +592,7 @@ _mesa_init_constants(struct gl_context *ctx)
>
>      /* Shading language version */
>      if (ctx->API == API_OPENGL) {
> -#if FEATURE_ARB_shading_language_120
>         ctx->Const.GLSLVersion = 120;
> -#else
> -      ctx->Const.GLSLVersion = 110;
> -#endif
>      }
>      else if (ctx->API == API_OPENGLES2) {
>         ctx->Const.GLSLVersion = 100;
> diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
> index 9b9b6d0..5afd65d 100644
> --- a/src/mesa/main/mfeatures.h
> +++ b/src/mesa/main/mfeatures.h
> @@ -119,7 +119,6 @@
>   #define FEATURE_ARB_fragment_shader       1
>   #define FEATURE_ARB_shader_objects        (FEATURE_ARB_vertex_shader || FEATURE_ARB_fragment_shader)
>   #define FEATURE_ARB_shading_language_100  FEATURE_ARB_shader_objects
> -#define FEATURE_ARB_shading_language_120  FEATURE_ARB_shader_objects
>   #define FEATURE_ARB_geometry_shader4      FEATURE_ARB_shader_objects
>
>   #define FEATURE_ARB_framebuffer_object    (FEATURE_GL&&  FEATURE_EXT_framebuffer_object)

Looks good.

-Brian