diff options
| author | Marek Olšák <[email protected]> | 2012-10-28 14:24:53 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-10-31 02:04:54 +0100 |
| commit | cc07149276cc9ca310d41493f163978b4faad46b (patch) | |
| tree | 7312928a4f92626d6af30ff05f1d50b2b6de9147 | |
| parent | f5543d6eb29bbd9aadf37055a20992d11f0263e2 (diff) | |
mesa: remove IBM_rasterpos_clip extension enable flag
Reviewed-by: Kenneth Graunke <[email protected]>
Reviewed-by: Ian Romanick <[email protected]>
| -rw-r--r-- | src/mesa/main/enable.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/extensions.c | 3 | ||||
| -rw-r--r-- | src/mesa/main/get.c | 1 | ||||
| -rw-r--r-- | src/mesa/main/get_hash_params.py | 2 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 |
5 files changed, 2 insertions, 7 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index e60a05a9e4a..e704f2f2da2 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -803,7 +803,6 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) case GL_RASTER_POSITION_UNCLIPPED_IBM: if (ctx->API != API_OPENGL) goto invalid_enum_error; - CHECK_EXTENSION(IBM_rasterpos_clip, cap); if (ctx->Transform.RasterPositionUnclipped == state) return; FLUSH_VERTICES(ctx, _NEW_TRANSFORM); @@ -1450,7 +1449,6 @@ _mesa_IsEnabled( GLenum cap ) case GL_RASTER_POSITION_UNCLIPPED_IBM: if (ctx->API != API_OPENGL) goto invalid_enum_error; - CHECK_EXTENSION(IBM_rasterpos_clip); return ctx->Transform.RasterPositionUnclipped; /* GL_NV_point_sprite */ diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 869fb4fe28a..2ce759e4846 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -288,7 +288,7 @@ static const struct extension extension_table[] = { { "GL_ATI_texture_float", o(ARB_texture_float), GL, 2002 }, { "GL_ATI_texture_mirror_once", o(ATI_texture_mirror_once), GL, 2006 }, { "GL_IBM_multimode_draw_arrays", o(dummy_true), GL, 1998 }, - { "GL_IBM_rasterpos_clip", o(IBM_rasterpos_clip), GL, 1996 }, + { "GL_IBM_rasterpos_clip", o(dummy_true), GL, 1996 }, { "GL_IBM_texture_mirrored_repeat", o(dummy_true), GLL, 1998 }, { "GL_INGR_blend_func_separate", o(EXT_blend_func_separate), GLL, 1999 }, { "GL_MESA_pack_invert", o(MESA_pack_invert), GL, 2002 }, @@ -358,7 +358,6 @@ name_to_offset(const char* name) */ static const size_t default_extensions[] = { /* Vendor Extensions */ - o(IBM_rasterpos_clip), o(NV_light_max_exponent), o(NV_texgen_reflection), o(SGIS_texture_lod), diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 7e71d7a4108..bfb25fe2545 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -303,7 +303,6 @@ EXTRA_EXT(EXT_secondary_color); EXTRA_EXT(EXT_fog_coord); EXTRA_EXT(NV_fog_distance); EXTRA_EXT(EXT_texture_filter_anisotropic); -EXTRA_EXT(IBM_rasterpos_clip); EXTRA_EXT(NV_point_sprite); EXTRA_EXT(NV_texture_rectangle); EXTRA_EXT(EXT_stencil_two_side); diff --git a/src/mesa/main/get_hash_params.py b/src/mesa/main/get_hash_params.py index 34c0a87a450..b42fe371d5c 100644 --- a/src/mesa/main/get_hash_params.py +++ b/src/mesa/main/get_hash_params.py @@ -507,7 +507,7 @@ descriptor=[ [ "FOG_DISTANCE_MODE_NV", "CONTEXT_ENUM(Fog.FogDistanceMode), extra_NV_fog_distance" ], # GL_IBM_rasterpos_clip - [ "RASTER_POSITION_UNCLIPPED_IBM", "CONTEXT_BOOL(Transform.RasterPositionUnclipped), extra_IBM_rasterpos_clip" ], + [ "RASTER_POSITION_UNCLIPPED_IBM", "CONTEXT_BOOL(Transform.RasterPositionUnclipped), NO_EXTRA" ], # GL_NV_point_sprite [ "POINT_SPRITE_R_MODE_NV", "CONTEXT_ENUM(Point.SpriteRMode), extra_NV_point_sprite" ], diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 7ce6df0fcd8..365041fcf33 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -3039,7 +3039,6 @@ struct gl_extensions GLboolean ATI_texture_env_combine3; GLboolean ATI_fragment_shader; GLboolean ATI_separate_stencil; - GLboolean IBM_rasterpos_clip; GLboolean MESA_pack_invert; GLboolean MESA_resize_buffers; GLboolean MESA_ycbcr_texture; |