[Mesa-dev] [PATCH 04/10] glsl: add ARB_shader_texture_image_samples infrastructure

[Ian Romanick]

On 08/27/2015 08:48 PM, Ilia Mirkin wrote:
> Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
> ---
>  src/glsl/glcpp/glcpp-parse.y    | 3 +++
>  src/glsl/glsl_parser_extras.cpp | 1 +
>  src/glsl/glsl_parser_extras.h   | 2 ++
>  3 files changed, 6 insertions(+)
> 
> diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
> index 2d631f0..118333d 100644
> --- a/src/glsl/glcpp/glcpp-parse.y
> +++ b/src/glsl/glcpp/glcpp-parse.y
> @@ -2483,6 +2483,9 @@ _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t versio
>                if (extensions->ARB_shader_image_size)
>                   add_builtin_define(parser, "GL_ARB_shader_image_size", 1);
>  
> +	      if (extensions->ARB_shader_texture_image_samples)
> +	         add_builtin_define(parser, "GL_ARB_shader_texture_image_samples", 1);
> +

Mixed tabs and spaces.

>                if (extensions->ARB_derivative_control)
>                   add_builtin_define(parser, "GL_ARB_derivative_control", 1);
>  
> diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
> index 939a03c..b205a06 100644
> --- a/src/glsl/glsl_parser_extras.cpp
> +++ b/src/glsl/glsl_parser_extras.cpp
> @@ -600,6 +600,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
>     EXT(ARB_shader_bit_encoding,          true,  false,     ARB_shader_bit_encoding),
>     EXT(ARB_shader_image_load_store,      true,  false,     ARB_shader_image_load_store),
>     EXT(ARB_shader_image_size,            true,  false,     ARB_shader_image_size),
> +   EXT(ARB_shader_texture_image_samples, true,  false,     ARB_shader_texture_image_samples),

Alphabetize. :)

With those two things fixed, this patch is

Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

>     EXT(ARB_shader_precision,             true,  false,     ARB_shader_precision),
>     EXT(ARB_shader_stencil_export,        true,  false,     ARB_shader_stencil_export),
>     EXT(ARB_shader_storage_buffer_object, true,  false,     ARB_shader_storage_buffer_object),
> diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h
> index 295cd10..d3b091d 100644
> --- a/src/glsl/glsl_parser_extras.h
> +++ b/src/glsl/glsl_parser_extras.h
> @@ -510,6 +510,8 @@ struct _mesa_glsl_parse_state {
>     bool ARB_shader_storage_buffer_object_warn;
>     bool ARB_shader_subroutine_enable;
>     bool ARB_shader_subroutine_warn;
> +   bool ARB_shader_texture_image_samples_enable;
> +   bool ARB_shader_texture_image_samples_warn;
>     bool ARB_shader_texture_lod_enable;
>     bool ARB_shader_texture_lod_warn;
>     bool ARB_shading_language_420pack_enable;
>