From 5f14e9878085930fc5c396bcc5423879f474e1c7 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 14 Dec 2021 17:18:37 -0800 Subject: [PATCH] mesa: OpenGL 1.3 feature GL_ARB_texture_env_dot3 is not optional MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Part-of: --- src/mesa/main/extensions_table.h | 2 +- src/mesa/main/mtypes.h | 1 - src/mesa/main/texenv.c | 3 +-- src/mesa/main/version.c | 8 ++++---- src/mesa/state_tracker/st_extensions.c | 1 - 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 7156ef9db60..423258cc197 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -159,7 +159,7 @@ EXT(ARB_texture_cube_map_array , ARB_texture_cube_map_array EXT(ARB_texture_env_add , dummy_true , GLL, x , x , x , 1999) EXT(ARB_texture_env_combine , dummy_true , GLL, x , x , x , 2001) EXT(ARB_texture_env_crossbar , ARB_texture_env_crossbar , GLL, x , x , x , 2001) -EXT(ARB_texture_env_dot3 , ARB_texture_env_dot3 , GLL, x , x , x , 2001) +EXT(ARB_texture_env_dot3 , dummy_true , GLL, x , x , x , 2001) EXT(ARB_texture_filter_anisotropic , ARB_texture_filter_anisotropic , GLL, GLC, x , x , 2017) EXT(ARB_texture_filter_minmax , ARB_texture_filter_minmax , GLL, GLC, x , x , 2015) EXT(ARB_texture_float , ARB_texture_float , GLL, GLC, x , x , 2004) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 2d9da737c7e..3f9c8b7c245 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -4451,7 +4451,6 @@ struct gl_extensions GLboolean ARB_texture_compression_rgtc; GLboolean ARB_texture_cube_map_array; GLboolean ARB_texture_env_crossbar; - GLboolean ARB_texture_env_dot3; GLboolean ARB_texture_filter_anisotropic; GLboolean ARB_texture_filter_minmax; GLboolean ARB_texture_float; diff --git a/src/mesa/main/texenv.c b/src/mesa/main/texenv.c index 83cb9365e30..f3e6acd3412 100644 --- a/src/mesa/main/texenv.c +++ b/src/mesa/main/texenv.c @@ -127,8 +127,7 @@ set_combiner_mode(struct gl_context *ctx, break; case GL_DOT3_RGB: case GL_DOT3_RGBA: - legal = (ctx->Extensions.ARB_texture_env_dot3 && - pname == GL_COMBINE_RGB); + legal = (pname == GL_COMBINE_RGB); break; case GL_MODULATE_ADD_ATI: case GL_MODULATE_SIGNED_ADD_ATI: diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 01a6e97e65b..b4a67ed7693 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -251,7 +251,7 @@ compute_version(const struct gl_extensions *extensions, { GLuint major, minor, version; - const bool ver_1_3 = (extensions->ARB_texture_env_dot3); + const bool ver_1_3 = true; const bool ver_1_4 = (ver_1_3 && extensions->ARB_depth_texture && extensions->ARB_shadow && @@ -493,11 +493,11 @@ static GLuint compute_version_es1(const struct gl_extensions *extensions) { /* OpenGL ES 1.0 is derived from OpenGL 1.3 */ - const bool ver_1_0 = (extensions->ARB_texture_env_dot3); + const bool ver_1_0 = true; /* OpenGL ES 1.1 is derived from OpenGL 1.5 */ - const bool ver_1_1 = (ver_1_0 && - extensions->EXT_point_parameters); + const bool ver_1_1 = (extensions->EXT_point_parameters); + return ver_1_1 ? 11 : 10; if (ver_1_1) { return 11; } else if (ver_1_0) { diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 0aadc78fb73..0bbf5200fb9 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -1110,7 +1110,6 @@ void st_init_extensions(struct pipe_screen *screen, extensions->ARB_map_buffer_range = GL_TRUE; extensions->ARB_sync = GL_TRUE; extensions->ARB_texture_env_crossbar = GL_TRUE; - extensions->ARB_texture_env_dot3 = GL_TRUE; extensions->ARB_vertex_program = GL_TRUE; extensions->ARB_vertex_shader = GL_TRUE;