OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Remove EXT_blend_subtract extension enable flag

Browse Source 
All drivers remaining in Mesa support this extension.  This extension
is either required or optional features in desktop OpenGL, OpenGL ES
1.x, and OpenGL ES 2.x.

This extension was previously not supported on i810, mach64, mga,
savage, sis, and tdfx (Voodoo Banshee and Voodoo3).

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Ian Romanick
2011-08-30 17:55:26 -07:00
parent 1d5e49bf05
commit b0824bd860
13 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/drivers/dri/intel/intel_extensions.c
View File

@@ -64,7 +64,6 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.EXT_blend_equation_separate = true; ctx->Extensions.EXT_blend_equation_separate = true;
ctx->Extensions.EXT_blend_func_separate = true; ctx->Extensions.EXT_blend_func_separate = true;
ctx->Extensions.EXT_blend_minmax = true; ctx->Extensions.EXT_blend_minmax = true;
ctx->Extensions.EXT_blend_subtract = true;
ctx->Extensions.EXT_framebuffer_blit = true; ctx->Extensions.EXT_framebuffer_blit = true;
ctx->Extensions.EXT_framebuffer_object = true; ctx->Extensions.EXT_framebuffer_object = true;
ctx->Extensions.EXT_framebuffer_multisample = true; ctx->Extensions.EXT_framebuffer_multisample = true;

1
src/mesa/drivers/dri/intel/intel_extensions_es.c
View File

