Reviewed-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
--
Edward O'Callaghan
edward.ocallag...@koparo.com
On Wed, Aug 12, 2015, at 02:43 AM, Martin Peres wrote:
> Signed-off-by: Martin Peres <martin.pe...@linux.intel.com>
> ---
> src/glsl/glcpp/glcpp-parse.y | 3 +++
> src/glsl/glsl_parser_extras.cpp | 1 +
> src/glsl/glsl_parser_extras.h | 2 ++
> src/mesa/main/extensions.c | 1 +
> src/mesa/main/mtypes.h | 1 +
> 5 files changed, 8 insertions(+)
>
> diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
> index dd5ec2a..18e50af 100644
> --- a/src/glsl/glcpp/glcpp-parse.y
> +++ b/src/glsl/glcpp/glcpp-parse.y
> @@ -2478,6 +2478,9 @@
> _glcpp_parser_handle_version_declaration(glcpp_parser_t *parser, intmax_t
> versio
> if (extensions->ARB_shader_image_load_store)
> add_builtin_define(parser, "GL_ARB_shader_image_load_store",
> 1);
>
> + if (extensions->ARB_shader_image_size)
> + add_builtin_define(parser, "GL_ARB_shader_image_size",
> 1);
> +
> 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 46896d7..a4fbb33 100644
> --- a/src/glsl/glsl_parser_extras.cpp
> +++ b/src/glsl/glsl_parser_extras.cpp
> @@ -599,6 +599,7 @@ static const _mesa_glsl_extension
> _mesa_glsl_supported_extensions[] = {
> EXT(ARB_shader_atomic_counters, true, false,
> ARB_shader_atomic_counters),
> 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_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 eb325f0..f018f1d 100644
> --- a/src/glsl/glsl_parser_extras.h
> +++ b/src/glsl/glsl_parser_extras.h
> @@ -495,6 +495,8 @@ struct _mesa_glsl_parse_state {
> bool ARB_shader_bit_encoding_warn;
> bool ARB_shader_image_load_store_enable;
> bool ARB_shader_image_load_store_warn;
> + bool ARB_shader_image_size_enable;
> + bool ARB_shader_image_size_warn;
> bool ARB_shader_precision_enable;
> bool ARB_shader_precision_warn;
> bool ARB_shader_stencil_export_enable;
> diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
> index 2dbfabd..038a438 100644
> --- a/src/mesa/main/extensions.c
> +++ b/src/mesa/main/extensions.c
> @@ -152,6 +152,7 @@ static const struct extension extension_table[] = {
> { "GL_ARB_shader_atomic_counters",
> o(ARB_shader_atomic_counters), GL, 2011 },
> { "GL_ARB_shader_bit_encoding",
> o(ARB_shader_bit_encoding), GL, 2010 },
> { "GL_ARB_shader_image_load_store",
> o(ARB_shader_image_load_store), GL, 2011 },
> + { "GL_ARB_shader_image_size",
> o(ARB_shader_image_size), GL, 2012 },
> { "GL_ARB_shader_objects", o(dummy_true),
> GL, 2002 },
> { "GL_ARB_shader_precision",
> o(ARB_shader_precision), GL, 2010 },
> { "GL_ARB_shader_stencil_export",
> o(ARB_shader_stencil_export), GL, 2009 },
> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
> index 4e00fb6..6a0065c 100644
> --- a/src/mesa/main/mtypes.h
> +++ b/src/mesa/main/mtypes.h
> @@ -3862,6 +3862,7 @@ struct gl_extensions
> GLboolean ARB_shader_atomic_counters;
> GLboolean ARB_shader_bit_encoding;
> GLboolean ARB_shader_image_load_store;
> + GLboolean ARB_shader_image_size;
> GLboolean ARB_shader_precision;
> GLboolean ARB_shader_stencil_export;
> GLboolean ARB_shader_storage_buffer_object;
> --
> 2.5.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
