From 553a8e0e7b0e8ec2f208a582c6e644cd340dba53 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Mon, 12 Jan 2004 22:50:01 +0000 Subject: [PATCH] Removed redundant extension strings. The Mesa extension mechanism automatically enables "duplicate" extensions without the driver explicitly enabling them. --- src/mesa/drivers/dri/i810/i810context.c | 3 --- src/mesa/drivers/dri/i830/i830_context.c | 7 +------ src/mesa/drivers/dri/mga/mga_xmesa.c | 8 +++----- src/mesa/drivers/dri/r128/r128_context.c | 3 --- src/mesa/drivers/dri/r200/r200_context.c | 6 +----- src/mesa/drivers/dri/radeon/radeon_context.c | 4 ---- 6 files changed, 5 insertions(+), 26 deletions(-) diff --git a/src/mesa/drivers/dri/i810/i810context.c b/src/mesa/drivers/dri/i810/i810context.c index f8fcc1f1f38..9ca262b4b28 100644 --- a/src/mesa/drivers/dri/i810/i810context.c +++ b/src/mesa/drivers/dri/i810/i810context.c @@ -101,12 +101,9 @@ static const char * const card_extensions[] = "GL_ARB_texture_mirrored_repeat", "GL_EXT_stencil_wrap", "GL_EXT_texture_edge_clamp", - "GL_EXT_texture_env_add", "GL_EXT_texture_lod_bias", - "GL_IBM_texture_mirrored_repeat", "GL_MESA_ycbcr_texture", "GL_SGIS_generate_mipmap", - "GL_SGIS_texture_edge_clamp", NULL }; diff --git a/src/mesa/drivers/dri/i830/i830_context.c b/src/mesa/drivers/dri/i830/i830_context.c index 376a260c0ff..7b68d6561f1 100644 --- a/src/mesa/drivers/dri/i830/i830_context.c +++ b/src/mesa/drivers/dri/i830/i830_context.c @@ -155,18 +155,13 @@ static const char * const card_extensions[] = "GL_EXT_secondary_color", "GL_EXT_stencil_wrap", "GL_EXT_texture_edge_clamp", - "GL_EXT_texture_env_add", "GL_EXT_texture_env_combine", "GL_EXT_texture_env_dot3", "GL_EXT_texture_filter_anisotropic", "GL_EXT_texture_lod_bias", - "GL_IBM_texture_mirrored_repeat", - "GL_INGR_blend_func_separate", + "GL_EXT_texture_rectangle", "GL_MESA_ycbcr_texture", - "GL_NV_texture_rectangle", "GL_SGIS_generate_mipmap", - "GL_SGIS_texture_border_clamp", - "GL_SGIS_texture_edge_clamp", NULL }; diff --git a/src/mesa/drivers/dri/mga/mga_xmesa.c b/src/mesa/drivers/dri/mga/mga_xmesa.c index 7f199ea5c41..52145e62e87 100644 --- a/src/mesa/drivers/dri/mga/mga_xmesa.c +++ b/src/mesa/drivers/dri/mga/mga_xmesa.c @@ -289,13 +289,11 @@ static const char * const g400_extensions[] = { "GL_ARB_multitexture", "GL_ARB_texture_env_add", - "GL_EXT_texture_env_add", "GL_ARB_texture_env_combine", - "GL_EXT_texture_env_combine", "GL_ARB_texture_env_crossbar", - "GL_ATI_texture_env_combine3", + "GL_EXT_texture_env_combine", "GL_EXT_texture_edge_clamp", - "GL_SGIS_texture_edge_clamp", + "GL_ATI_texture_env_combine3", #if defined (MESA_packed_depth_stencil) "GL_MESA_packed_depth_stencil", #endif @@ -315,10 +313,10 @@ static const char * const card_extensions[] = #endif "GL_EXT_secondary_color", "GL_EXT_stencil_wrap", + "GL_EXT_texture_rectangle", "GL_MESA_ycbcr_texture", "GL_SGIS_generate_mipmap", "GL_SGIS_texture_lod", - "GL_NV_texture_rectangle", NULL }; diff --git a/src/mesa/drivers/dri/r128/r128_context.c b/src/mesa/drivers/dri/r128/r128_context.c index 73547aa67f7..9c453183310 100644 --- a/src/mesa/drivers/dri/r128/r128_context.c +++ b/src/mesa/drivers/dri/r128/r128_context.c @@ -71,10 +71,7 @@ static const char * const card_extensions[] = "GL_ARB_texture_env_add", "GL_ARB_texture_mirrored_repeat", "GL_EXT_texture_edge_clamp", - "GL_EXT_texture_env_add", - "GL_IBM_texture_mirrored_repeat", "GL_SGIS_generate_mipmap", - "GL_SGIS_texture_edge_clamp", NULL }; diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c index 59e32b2ba8b..a220e59a55f 100644 --- a/src/mesa/drivers/dri/r200/r200_context.c +++ b/src/mesa/drivers/dri/r200/r200_context.c @@ -132,21 +132,17 @@ static const char * const card_extensions[] = "GL_EXT_secondary_color", "GL_EXT_stencil_wrap", "GL_EXT_texture_edge_clamp", - "GL_EXT_texture_env_add", "GL_EXT_texture_env_combine", "GL_EXT_texture_env_dot3", "GL_EXT_texture_filter_anisotropic", "GL_EXT_texture_lod_bias", + "GL_EXT_texture_rectangle", "GL_ATI_texture_env_combine3", "GL_ATI_texture_mirror_once", - "GL_IBM_texture_mirrored_repeat", "GL_MESA_pack_invert", "GL_MESA_ycbcr_texture", "GL_NV_blend_square", - "GL_NV_texture_rectangle", "GL_SGIS_generate_mipmap", - "GL_SGIS_texture_border_clamp", - "GL_SGIS_texture_edge_clamp", NULL }; diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index 3a9721540be..e23b85f1e3d 100644 --- a/src/mesa/drivers/dri/radeon/radeon_context.c +++ b/src/mesa/drivers/dri/radeon/radeon_context.c @@ -130,19 +130,15 @@ static const char * const card_extensions[] = "GL_EXT_blend_subtract", "GL_EXT_secondary_color", "GL_EXT_texture_edge_clamp", - "GL_EXT_texture_env_add", "GL_EXT_texture_env_combine", "GL_EXT_texture_env_dot3", "GL_EXT_texture_filter_anisotropic", "GL_EXT_texture_lod_bias", "GL_ATI_texture_env_combine3", "GL_ATI_texture_mirror_once", - "GL_IBM_texture_mirrored_repeat", "GL_MESA_ycbcr_texture", "GL_NV_blend_square", "GL_SGIS_generate_mipmap", - "GL_SGIS_texture_border_clamp", - "GL_SGIS_texture_edge_clamp", NULL }; -- 2.30.2