fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 06:20:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: remove struct gl_extensions::ATI_separate_stencil

Browse source 
Virtually every driver that supports ATI_separate_stencil
also supports EXT_stencil_two_side.

Use the latter boolean for both extension. With that in mind we can drop
the explicit true from the drivers and the nasty comment in
compute_version().

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Emil Velikov 2018-04-10 17:11:29 +01:00 • committed by Emil Velikov
parent 1714dfca8a
commit ccaa9f09cc
7 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mesa/drivers/dri/i915/intel_extensions.c
View file

@ -90,7 +90,6 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.EXT_texture_sRGB = true;
ctx->Extensions.EXT_texture_sRGB_decode = true;
ctx->Extensions.EXT_stencil_two_side = true;
ctx->Extensions.ATI_separate_stencil = true;
ctx->Extensions.ATI_texture_env_combine3 = true;
ctx->Extensions.NV_texture_env_combine4 = true;

1
src/mesa/drivers/dri/i965/intel_extensions.c
View file

@ -118,7 +118,6 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.KHR_robustness = true;
ctx->Extensions.AMD_seamless_cubemap_per_texture = true;
ctx->Extensions.APPLE_object_purgeable = true;
ctx->Extensions.ATI_separate_stencil = true;
ctx->Extensions.ATI_texture_env_combine3 = true;
ctx->Extensions.MESA_pack_invert = true;
ctx->Extensions.NV_conditional_render = true;

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

@ -142,7 +142,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
ctx->Extensions.ATI_texture_compression_3dc = GL_TRUE;
ctx->Extensions.ATI_texture_env_combine3 = GL_TRUE;
ctx->Extensions.ATI_texture_mirror_once = GL_TRUE;
ctx->Extensions.ATI_separate_stencil = GL_TRUE;
ctx->Extensions.EXT_blend_color = GL_TRUE;
ctx->Extensions.EXT_blend_equation_separate = GL_TRUE;
ctx->Extensions.EXT_blend_func_separate = GL_TRUE;

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

@ -189,7 +189,7 @@ EXT(ATI_blend_equation_separate , EXT_blend_equation_separate
EXT(ATI_draw_buffers , dummy_true , GLL, x , x , x , 2002)
EXT(ATI_fragment_shader , ATI_fragment_shader , GLL, x , x , x , 2001)
EXT(ATI_meminfo , ATI_meminfo , GLL, GLC, x , x , 2009)
EXT(ATI_separate_stencil , ATI_separate_stencil , GLL, x , x , x , 2006)
EXT(ATI_separate_stencil , EXT_stencil_two_side , GLL, x , x , x , 2006)
EXT(ATI_texture_compression_3dc , ATI_texture_compression_3dc , GLL, x , x , x , 2004)
EXT(ATI_texture_env_combine3 , ATI_texture_env_combine3 , GLL, x , x , x , 2002)
EXT(ATI_texture_float , ARB_texture_float , GLL, GLC, x , x , 2002)

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

@ -4238,7 +4238,6 @@ struct gl_extensions
GLboolean ATI_texture_mirror_once;
GLboolean ATI_texture_env_combine3;
GLboolean ATI_fragment_shader;
GLboolean ATI_separate_stencil;
GLboolean GREMEDY_string_marker;
GLboolean INTEL_conservative_rasterization;
GLboolean INTEL_performance_query;

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

@ -263,15 +263,7 @@ compute_version(const struct gl_extensions *extensions,
extensions->ARB_fragment_shader &&
extensions->ARB_texture_non_power_of_two &&
extensions->EXT_blend_equation_separate &&
/* Technically, 2.0 requires the functionality of the
* EXT version. Enable 2.0 if either extension is
* available, and assume that a driver that only
* exposes the ATI extension will fallback to
* software when necessary.
*/
(extensions->EXT_stencil_two_side
|| extensions->ATI_separate_stencil));
extensions->EXT_stencil_two_side);
const bool ver_2_1 = (ver_2_0 &&
extensions->EXT_pixel_buffer_object &&
extensions->EXT_texture_sRGB);

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

@ -901,7 +901,6 @@ void st_init_extensions(struct pipe_screen *screen,
extensions->EXT_texture_env_dot3 = GL_TRUE;
extensions->ATI_fragment_shader = GL_TRUE;
extensions->ATI_separate_stencil = GL_TRUE;
extensions->ATI_texture_env_combine3 = GL_TRUE;
extensions->MESA_pack_invert = GL_TRUE;