[Mesa-dev] [PATCH 09/16] mesa: remove EXT_texture3D extension enable flag

[Ian Romanick]

On 10/28/2012 07:24 AM, Marek Olšák wrote:

I think we should leave this flag.  There is some hardware that can do 
ES1 that cannot do 3D texturing.

> ---
>   src/glsl/glsl_parser_extras.cpp     |    2 +-
>   src/glsl/standalone_scaffolding.cpp |    1 -
>   src/mesa/main/extensions.c          |    6 ++----
>   src/mesa/main/mtypes.h              |    1 -
>   4 files changed, 3 insertions(+), 7 deletions(-)
>
> diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
> index 872fcda..977e769 100644
> --- a/src/glsl/glsl_parser_extras.cpp
> +++ b/src/glsl/glsl_parser_extras.cpp
> @@ -284,7 +284,7 @@ static const _mesa_glsl_extension _mesa_glsl_supported_extensions[] = {
>      EXT(ARB_shader_stencil_export,      false, false, true,  true,  false,     ARB_shader_stencil_export),
>      EXT(AMD_conservative_depth,         false, 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_texture_3D,                 true,  false, true,  false, true,      dummy_true),
>      EXT(OES_EGL_image_external,         true,  false, true,  false, true,      OES_EGL_image_external),
>      EXT(ARB_shader_bit_encoding,        true,  true,  true,  true,  false,     ARB_shader_bit_encoding),
>      EXT(ARB_uniform_buffer_object,      true,  false, true,  true,  false,     ARB_uniform_buffer_object),
> diff --git a/src/glsl/standalone_scaffolding.cpp b/src/glsl/standalone_scaffolding.cpp
> index 679714e..e16390b 100644
> --- a/src/glsl/standalone_scaffolding.cpp
> +++ b/src/glsl/standalone_scaffolding.cpp
> @@ -77,7 +77,6 @@ void initialize_context_to_defaults(struct gl_context *ctx, gl_api api)
>      ctx->Extensions.ARB_fragment_coord_conventions = true;
>      ctx->Extensions.EXT_texture_array = true;
>      ctx->Extensions.NV_texture_rectangle = true;
> -   ctx->Extensions.EXT_texture3D = true;
>      ctx->Extensions.OES_EGL_image_external = true;
>      ctx->Extensions.ARB_shader_bit_encoding = true;
>
> diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
> index 88b5762..199c37a 100644
> --- a/src/mesa/main/extensions.c
> +++ b/src/mesa/main/extensions.c
> @@ -193,7 +193,7 @@ static const struct extension extension_table[] = {
>      { "GL_EXT_stencil_two_side",                    o(EXT_stencil_two_side),                    GLL,            2001 },
>      { "GL_EXT_stencil_wrap",                        o(dummy_true),                              GLL,            2002 },
>      { "GL_EXT_subtexture",                          o(dummy_true),                              GLL,            1995 },
> -   { "GL_EXT_texture3D",                           o(EXT_texture3D),                           GLL,            1996 },
> +   { "GL_EXT_texture3D",                           o(dummy_true),                              GLL,            1996 },
>      { "GL_EXT_texture_array",                       o(EXT_texture_array),                       GL,             2006 },
>      { "GL_EXT_texture_compression_dxt1",            o(EXT_texture_compression_s3tc),            GL | ES1 | ES2, 2004 },
>      { "GL_ANGLE_texture_compression_dxt3",          o(ANGLE_texture_compression_dxt),           ES2,            2011 },
> @@ -260,7 +260,7 @@ static const struct extension extension_table[] = {
>      { "GL_OES_stencil4",                            o(dummy_false),                     DISABLE,                2005 },
>      { "GL_OES_stencil8",                            o(EXT_framebuffer_object),                       ES1 | ES2, 2005 },
>      { "GL_OES_stencil_wrap",                        o(dummy_true),                                   ES1,       2002 },
> -   { "GL_OES_texture_3D",                          o(EXT_texture3D),                                      ES2, 2005 },
> +   { "GL_OES_texture_3D",                          o(dummy_true),                                         ES2, 2005 },
>      { "GL_OES_texture_cube_map",                    o(ARB_texture_cube_map),                         ES1,       2007 },
>      { "GL_OES_texture_env_crossbar",                o(ARB_texture_env_crossbar),                     ES1,       2005 },
>      { "GL_OES_texture_mirrored_repeat",             o(dummy_true),                                   ES1,       2005 },
> @@ -356,8 +356,6 @@ name_to_offset(const char* name)
>    * XXX: Should these defaults also apply to GLES?
>    */
>   static const size_t default_extensions[] = {
> -   o(EXT_texture3D),
> -
>      o(OES_standard_derivatives),
>
>      /* Vendor Extensions */
> diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
> index 7855003..41d38ca 100644
> --- a/src/mesa/main/mtypes.h
> +++ b/src/mesa/main/mtypes.h
> @@ -3009,7 +3009,6 @@ struct gl_extensions
>      GLboolean EXT_secondary_color;
>      GLboolean EXT_separate_shader_objects;
>      GLboolean EXT_stencil_two_side;
> -   GLboolean EXT_texture3D;
>      GLboolean EXT_texture_array;
>      GLboolean EXT_texture_compression_latc;
>      GLboolean EXT_texture_compression_s3tc;
>