Mesa (marge_bot_batch_merge_job): mesa: OpenGL 1.4 feature GL_EXT_blend_minmax is not optional

[GitLab Mirror]

Module: Mesa
Branch: marge_bot_batch_merge_job
Commit: 7c7277151a3bb60bec7c92e6835b9e6a79cea6be
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7c7277151a3bb60bec7c92e6835b9e6a79cea6be

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Tue Dec 14 17:47:55 2021 -0800

mesa: OpenGL 1.4 feature GL_EXT_blend_minmax 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/blend.c            | 3 +--
 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 +---
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index 0bc21a42ccc..0615071708c 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -447,10 +447,9 @@ legal_simple_blend_equation(const struct gl_context *ctx, GLenum mode)
    case GL_FUNC_ADD:
    case GL_FUNC_SUBTRACT:
    case GL_FUNC_REVERSE_SUBTRACT:
-      return GL_TRUE;
    case GL_MIN:
    case GL_MAX:
-      return ctx->Extensions.EXT_blend_minmax;
+      return GL_TRUE;
    default:
       return GL_FALSE;
    }
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index b35c2f2ad37..2ef5e24c599 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_minmax = GL_TRUE;
    extensions->EXT_EGL_image_storage = GL_TRUE;
    extensions->EXT_gpu_program_parameters = GL_TRUE;
    extensions->EXT_pixel_buffer_object = GL_TRUE;
diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h
index 9476cb1d676..705a9a6f6f9 100644
--- a/src/mesa/main/extensions_table.h
+++ b/src/mesa/main/extensions_table.h
@@ -217,7 +217,7 @@ EXT(EXT_blend_color                         , dummy_true
 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                 , dummy_true                             , GLL,  x ,  x ,  x , 1999)
-EXT(EXT_blend_minmax                        , EXT_blend_minmax                       , GLL,  x , ES1, ES2, 1995)
+EXT(EXT_blend_minmax                        , dummy_true                             , GLL,  x , ES1, ES2, 1995)
 EXT(EXT_blend_subtract                      , dummy_true                             , GLL,  x ,  x ,  x , 1995)
 EXT(EXT_buffer_storage                      , ARB_buffer_storage                     ,  x ,  x ,  x ,  31, 2015)
 EXT(EXT_clear_texture                       , ARB_clear_texture                      ,  x ,  x ,  x ,  31, 2016)
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 0dbd189372c..6f6df54a5d2 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -4466,7 +4466,6 @@ struct gl_extensions
    GLboolean ARB_vertex_type_2_10_10_10_rev;
    GLboolean ARB_viewport_array;
    GLboolean EXT_blend_equation_separate;
-   GLboolean EXT_blend_minmax;
    GLboolean EXT_demote_to_helper_invocation;
    GLboolean EXT_depth_bounds_test;
    GLboolean EXT_disjoint_timer_query;
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 30040a7d6ae..235f47f7db2 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_minmax &&
                          extensions->EXT_point_parameters);
    const bool ver_1_5 = (ver_1_4 &&
                          extensions->ARB_occlusion_query);
@@ -495,8 +494,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_minmax &&
-                         extensions->ARB_vertex_shader &&
+   const bool ver_2_0 = (extensions->ARB_vertex_shader &&
                          extensions->ARB_fragment_shader &&
                          extensions->ARB_texture_non_power_of_two &&
                          extensions->EXT_blend_equation_separate);