[Mesa-dev] [PATCH 1/3] mesa: rename the AMD_conservative_depth extension flag to ARB

[Ian Romanick]

On 11/19/2011 09:54 AM, Marek Olšák wrote:

The series is

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

> ---
>   src/glsl/glcpp/glcpp-parse.y    |    2 +-
>   src/glsl/glsl_parser_extras.cpp |    4 ++--
>   src/mesa/main/extensions.c      |    4 ++--
>   src/mesa/main/mtypes.h          |    2 +-
>   4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/src/glsl/glcpp/glcpp-parse.y b/src/glsl/glcpp/glcpp-parse.y
> index c0457b0..2b7e65c 100644
> --- a/src/glsl/glcpp/glcpp-parse.y
> +++ b/src/glsl/glcpp/glcpp-parse.y
> @@ -1135,7 +1135,7 @@ glcpp_parser_create (const struct gl_extensions *extensions, int api)
>   	   if (extensions->ARB_draw_instanced)
>   	      add_builtin_define(parser, "GL_ARB_draw_instanced", 1);
>
> -	   if (extensions->AMD_conservative_depth) {
> +	   if (extensions->ARB_conservative_depth) {
>   	      add_builtin_define(parser, "GL_AMD_conservative_depth", 1);
>   	      add_builtin_define(parser, "GL_ARB_conservative_depth", 1);
>   	   }
> diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
> index 23aadb1..53ce881 100644
> --- a/src/glsl/glsl_parser_extras.cpp
> +++ b/src/glsl/glsl_parser_extras.cpp
> @@ -256,7 +256,7 @@ struct _mesa_glsl_extension {
>   static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
>      /*                                  target availability  API availability */
>      /* name                             VS     GS     FS     GL     ES         supported flag */
> -   EXT(ARB_conservative_depth,         true,  false, true,  true,  false,     AMD_conservative_depth),
> +   EXT(ARB_conservative_depth,         true,  false, true,  true,  false,     ARB_conservative_depth),
>      EXT(ARB_draw_buffers,               false, false, true,  true,  false,     dummy_true),
>      EXT(ARB_draw_instanced,             true,  false, false, true,  false,     ARB_draw_instanced),
>      EXT(ARB_explicit_attrib_location,   true,  false, true,  true,  false,     ARB_explicit_attrib_location),
> @@ -265,7 +265,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
>      EXT(EXT_texture_array,              true,  false, true,  true,  false,     EXT_texture_array),
>      EXT(ARB_shader_texture_lod,         true,  false, true,  true,  false,     ARB_shader_texture_lod),
>      EXT(ARB_shader_stencil_export,      false, false, true,  true,  false,     ARB_shader_stencil_export),
> -   EXT(AMD_conservative_depth,         true,  false, true,  true,  false,     AMD_conservative_depth),
> +   EXT(AMD_conservative_depth,         true,  false, true,  true,  false,     ARB_conservative_depth),
>      EXT(AMD_shader_stencil_export,      false, false, true,  true,  false,     ARB_shader_stencil_export),
>      EXT(OES_texture_3D,                 true,  false, true,  false, true,      EXT_texture3D),
>      EXT(OES_EGL_image_external,         true,  false, true,  false, true,      OES_EGL_image_external),
> diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
> index d5a8914..8ebc051 100644
> --- a/src/mesa/main/extensions.c
> +++ b/src/mesa/main/extensions.c
> @@ -81,7 +81,7 @@ static const struct extension extension_table[] = {
>      { "GL_ARB_blend_func_extended",                 o(ARB_blend_func_extended),                 GL,             2009 },
>      { "GL_ARB_color_buffer_float",                  o(ARB_color_buffer_float),                  GL,             2004 },
>      { "GL_ARB_copy_buffer",                         o(ARB_copy_buffer),                         GL,             2008 },
> -   { "GL_ARB_conservative_depth",                  o(AMD_conservative_depth),                  GL,             2011 },
> +   { "GL_ARB_conservative_depth",                  o(ARB_conservative_depth),                  GL,             2011 },
>      { "GL_ARB_depth_buffer_float",                  o(ARB_depth_buffer_float),                  GL,             2008 },
>      { "GL_ARB_depth_clamp",                         o(ARB_depth_clamp),                         GL,             2003 },
>      { "GL_ARB_depth_texture",                       o(ARB_depth_texture),                       GL,             2001 },
> @@ -257,7 +257,7 @@ static const struct extension extension_table[] = {
>
>      /* Vendor extensions */
>      { "GL_3DFX_texture_compression_FXT1",           o(TDFX_texture_compression_FXT1),           GL,             1999 },
> -   { "GL_AMD_conservative_depth",                  o(AMD_conservative_depth),                  GL,             2009 },
> +   { "GL_AMD_conservative_depth",                  o(ARB_conservative_depth),                  GL,             2009 },
>      { "GL_AMD_draw_buffers_blend",                  o(ARB_draw_buffers_blend),                  GL,             2009 },
>      { "GL_AMD_seamless_cubemap_per_texture",        o(AMD_seamless_cubemap_per_texture),        GL,             2009 },
>      { "GL_AMD_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 b3427da..96a4426 100644
> --- a/src/mesa/main/mtypes.h
> +++ b/src/mesa/main/mtypes.h
> @@ -2844,6 +2844,7 @@ struct gl_extensions
>      GLboolean ARB_ES2_compatibility;
>      GLboolean ARB_blend_func_extended;
>      GLboolean ARB_color_buffer_float;
> +   GLboolean ARB_conservative_depth;
>      GLboolean ARB_copy_buffer;
>      GLboolean ARB_depth_buffer_float;
>      GLboolean ARB_depth_clamp;
> @@ -2942,7 +2943,6 @@ struct gl_extensions
>      GLboolean EXT_vertex_array_bgra;
>      GLboolean OES_standard_derivatives;
>      /* vendor extensions */
> -   GLboolean AMD_conservative_depth;
>      GLboolean AMD_seamless_cubemap_per_texture;
>      GLboolean APPLE_packed_pixels;
>      GLboolean APPLE_vertex_array_object;