fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-24 03:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: OpenGL 1.4 feature GL_EXT_blend_minmax is not optional

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14213>
This commit is contained in:
Ian Romanick 2021-12-14 17:47:55 -08:00 • committed by Marge Bot
parent d45cb3b440
commit 577b438f98
5 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/main/blend.c
View file

@ -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;
}

1
src/mesa/main/consts_exts.h
View file

@ -162,7 +162,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;

1
src/mesa/main/extensions.c
View file

@ -281,7 +281,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;

2
src/mesa/main/extensions_table.h
View file

@ -218,7 +218,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)

4
src/mesa/main/version.c
View file

@ -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);