Module: Mesa Branch: marge_bot_batch_merge_job Commit: 8054c4db37c47de61eb320197a2480635679e0b1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8054c4db37c47de61eb320197a2480635679e0b1
Author: Ian Romanick <[email protected]> Date: Tue Dec 14 17:43:04 2021 -0800 mesa: OpenGL 1.4 feature GL_EXT_blend_color is not optional Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14213> --- src/mesa/main/extensions.c | 1 - src/mesa/main/extensions_table.h | 2 +- src/mesa/main/mtypes.h | 1 - src/mesa/main/version.c | 4 +--- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index da43bbe7561..3d8dacc04d4 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -280,7 +280,6 @@ _mesa_init_extensions(struct gl_extensions *extensions) extensions->ARB_vertex_program = GL_TRUE; extensions->ARB_vertex_shader = GL_TRUE; - extensions->EXT_blend_color = GL_TRUE; extensions->EXT_blend_func_separate = GL_TRUE; extensions->EXT_blend_minmax = GL_TRUE; extensions->EXT_EGL_image_storage = GL_TRUE; diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 0f898214e78..461da6cccac 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -213,7 +213,7 @@ EXT(EXT_EGL_sync , dummy_true EXT(EXT_abgr , dummy_true , GLL, GLC, x , x , 1995) EXT(EXT_base_instance , ARB_base_instance , x , x , x , 30, 2014) EXT(EXT_bgra , dummy_true , GLL, x , x , x , 1995) -EXT(EXT_blend_color , EXT_blend_color , GLL, x , x , x , 1995) +EXT(EXT_blend_color , dummy_true , GLL, x , x , x , 1995) EXT(EXT_blend_equation_separate , EXT_blend_equation_separate , GLL, GLC, x , x , 2003) EXT(EXT_blend_func_extended , ARB_blend_func_extended , x , x , x , ES2, 2015) EXT(EXT_blend_func_separate , EXT_blend_func_separate , GLL, x , x , x , 1999) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 1383382585e..1ba8e9bafb5 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -4465,7 +4465,6 @@ struct gl_extensions GLboolean ARB_vertex_type_10f_11f_11f_rev; GLboolean ARB_vertex_type_2_10_10_10_rev; GLboolean ARB_viewport_array; - GLboolean EXT_blend_color; GLboolean EXT_blend_equation_separate; GLboolean EXT_blend_func_separate; GLboolean EXT_blend_minmax; diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 169e1a52f6f..85b6d3be4b9 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->EXT_blend_color && extensions->EXT_blend_func_separate && extensions->EXT_blend_minmax && extensions->EXT_point_parameters); @@ -497,8 +496,7 @@ compute_version_es2(const struct gl_extensions *extensions, const struct gl_constants *consts) { /* OpenGL ES 2.0 is derived from OpenGL 2.0 */ - const bool ver_2_0 = (extensions->EXT_blend_color && - extensions->EXT_blend_func_separate && + const bool ver_2_0 = (extensions->EXT_blend_func_separate && extensions->EXT_blend_minmax && extensions->ARB_vertex_shader && extensions->ARB_fragment_shader &&
