diff options
| author | Emil Velikov <[email protected]> | 2018-04-10 17:11:29 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2018-06-21 12:09:39 +0100 |
| commit | ccaa9f09cc573f0d9190fa7cdfd66ef066763710 (patch) | |
| tree | 99a6c2c4a6cd54edafd066a4045add5e8217dd56 /src/mesa/main | |
| parent | 1714dfca8abdae7d6233ddb3b2c852977b20bc42 (diff) | |
mesa: remove struct gl_extensions::ATI_separate_stencil
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 <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/extensions.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/extensions_table.h | 2 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/version.c | 10 |
4 files changed, 2 insertions, 12 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 5c8bd7a8741..25c3161f7d0 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -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; diff --git a/src/mesa/main/extensions_table.h b/src/mesa/main/extensions_table.h index 1c55df8a228..7af48a4ad91 100644 --- a/src/mesa/main/extensions_table.h +++ b/src/mesa/main/extensions_table.h @@ -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) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 220751ba7bb..19c673eb1dc 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -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; diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 1bdccf4a1df..42f58ba175b 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -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); |