KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: OpenGL 1.4 feature GL_EXT_blend_func_separate is not optional 

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:45:24 -08:00 committed by Marge Bot
parent fbd17ede10
commit d45cb3b440
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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_func_separate;
GLboolean EXT_blend_minmax;
GLboolean EXT_demote_to_helper_invocation;
GLboolean EXT_depth_bounds_test;

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_func_separate = GL_TRUE;
extensions->EXT_blend_minmax = GL_TRUE;
extensions->EXT_EGL_image_storage = GL_TRUE;
extensions->EXT_gpu_program_parameters = GL_TRUE;

6
src/mesa/main/extensions_table.h
View File

@ -217,7 +217,7 @@ EXT(EXT_bgra , dummy_true
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)
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_subtract , dummy_true , GLL, x , x , x , 1995)
EXT(EXT_buffer_storage , ARB_buffer_storage , x , x , x , 31, 2015)
@ -351,7 +351,7 @@ EXT(IBM_multimode_draw_arrays , dummy_true
EXT(IBM_rasterpos_clip , dummy_true , GLL, x , x , x , 1996)
EXT(IBM_texture_mirrored_repeat , dummy_true , GLL, x , x , x , 1998)
EXT(INGR_blend_func_separate , EXT_blend_func_separate , GLL, x , x , x , 1999)
EXT(INGR_blend_func_separate , dummy_true , GLL, x , x , x , 1999)
EXT(INTEL_blackhole_render , INTEL_blackhole_render , 30, 30, x , ES2, 2018)
EXT(INTEL_conservative_rasterization , INTEL_conservative_rasterization , x , GLC, x , 31, 2013)
@ -424,7 +424,7 @@ EXT(OES_EGL_image_external , OES_EGL_image_external
EXT(OES_EGL_image_external_essl3 , OES_EGL_image_external , x , x , x , 30, 2015)
EXT(OES_EGL_sync , dummy_true , x , x , ES1, ES2, 2010)
EXT(OES_blend_equation_separate , EXT_blend_equation_separate , x , x , ES1, x , 2009)
EXT(OES_blend_func_separate , EXT_blend_func_separate , x , x , ES1, x , 2009)
EXT(OES_blend_func_separate , dummy_true , x , x , ES1, x , 2009)
EXT(OES_blend_subtract , dummy_true , x , x , ES1, x , 2009)
EXT(OES_byte_coordinates , dummy_true , x , x , ES1, x , 2002)
EXT(OES_compressed_ETC1_RGB8_texture , OES_compressed_ETC1_RGB8_texture , x , x , ES1, ES2, 2005)

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_func_separate &&
extensions->EXT_blend_minmax &&
extensions->EXT_point_parameters);
const bool ver_1_5 = (ver_1_4 &&
@ -496,8 +495,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_func_separate &&
extensions->EXT_blend_minmax &&
const bool ver_2_0 = (extensions->EXT_blend_minmax &&
extensions->ARB_vertex_shader &&
extensions->ARB_fragment_shader &&
extensions->ARB_texture_non_power_of_two &&