@@ -89,7 +89,6 @@ static const char *es2_extensions[] = {
"GL_EXT_blend_color", "GL_EXT_blend_color",
"GL_EXT_blend_equation_separate", "GL_EXT_blend_equation_separate",
"GL_EXT_blend_minmax", "GL_EXT_blend_minmax",
"GL_EXT_blend_subtract",
"GL_NV_blend_square", "GL_NV_blend_square",
/* Optional GLES2 */ /* Optional GLES2 */

1
src/mesa/drivers/dri/nouveau/nouveau_context.c
View File

@@ -120,7 +120,6 @@ nouveau_context_init(struct gl_context *ctx, struct nouveau_screen *screen,
ctx->Extensions.ARB_texture_mirrored_repeat = true; ctx->Extensions.ARB_texture_mirrored_repeat = true;
ctx->Extensions.EXT_blend_color = true; ctx->Extensions.EXT_blend_color = true;
ctx->Extensions.EXT_blend_minmax = true; ctx->Extensions.EXT_blend_minmax = true;
ctx->Extensions.EXT_blend_subtract = true;
ctx->Extensions.EXT_fog_coord = true; ctx->Extensions.EXT_fog_coord = true;
ctx->Extensions.EXT_framebuffer_blit = true; ctx->Extensions.EXT_framebuffer_blit = true;
ctx->Extensions.EXT_framebuffer_object = true; ctx->Extensions.EXT_framebuffer_object = true;

1
src/mesa/drivers/dri/r200/r200_context.c
View File

@@ -365,7 +365,6 @@ GLboolean r200CreateContext( gl_api api,
ctx->Extensions.EXT_blend_color = ctx->Extensions.EXT_blend_color =
rmesa->radeon.radeonScreen->drmSupportsBlendColor; rmesa->radeon.radeonScreen->drmSupportsBlendColor;
ctx->Extensions.EXT_blend_minmax = true; ctx->Extensions.EXT_blend_minmax = true;
ctx->Extensions.EXT_blend_subtract = true;
ctx->Extensions.EXT_fog_coord = true; ctx->Extensions.EXT_fog_coord = true;
ctx->Extensions.EXT_packed_depth_stencil = true; ctx->Extensions.EXT_packed_depth_stencil = true;
ctx->Extensions.EXT_secondary_color = true; ctx->Extensions.EXT_secondary_color = true;

1
src/mesa/drivers/dri/r300/r300_context.c
View File

@@ -378,7 +378,6 @@ static void r300InitGLExtensions(struct gl_context *ctx)
ctx->Extensions.EXT_blend_equation_separate = true; ctx->Extensions.EXT_blend_equation_separate = true;
ctx->Extensions.EXT_blend_func_separate = true; ctx->Extensions.EXT_blend_func_separate = true;
ctx->Extensions.EXT_blend_minmax = true; ctx->Extensions.EXT_blend_minmax = true;
ctx->Extensions.EXT_blend_subtract = true;
ctx->Extensions.EXT_fog_coord = true; ctx->Extensions.EXT_fog_coord = true;
ctx->Extensions.EXT_gpu_program_parameters = true; ctx->Extensions.EXT_gpu_program_parameters = true;
ctx->Extensions.EXT_point_parameters = true; ctx->Extensions.EXT_point_parameters = true;

1
src/mesa/drivers/dri/r600/r600_context.c
View File

@@ -276,7 +276,6 @@ static void r600InitGLExtensions(struct gl_context *ctx)
ctx->Extensions.EXT_blend_equation_separate = true; ctx->Extensions.EXT_blend_equation_separate = true;
ctx->Extensions.EXT_blend_func_separate = true; ctx->Extensions.EXT_blend_func_separate = true;
ctx->Extensions.EXT_blend_minmax = true; ctx->Extensions.EXT_blend_minmax = true;
ctx->Extensions.EXT_blend_subtract = true;
ctx->Extensions.EXT_packed_depth_stencil = true; ctx->Extensions.EXT_packed_depth_stencil = true;
ctx->Extensions.EXT_fog_coord = true; ctx->Extensions.EXT_fog_coord = true;
ctx->Extensions.EXT_gpu_program_parameters = true; ctx->Extensions.EXT_gpu_program_parameters = true;

1
src/mesa/drivers/dri/radeon/radeon_context.c
View File

@@ -318,7 +318,6 @@ r100CreateContext( gl_api api,
ctx->Extensions.ARB_texture_env_crossbar = true; ctx->Extensions.ARB_texture_env_crossbar = true;
ctx->Extensions.ARB_texture_env_dot3 = true; ctx->Extensions.ARB_texture_env_dot3 = true;
ctx->Extensions.ARB_texture_mirrored_repeat = true; ctx->Extensions.ARB_texture_mirrored_repeat = true;
ctx->Extensions.EXT_blend_subtract = true;
ctx->Extensions.EXT_fog_coord = true; ctx->Extensions.EXT_fog_coord = true;
ctx->Extensions.EXT_packed_depth_stencil = true; ctx->Extensions.EXT_packed_depth_stencil = true;
ctx->Extensions.EXT_secondary_color = true; ctx->Extensions.EXT_secondary_color = true;

1
src/mesa/drivers/dri/swrast/swrast.c
View File

@@ -598,7 +598,6 @@ static const char *es2_extensions[] = {
"GL_EXT_blend_color", "GL_EXT_blend_color",
"GL_EXT_blend_equation_separate", "GL_EXT_blend_equation_separate",
"GL_EXT_blend_minmax", "GL_EXT_blend_minmax",
"GL_EXT_blend_subtract",
/* Optional GLES2 */ /* Optional GLES2 */
"GL_ARB_framebuffer_object", "GL_ARB_framebuffer_object",

5
src/mesa/main/blend.c
View File

@@ -289,13 +289,12 @@ legal_blend_equation(const struct gl_context *ctx, GLenum mode)
{ {
switch (mode) { switch (mode) {
case GL_FUNC_ADD: case GL_FUNC_ADD:
case GL_FUNC_SUBTRACT:
case GL_FUNC_REVERSE_SUBTRACT:
return GL_TRUE; return GL_TRUE;
case GL_MIN: case GL_MIN:
case GL_MAX: case GL_MAX:
return ctx->Extensions.EXT_blend_minmax; return ctx->Extensions.EXT_blend_minmax;
case GL_FUNC_SUBTRACT:
case GL_FUNC_REVERSE_SUBTRACT:
return ctx->Extensions.EXT_blend_subtract;
default: default:
return GL_FALSE; return GL_FALSE;
} }

6
src/mesa/main/extensions.c
View File

@@ -152,7 +152,7 @@ static const struct extension extension_table[] = {
{ "GL_EXT_blend_equation_separate", o(EXT_blend_equation_separate), GL, 2003 }, { "GL_EXT_blend_equation_separate", o(EXT_blend_equation_separate), GL, 2003 },
{ "GL_EXT_blend_func_separate", o(EXT_blend_func_separate), GL, 1999 }, { "GL_EXT_blend_func_separate", o(EXT_blend_func_separate), GL, 1999 },
{ "GL_EXT_blend_minmax", o(EXT_blend_minmax), GL | ES1 | ES2, 1995 }, { "GL_EXT_blend_minmax", o(EXT_blend_minmax), GL | ES1 | ES2, 1995 },
{ "GL_EXT_blend_subtract", o(EXT_blend_subtract), GL, 1995 }, { "GL_EXT_blend_subtract", o(dummy_true), GL, 1995 },
{ "GL_EXT_clip_volume_hint", o(EXT_clip_volume_hint), GL, 1996 }, { "GL_EXT_clip_volume_hint", o(EXT_clip_volume_hint), GL, 1996 },
{ "GL_EXT_compiled_vertex_array", o(EXT_compiled_vertex_array), GL, 1996 }, { "GL_EXT_compiled_vertex_array", o(EXT_compiled_vertex_array), GL, 1996 },
{ "GL_EXT_copy_texture", o(dummy_true), GL, 1995 }, { "GL_EXT_copy_texture", o(dummy_true), GL, 1995 },
@@ -216,7 +216,7 @@ static const struct extension extension_table[] = {
/* OES extensions */ /* OES extensions */
{ "GL_OES_blend_equation_separate", o(EXT_blend_equation_separate), ES1, 2009 }, { "GL_OES_blend_equation_separate", o(EXT_blend_equation_separate), ES1, 2009 },
{ "GL_OES_blend_func_separate", o(EXT_blend_func_separate), ES1, 2009 }, { "GL_OES_blend_func_separate", o(EXT_blend_func_separate), ES1, 2009 },
{ "GL_OES_blend_subtract", o(EXT_blend_subtract), ES1, 2009 }, { "GL_OES_blend_subtract", o(dummy_true), ES1, 2009 },
{ "GL_OES_byte_coordinates", o(dummy_true), ES1, 2002 }, { "GL_OES_byte_coordinates", o(dummy_true), ES1, 2002 },
{ "GL_OES_compressed_paletted_texture", o(dummy_true), ES1, 2003 }, { "GL_OES_compressed_paletted_texture", o(dummy_true), ES1, 2003 },
{ "GL_OES_depth24", o(EXT_framebuffer_object), ES1 | ES2, 2005 }, { "GL_OES_depth24", o(EXT_framebuffer_object), ES1 | ES2, 2005 },
@@ -448,7 +448,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
ctx->Extensions.EXT_blend_equation_separate = GL_TRUE; ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
ctx->Extensions.EXT_blend_func_separate = GL_TRUE; ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
ctx->Extensions.EXT_blend_minmax = GL_TRUE; ctx->Extensions.EXT_blend_minmax = GL_TRUE;
ctx->Extensions.EXT_blend_subtract = GL_TRUE;
ctx->Extensions.EXT_depth_bounds_test = GL_TRUE; ctx->Extensions.EXT_depth_bounds_test = GL_TRUE;
ctx->Extensions.EXT_draw_buffers2 = GL_TRUE; ctx->Extensions.EXT_draw_buffers2 = GL_TRUE;
ctx->Extensions.EXT_fog_coord = GL_TRUE; ctx->Extensions.EXT_fog_coord = GL_TRUE;
@@ -553,7 +552,6 @@ _mesa_enable_1_4_extensions(struct gl_context *ctx)
ctx->Extensions.EXT_blend_color = GL_TRUE; ctx->Extensions.EXT_blend_color = GL_TRUE;
ctx->Extensions.EXT_blend_func_separate = GL_TRUE; ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
ctx->Extensions.EXT_blend_minmax = GL_TRUE; ctx->Extensions.EXT_blend_minmax = GL_TRUE;
ctx->Extensions.EXT_blend_subtract = GL_TRUE;
ctx->Extensions.EXT_fog_coord = GL_TRUE; ctx->Extensions.EXT_fog_coord = GL_TRUE;
ctx->Extensions.EXT_point_parameters = GL_TRUE; ctx->Extensions.EXT_point_parameters = GL_TRUE;
ctx->Extensions.EXT_secondary_color = GL_TRUE; ctx->Extensions.EXT_secondary_color = GL_TRUE;

1
src/mesa/main/mtypes.h
View File

@@ -2804,7 +2804,6 @@ struct gl_extensions
GLboolean EXT_blend_equation_separate; GLboolean EXT_blend_equation_separate;
GLboolean EXT_blend_func_separate; GLboolean EXT_blend_func_separate;
GLboolean EXT_blend_minmax; GLboolean EXT_blend_minmax;
GLboolean EXT_blend_subtract;
GLboolean EXT_clip_volume_hint; GLboolean EXT_clip_volume_hint;
GLboolean EXT_compiled_vertex_array; GLboolean EXT_compiled_vertex_array;
GLboolean EXT_depth_bounds_test; GLboolean EXT_depth_bounds_test;

2
src/mesa/main/version.c
View File

@@ -98,7 +98,6 @@ compute_version(struct gl_context *ctx)
ctx->Extensions.EXT_blend_color && ctx->Extensions.EXT_blend_color &&
ctx->Extensions.EXT_blend_func_separate && ctx->Extensions.EXT_blend_func_separate &&
ctx->Extensions.EXT_blend_minmax && ctx->Extensions.EXT_blend_minmax &&
ctx->Extensions.EXT_blend_subtract &&
ctx->Extensions.EXT_fog_coord && ctx->Extensions.EXT_fog_coord &&
ctx->Extensions.EXT_point_parameters && ctx->Extensions.EXT_point_parameters &&
ctx->Extensions.EXT_secondary_color); ctx->Extensions.EXT_secondary_color);
@@ -276,7 +275,6 @@ compute_version_es2(struct gl_context *ctx)
ctx->Extensions.EXT_blend_color && ctx->Extensions.EXT_blend_color &&
ctx->Extensions.EXT_blend_func_separate && ctx->Extensions.EXT_blend_func_separate &&
ctx->Extensions.EXT_blend_minmax && ctx->Extensions.EXT_blend_minmax &&
ctx->Extensions.EXT_blend_subtract &&
ctx->Extensions.ARB_shader_objects && ctx->Extensions.ARB_shader_objects &&
ctx->Extensions.ARB_vertex_shader && ctx->Extensions.ARB_vertex_shader &&
ctx->Extensions.ARB_fragment_shader && ctx->Extensions.ARB_fragment_shader &&

1
src/mesa/state_tracker/st_extensions.c
View File

@@ -267,7 +267,6 @@ void st_init_extensions(struct st_context *st)
ctx->Extensions.EXT_blend_color = GL_TRUE; ctx->Extensions.EXT_blend_color = GL_TRUE;
ctx->Extensions.EXT_blend_func_separate = GL_TRUE; ctx->Extensions.EXT_blend_func_separate = GL_TRUE;
ctx->Extensions.EXT_blend_minmax = GL_TRUE; ctx->Extensions.EXT_blend_minmax = GL_TRUE;
ctx->Extensions.EXT_blend_subtract = GL_TRUE;
ctx->Extensions.EXT_framebuffer_blit = GL_TRUE; ctx->Extensions.EXT_framebuffer_blit = GL_TRUE;
ctx->Extensions.EXT_framebuffer_object = GL_TRUE; ctx->Extensions.EXT_framebuffer_object = GL_TRUE;
ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE; ctx->Extensions.EXT_framebuffer_multisample = GL_TRUE;