diff options
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/extensions.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/stencil.c | 8 | ||||
| -rw-r--r-- | src/mesa/main/version.c | 4 |
4 files changed, 5 insertions, 14 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 380e47c98ff..0901b2dd63a 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -181,7 +181,7 @@ static const struct extension extension_table[] = { { "GL_EXT_separate_specular_color", o(EXT_separate_specular_color), GL, 1997 }, { "GL_EXT_shadow_funcs", o(EXT_shadow_funcs), GL, 2002 }, { "GL_EXT_stencil_two_side", o(EXT_stencil_two_side), GL, 2001 }, - { "GL_EXT_stencil_wrap", o(EXT_stencil_wrap), GL, 2002 }, + { "GL_EXT_stencil_wrap", o(dummy_true), GL, 2002 }, { "GL_EXT_subtexture", o(dummy_true), GL, 1995 }, { "GL_EXT_texture3D", o(EXT_texture3D), GL, 1996 }, { "GL_EXT_texture_array", o(EXT_texture_array), GL, 2006 }, @@ -246,7 +246,7 @@ static const struct extension extension_table[] = { { "GL_OES_stencil1", o(dummy_false), DISABLE, 2005 }, { "GL_OES_stencil4", o(dummy_false), DISABLE, 2005 }, { "GL_OES_stencil8", o(EXT_framebuffer_object), ES1 | ES2, 2005 }, - { "GL_OES_stencil_wrap", o(EXT_stencil_wrap), ES1, 2002 }, + { "GL_OES_stencil_wrap", o(dummy_true), ES1, 2002 }, { "GL_OES_texture_3D", o(EXT_texture3D), ES2, 2005 }, { "GL_OES_texture_cube_map", o(ARB_texture_cube_map), ES1, 2007 }, { "GL_OES_texture_env_crossbar", o(ARB_texture_env_crossbar), ES1, 2005 }, @@ -469,7 +469,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx) ctx->Extensions.EXT_provoking_vertex = GL_TRUE; ctx->Extensions.EXT_shadow_funcs = GL_TRUE; ctx->Extensions.EXT_secondary_color = GL_TRUE; - ctx->Extensions.EXT_stencil_wrap = GL_TRUE; ctx->Extensions.EXT_stencil_two_side = GL_TRUE; ctx->Extensions.EXT_texture_array = GL_TRUE; ctx->Extensions.EXT_texture_compression_latc = GL_TRUE; @@ -558,7 +557,6 @@ _mesa_enable_1_4_extensions(struct gl_context *ctx) ctx->Extensions.EXT_fog_coord = GL_TRUE; ctx->Extensions.EXT_point_parameters = GL_TRUE; ctx->Extensions.EXT_secondary_color = GL_TRUE; - ctx->Extensions.EXT_stencil_wrap = GL_TRUE; } diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 250d1d29503..91cbaed88fc 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2828,7 +2828,6 @@ struct gl_extensions GLboolean EXT_secondary_color; GLboolean EXT_separate_shader_objects; GLboolean EXT_separate_specular_color; - GLboolean EXT_stencil_wrap; GLboolean EXT_stencil_two_side; GLboolean EXT_texture3D; GLboolean EXT_texture_array; diff --git a/src/mesa/main/stencil.c b/src/mesa/main/stencil.c index d898bf1d749..b6993ff129b 100644 --- a/src/mesa/main/stencil.c +++ b/src/mesa/main/stencil.c @@ -65,13 +65,9 @@ validate_stencil_op(struct gl_context *ctx, GLenum op) case GL_INCR: case GL_DECR: case GL_INVERT: + case GL_INCR_WRAP: + case GL_DECR_WRAP: return GL_TRUE; - case GL_INCR_WRAP_EXT: - case GL_DECR_WRAP_EXT: - if (ctx->Extensions.EXT_stencil_wrap) { - return GL_TRUE; - } - /* FALL-THROUGH */ default: return GL_FALSE; } diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c index 9a771d56289..586bfd9454e 100644 --- a/src/mesa/main/version.c +++ b/src/mesa/main/version.c @@ -101,8 +101,7 @@ compute_version(struct gl_context *ctx) ctx->Extensions.EXT_blend_subtract && ctx->Extensions.EXT_fog_coord && ctx->Extensions.EXT_point_parameters && - ctx->Extensions.EXT_secondary_color && - ctx->Extensions.EXT_stencil_wrap); + ctx->Extensions.EXT_secondary_color); const GLboolean ver_1_5 = (ver_1_4 && ctx->Extensions.ARB_occlusion_query && ctx->Extensions.EXT_shadow_funcs); @@ -278,7 +277,6 @@ compute_version_es2(struct gl_context *ctx) ctx->Extensions.EXT_blend_func_separate && ctx->Extensions.EXT_blend_minmax && ctx->Extensions.EXT_blend_subtract && - ctx->Extensions.EXT_stencil_wrap && ctx->Extensions.ARB_shader_objects && ctx->Extensions.ARB_vertex_shader && ctx->Extensions.ARB_fragment_shader && |