Mesa (marge_bot_batch_merge_job): mesa: OpenGL 1.4 feature GL_ARB_texture_env_crossbar is not optional
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Jan 7 09:21:47 UTC 2022
Module: Mesa
Branch: marge_bot_batch_merge_job
Commit: b9699cd250231fc2349c2472a087ab31a8875423
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9699cd250231fc2349c2472a087ab31a8875423
Author: Ian Romanick <ian.d.romanick at intel.com>
Date: Tue Dec 14 17:41:31 2021 -0800
mesa: OpenGL 1.4 feature GL_ARB_texture_env_crossbar is not optional
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14213>
---
src/mesa/main/extensions.c | 1 -
src/mesa/main/extensions_table.h | 4 ++--
src/mesa/main/mtypes.h | 1 -
src/mesa/main/texenv.c | 3 +--
src/mesa/main/version.c | 1 -
5 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 4ead8e511b4..da43bbe7561 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -277,7 +277,6 @@ _mesa_init_extensions(struct gl_extensions *extensions)
extensions->ARB_internalformat_query2 = GL_TRUE;
extensions->ARB_map_buffer_range = GL_TRUE;
extensions->ARB_sync = GL_TRUE;
- extensions->ARB_texture_env_crossbar = GL_TRUE;
extensions->ARB_vertex_program = GL_TRUE;
extensions->ARB_vertex_shader = GL_TRUE;
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index 4a8d28889e8..0f898214e78 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -159,7 +159,7 @@ EXT(ARB_texture_cube_map , dummy_true
EXT(ARB_texture_cube_map_array , ARB_texture_cube_map_array , GLL, GLC, x , x , 2009)
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_crossbar , dummy_true , 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)
@@ -470,7 +470,7 @@ EXT(OES_texture_buffer , OES_texture_buffer
EXT(OES_texture_compression_astc , OES_texture_compression_astc , x , x , ES1, ES2, 2015)
EXT(OES_texture_cube_map , dummy_true , x , x , ES1, x , 2007)
EXT(OES_texture_cube_map_array , OES_texture_cube_map_array , x , x , x , 31, 2014)
-EXT(OES_texture_env_crossbar , ARB_texture_env_crossbar , x , x , ES1, x , 2005)
+EXT(OES_texture_env_crossbar , dummy_true , x , x , ES1, x , 2005)
EXT(OES_texture_float , OES_texture_float , x , x , x , ES2, 2005)
EXT(OES_texture_float_linear , OES_texture_float_linear , x , x , x , ES2, 2005)
EXT(OES_texture_half_float , OES_texture_half_float , x , x , x , ES2, 2005)
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 662be2c6cc8..1383382585e 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -4440,7 +4440,6 @@ struct gl_extensions
GLboolean ARB_texture_compression_bptc;
GLboolean ARB_texture_compression_rgtc;
GLboolean ARB_texture_cube_map_array;
- GLboolean ARB_texture_env_crossbar;
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 f3e6acd3412..f6401dd8dcc 100644
--- a/src/mesa/main/texenv.c
+++ b/src/mesa/main/texenv.c
@@ -228,8 +228,7 @@ set_combiner_source(struct gl_context *ctx,
case GL_TEXTURE5:
case GL_TEXTURE6:
case GL_TEXTURE7:
- legal = (ctx->Extensions.ARB_texture_env_crossbar &&
- param - GL_TEXTURE0 < ctx->Const.MaxTextureUnits);
+ legal = (param - GL_TEXTURE0 < ctx->Const.MaxTextureUnits);
break;
case GL_ZERO:
legal = (ctx->API == API_OPENGL_COMPAT &&
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 90eb377b461..169e1a52f6f 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -252,7 +252,6 @@ compute_version(const struct gl_extensions *extensions,
GLuint major, minor, version;
const bool ver_1_4 = (extensions->ARB_shadow &&
- extensions->ARB_texture_env_crossbar &&
extensions->EXT_blend_color &&
extensions->EXT_blend_func_separate &&
extensions->EXT_blend_minmax &&
More information about the mesa-commit
mailing list