Fix bugs with glGet/glIsEnabled and enums which are defined by more than one extension, if not all of these extensions are enabled. Add forgotten GL_COLOR_SUM_EXT to MesaIsEnabled.

4 files changed, 783 insertions, 712 deletions

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 67fd083ca82..bc2eb74537a 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -790,7 +790,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
 
       /* GL_EXT_secondary_color */
       case GL_COLOR_SUM_EXT:
-         CHECK_EXTENSION(EXT_secondary_color, cap);
+         CHECK_EXTENSION2(EXT_secondary_color, ARB_vertex_program, cap);
          if (ctx->Fog.ColorSumEnabled == state)
             return;
          FLUSH_VERTICES(ctx, _NEW_FOG);
@@ -852,7 +852,7 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
          ctx->Point.PointSprite = state;
          break;
 
-#if FEATURE_NV_vertex_program
+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
       case GL_VERTEX_PROGRAM_NV:
          CHECK_EXTENSION2(NV_vertex_program, ARB_vertex_program, cap);
          if (ctx->VertexProgram.Enabled == state)
@@ -874,6 +874,8 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state )
          FLUSH_VERTICES(ctx, _NEW_PROGRAM); 
          ctx->VertexProgram.TwoSideEnabled = state;
          break;
+#endif
+#if FEATURE_NV_vertex_program
       case GL_MAP1_VERTEX_ATTRIB0_4_NV:
       case GL_MAP1_VERTEX_ATTRIB1_4_NV:
       case GL_MAP1_VERTEX_ATTRIB2_4_NV:
@@ -1066,6 +1068,12 @@ _mesa_Disable( GLenum cap )
       return GL_FALSE;					\
    }
 
+#undef CHECK_EXTENSION2
+#define CHECK_EXTENSION2(EXT1, EXT2)				\
+   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) {	\
+      _mesa_error(ctx, GL_INVALID_ENUM, "glIsEnabled");		\
+      return GL_FALSE;						\
+   }
 
 /**
  * Test whether a capability is enabled.
@@ -1306,6 +1314,11 @@ _mesa_IsEnabled( GLenum cap )
             return (texUnit->Enabled & TEXTURE_CUBE_BIT) ? GL_TRUE : GL_FALSE;
          }
 
+      /* GL_EXT_secondary_color */
+      case GL_COLOR_SUM_EXT:
+         CHECK_EXTENSION2(EXT_secondary_color, ARB_vertex_program);
+         return ctx->Fog.ColorSumEnabled;
+
       /* GL_ARB_multisample */
       case GL_MULTISAMPLE_ARB:
          CHECK_EXTENSION(ARB_multisample);
@@ -1330,18 +1343,21 @@ _mesa_IsEnabled( GLenum cap )
 
       /* GL_NV_point_sprite */
       case GL_POINT_SPRITE_NV:
+         CHECK_EXTENSION2(NV_point_sprite, ARB_point_sprite)
          return ctx->Point.PointSprite;
 
-#if FEATURE_NV_vertex_program
-      case GL_VERTEX_PROGRAM_NV:
-         CHECK_EXTENSION(NV_vertex_program);
+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
+      case GL_VERTEX_PROGRAM_ARB:
+         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program);
          return ctx->VertexProgram.Enabled;
-      case GL_VERTEX_PROGRAM_POINT_SIZE_NV:
-         CHECK_EXTENSION(NV_vertex_program);
+      case GL_VERTEX_PROGRAM_POINT_SIZE_ARB:
+         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program);
          return ctx->VertexProgram.PointSizeEnabled;
-      case GL_VERTEX_PROGRAM_TWO_SIDE_NV:
-         CHECK_EXTENSION(NV_vertex_program);
+      case GL_VERTEX_PROGRAM_TWO_SIDE_ARB:
+         CHECK_EXTENSION2(ARB_vertex_program, NV_vertex_program);
          return ctx->VertexProgram.TwoSideEnabled;
+#endif
+#if FEATURE_NV_vertex_program
       case GL_VERTEX_ATTRIB_ARRAY0_NV:
       case GL_VERTEX_ATTRIB_ARRAY1_NV:
       case GL_VERTEX_ATTRIB_ARRAY2_NV:
diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 26296378c46..0aa5813060b 100644
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -27,30 +27,43 @@
 #define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )
 
 
-/* Check if named extension is enabled, if not generate error and return */
-
-#define CHECK1(E1, str, PNAME)                         \
-   if (!ctx->Extensions.E1) {                          \
-      _mesa_error(ctx, GL_INVALID_ENUM,                \
-                  "glGet" str "v(0x%x)", (int) PNAME); \
-      return;                                          \
+/*
+ * Check if named extension is enabled, if not generate error and return.
+ */
+#define CHECK_EXT1(EXT1, FUNC)                                         \
+   if (!ctx->Extensions.EXT1) {                                        \
+      _mesa_error(ctx, GL_INVALID_ENUM, FUNC "(0x%x)", (int) pname);  \
+      return;                                                          \
    }
-    
-#define CHECK2(E1, E2, str, PNAME)                     \
-   if (!ctx->Extensions.E1 && !ctx->Extensions.E2) {   \
-      _mesa_error(ctx, GL_INVALID_ENUM,                \
-                  "glGet" str "v(0x%x)", (int) PNAME); \
-      return;                                          \
+
+/*
+ * Check if either of two extensions is enabled.
+ */
+#define CHECK_EXT2(EXT1, EXT2, FUNC)                                   \
+   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) {               \
+      _mesa_error(ctx, GL_INVALID_ENUM, FUNC "(0x%x)", (int) pname);  \
+      return;                                                          \
    }
-    
-#define CHECK_EXTENSION_B(EXTNAME, PNAME)      \
-   CHECK1(EXTNAME, "Boolean", PNAME )
 
-#define CHECK_EXTENSION_I(EXTNAME, PNAME)      \
-   CHECK1(EXTNAME, "Integer", PNAME )
+/*
+ * Check if either of three extensions is enabled.
+ */
+#define CHECK_EXT3(EXT1, EXT2, EXT3, FUNC)                             \
+   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2 &&               \
+       !ctx->Extensions.EXT3) {                                        \
+      _mesa_error(ctx, GL_INVALID_ENUM, FUNC "(0x%x)", (int) pname);  \
+      return;                                                          \
+   }
 
-#define CHECK_EXTENSION_F(EXTNAME, PNAME)      \
-   CHECK1(EXTNAME, "Float", PNAME )
+/*
+ * Check if either of four extensions is enabled.
+ */
+#define CHECK_EXT4(EXT1, EXT2, EXT3, EXT4, FUNC)                       \
+   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2 &&               \
+       !ctx->Extensions.EXT3 && !ctx->Extensions.EXT4) {               \
+      _mesa_error(ctx, GL_INVALID_ENUM, FUNC "(0x%x)", (int) pname);  \
+      return;                                                          \
+   }
 
 
 /**
@@ -1050,39 +1063,39 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = INT_TO_BOOLEAN(0);
          break;
       case GL_MAX_TEXTURE_UNITS_ARB:
-         CHECK_EXTENSION_B(ARB_multitexture, pname);
+         CHECK_EXT1(ARB_multitexture, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(MIN2(ctx->Const.MaxTextureImageUnits, ctx->Const.MaxTextureCoordUnits));
          break;
       case GL_ACTIVE_TEXTURE_ARB:
-         CHECK_EXTENSION_B(ARB_multitexture, pname);
+         CHECK_EXT1(ARB_multitexture, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit);
          break;
       case GL_CLIENT_ACTIVE_TEXTURE_ARB:
-         CHECK_EXTENSION_B(ARB_multitexture, pname);
+         CHECK_EXT1(ARB_multitexture, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(GL_TEXTURE0_ARB + ctx->Array.ActiveTexture);
          break;
       case GL_TEXTURE_CUBE_MAP_ARB:
-         CHECK_EXTENSION_B(ARB_texture_cube_map, pname);
+         CHECK_EXT1(ARB_texture_cube_map, "GetBooleanv");
          params[0] = _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
          break;
       case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
-         CHECK_EXTENSION_B(ARB_texture_cube_map, pname);
+         CHECK_EXT1(ARB_texture_cube_map, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap->Name);
          break;
       case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
-         CHECK_EXTENSION_B(ARB_texture_cube_map, pname);
+         CHECK_EXT1(ARB_texture_cube_map, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN((1 << (ctx->Const.MaxCubeTextureLevels - 1)));
          break;
       case GL_TEXTURE_COMPRESSION_HINT_ARB:
-         CHECK_EXTENSION_B(ARB_texture_compression, pname);
+         CHECK_EXT1(ARB_texture_compression, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Hint.TextureCompression);
          break;
       case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
-         CHECK_EXTENSION_B(ARB_texture_compression, pname);
+         CHECK_EXT1(ARB_texture_compression, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(_mesa_get_compressed_formats(ctx, NULL));
          break;
       case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
-         CHECK_EXTENSION_B(ARB_texture_compression, pname);
+         CHECK_EXT1(ARB_texture_compression, "GetBooleanv");
          {
          GLint formats[100];
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats);
@@ -1092,11 +1105,11 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          }
          break;
       case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
-         CHECK_EXTENSION_B(EXT_compiled_vertex_array, pname);
+         CHECK_EXT1(EXT_compiled_vertex_array, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.LockFirst);
          break;
       case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
-         CHECK_EXTENSION_B(EXT_compiled_vertex_array, pname);
+         CHECK_EXT1(EXT_compiled_vertex_array, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.LockCount);
          break;
       case GL_TRANSPOSE_COLOR_MATRIX_ARB:
@@ -1184,11 +1197,11 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          }
          break;
       case GL_OCCLUSION_TEST_HP:
-         CHECK_EXTENSION_B(HP_occlusion_test, pname);
+         CHECK_EXT1(HP_occlusion_test, "GetBooleanv");
          params[0] = ctx->Depth.OcclusionTest;
          break;
       case GL_OCCLUSION_TEST_RESULT_HP:
-         CHECK_EXTENSION_B(HP_occlusion_test, pname);
+         CHECK_EXT1(HP_occlusion_test, "GetBooleanv");
          {
          FLUSH_VERTICES(ctx, _NEW_DEPTH);
          if (ctx->Depth.OcclusionTest)
@@ -1202,15 +1215,15 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          }
          break;
       case GL_PIXEL_TEXTURE_SGIS:
-         CHECK_EXTENSION_B(SGIS_pixel_texture, pname);
+         CHECK_EXT1(SGIS_pixel_texture, "GetBooleanv");
          params[0] = ctx->Pixel.PixelTextureEnabled;
          break;
       case GL_PIXEL_TEX_GEN_SGIX:
-         CHECK_EXTENSION_B(SGIX_pixel_texture, pname);
+         CHECK_EXT1(SGIX_pixel_texture, "GetBooleanv");
          params[0] = ctx->Pixel.PixelTextureEnabled;
          break;
       case GL_PIXEL_TEX_GEN_MODE_SGIX:
-         CHECK_EXTENSION_B(SGIX_pixel_texture, pname);
+         CHECK_EXT1(SGIX_pixel_texture, "GetBooleanv");
          params[0] = ENUM_TO_BOOLEAN(pixel_texgen_mode(ctx));
          break;
       case GL_COLOR_MATRIX_SGI:
@@ -1265,79 +1278,79 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostColorMatrixBias[3]);
          break;
       case GL_CONVOLUTION_1D_EXT:
-         CHECK_EXTENSION_B(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetBooleanv");
          params[0] = ctx->Pixel.Convolution1DEnabled;
          break;
       case GL_CONVOLUTION_2D_EXT:
-         CHECK_EXTENSION_B(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetBooleanv");
          params[0] = ctx->Pixel.Convolution2DEnabled;
          break;
       case GL_SEPARABLE_2D_EXT:
-         CHECK_EXTENSION_B(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetBooleanv");
          params[0] = ctx->Pixel.Separable2DEnabled;
          break;
       case GL_POST_CONVOLUTION_RED_SCALE_EXT:
-         CHECK_EXTENSION_B(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionScale[0]);
          break;
       case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
-         CHECK_EXTENSION_B(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionScale[1]);
          break;
       case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
-         CHECK_EXTENSION_B(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionScale[2]);
          break;
       case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
-         CHECK_EXTENSION_B(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionScale[3]);
          break;
       case GL_POST_CONVOLUTION_RED_BIAS_EXT:
-         CHECK_EXTENSION_B(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionBias[0]);
          break;
       case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
-         CHECK_EXTENSION_B(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionBias[1]);
          break;
       case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
-         CHECK_EXTENSION_B(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionBias[2]);
          break;
       case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
-         CHECK_EXTENSION_B(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Pixel.PostConvolutionBias[3]);
          break;
       case GL_HISTOGRAM:
-         CHECK_EXTENSION_B(EXT_histogram, pname);
+         CHECK_EXT1(EXT_histogram, "GetBooleanv");
          params[0] = ctx->Pixel.HistogramEnabled;
          break;
       case GL_MINMAX:
-         CHECK_EXTENSION_B(EXT_histogram, pname);
+         CHECK_EXT1(EXT_histogram, "GetBooleanv");
          params[0] = ctx->Pixel.MinMaxEnabled;
          break;
       case GL_COLOR_TABLE_SGI:
-         CHECK_EXTENSION_B(SGI_color_table, pname);
+         CHECK_EXT1(SGI_color_table, "GetBooleanv");
          params[0] = ctx->Pixel.ColorTableEnabled;
          break;
       case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
-         CHECK_EXTENSION_B(SGI_color_table, pname);
+         CHECK_EXT1(SGI_color_table, "GetBooleanv");
          params[0] = ctx->Pixel.PostConvolutionColorTableEnabled;
          break;
       case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
-         CHECK_EXTENSION_B(SGI_color_table, pname);
+         CHECK_EXT1(SGI_color_table, "GetBooleanv");
          params[0] = ctx->Pixel.PostColorMatrixColorTableEnabled;
          break;
       case GL_TEXTURE_COLOR_TABLE_SGI:
-         CHECK_EXTENSION_B(SGI_texture_color_table, pname);
+         CHECK_EXT1(SGI_texture_color_table, "GetBooleanv");
          params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled;
          break;
       case GL_COLOR_SUM_EXT:
-         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+         CHECK_EXT2(EXT_secondary_color, ARB_vertex_program, "GetBooleanv");
          params[0] = ctx->Fog.ColorSumEnabled;
          break;
       case GL_CURRENT_SECONDARY_COLOR_EXT:
-         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetBooleanv");
          {
          FLUSH_CURRENT(ctx, 0);
          params[0] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0]);
@@ -1347,130 +1360,130 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          }
          break;
       case GL_SECONDARY_COLOR_ARRAY_EXT:
-         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetBooleanv");
          params[0] = ctx->Array.SecondaryColor.Enabled;
          break;
       case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
-         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetBooleanv");
          params[0] = ENUM_TO_BOOLEAN(ctx->Array.SecondaryColor.Type);
          break;
       case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
-         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.SecondaryColor.Stride);
          break;
       case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
-         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.SecondaryColor.Size);
          break;
       case GL_CURRENT_FOG_COORDINATE_EXT:
-         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetBooleanv");
          {
          FLUSH_CURRENT(ctx, 0);
          params[0] = FLOAT_TO_BOOLEAN(ctx->Current.Attrib[VERT_ATTRIB_FOG][0]);
          }
          break;
       case GL_FOG_COORDINATE_ARRAY_EXT:
-         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetBooleanv");
          params[0] = ctx->Array.FogCoord.Enabled;
          break;
       case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
-         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetBooleanv");
          params[0] = ENUM_TO_BOOLEAN(ctx->Array.FogCoord.Type);
          break;
       case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
-         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.FogCoord.Stride);
          break;
       case GL_FOG_COORDINATE_SOURCE_EXT:
-         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetBooleanv");
          params[0] = ENUM_TO_BOOLEAN(ctx->Fog.FogCoordinateSource);
          break;
       case GL_MAX_TEXTURE_LOD_BIAS_EXT:
-         CHECK_EXTENSION_B(EXT_texture_lod_bias, pname);
+         CHECK_EXT1(EXT_texture_lod_bias, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Const.MaxTextureLodBias);
          break;
       case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
-         CHECK_EXTENSION_B(EXT_texture_filter_anisotropic, pname);
+         CHECK_EXT1(EXT_texture_filter_anisotropic, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Const.MaxTextureMaxAnisotropy);
          break;
       case GL_MULTISAMPLE_ARB:
-         CHECK_EXTENSION_B(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = ctx->Multisample.Enabled;
          break;
       case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
-         CHECK_EXTENSION_B(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = ctx->Multisample.SampleAlphaToCoverage;
          break;
       case GL_SAMPLE_ALPHA_TO_ONE_ARB:
-         CHECK_EXTENSION_B(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = ctx->Multisample.SampleAlphaToOne;
          break;
       case GL_SAMPLE_COVERAGE_ARB:
-         CHECK_EXTENSION_B(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = ctx->Multisample.SampleCoverage;
          break;
       case GL_SAMPLE_COVERAGE_VALUE_ARB:
-         CHECK_EXTENSION_B(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Multisample.SampleCoverageValue);
          break;
       case GL_SAMPLE_COVERAGE_INVERT_ARB:
-         CHECK_EXTENSION_B(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = ctx->Multisample.SampleCoverageInvert;
          break;
       case GL_SAMPLE_BUFFERS_ARB:
-         CHECK_EXTENSION_B(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.sampleBuffers);
          break;
       case GL_SAMPLES_ARB:
-         CHECK_EXTENSION_B(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Visual.samples);
          break;
       case GL_RASTER_POSITION_UNCLIPPED_IBM:
-         CHECK_EXTENSION_B(IBM_rasterpos_clip, pname);
+         CHECK_EXT1(IBM_rasterpos_clip, "GetBooleanv");
          params[0] = ctx->Transform.RasterPositionUnclipped;
          break;
       case GL_POINT_SPRITE_NV:
-         CHECK_EXTENSION_B(NV_point_sprite, pname);
+         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetBooleanv");
          params[0] = ctx->Point.PointSprite;
          break;
       case GL_POINT_SPRITE_R_MODE_NV:
-         CHECK_EXTENSION_B(NV_point_sprite, pname);
+         CHECK_EXT1(NV_point_sprite, "GetBooleanv");
          params[0] = ENUM_TO_BOOLEAN(ctx->Point.SpriteRMode);
          break;
       case GL_POINT_SPRITE_COORD_ORIGIN:
-         CHECK_EXTENSION_B(NV_point_sprite, pname);
+         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetBooleanv");
          params[0] = ENUM_TO_BOOLEAN(ctx->Point.SpriteOrigin);
          break;
       case GL_GENERATE_MIPMAP_HINT_SGIS:
-         CHECK_EXTENSION_B(SGIS_generate_mipmap, pname);
+         CHECK_EXT1(SGIS_generate_mipmap, "GetBooleanv");
          params[0] = ENUM_TO_BOOLEAN(ctx->Hint.GenerateMipmap);
          break;
       case GL_VERTEX_PROGRAM_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT2(NV_vertex_program, ARB_vertex_program, "GetBooleanv");
          params[0] = ctx->VertexProgram.Enabled;
          break;
       case GL_VERTEX_PROGRAM_POINT_SIZE_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT2(NV_vertex_program, ARB_vertex_program, "GetBooleanv");
          params[0] = ctx->VertexProgram.PointSizeEnabled;
          break;
       case GL_VERTEX_PROGRAM_TWO_SIDE_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT2(NV_vertex_program, ARB_vertex_program, "GetBooleanv");
          params[0] = ctx->VertexProgram.TwoSideEnabled;
          break;
       case GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT3(NV_vertex_program, ARB_vertex_program, ARB_fragment_program, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.MaxProgramMatrixStackDepth);
          break;
       case GL_MAX_TRACK_MATRICES_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT3(NV_vertex_program, ARB_vertex_program, ARB_fragment_program, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.MaxProgramMatrices);
          break;
       case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT3(NV_vertex_program, ARB_vertex_program, ARB_fragment_program, "GetBooleanv");
          params[0] = ctx->CurrentStack->Depth + 1;
          break;
       case GL_CURRENT_MATRIX_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT3(NV_vertex_program, ARB_vertex_program, ARB_fragment_program, "GetBooleanv");
          {
          const GLfloat *matrix = ctx->CurrentStack->Top->m;
          params[0] = FLOAT_TO_BOOLEAN(matrix[0]);
@@ -1492,247 +1505,243 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          }
          break;
       case GL_VERTEX_PROGRAM_BINDING_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN((ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0));
          break;
       case GL_PROGRAM_ERROR_POSITION_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT4(NV_vertex_program, ARB_vertex_program, NV_fragment_program, ARB_fragment_program, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Program.ErrorPos);
          break;
       case GL_VERTEX_ATTRIB_ARRAY0_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[0].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY1_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[1].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY2_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[2].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY3_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[3].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[4].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY5_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[5].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY6_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[6].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY7_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[7].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY8_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[8].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY9_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[9].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY10_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[10].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY11_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[11].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY12_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[12].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY13_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[13].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY14_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[14].Enabled;
          break;
       case GL_VERTEX_ATTRIB_ARRAY15_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Array.VertexAttrib[15].Enabled;
          break;
       case GL_MAP1_VERTEX_ATTRIB0_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[0];
          break;
       case GL_MAP1_VERTEX_ATTRIB1_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[1];
          break;
       case GL_MAP1_VERTEX_ATTRIB2_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[2];
          break;
       case GL_MAP1_VERTEX_ATTRIB3_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[3];
          break;
       case GL_MAP1_VERTEX_ATTRIB4_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[4];
          break;
       case GL_MAP1_VERTEX_ATTRIB5_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[5];
          break;
       case GL_MAP1_VERTEX_ATTRIB6_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[6];
          break;
       case GL_MAP1_VERTEX_ATTRIB7_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[7];
          break;
       case GL_MAP1_VERTEX_ATTRIB8_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[8];
          break;
       case GL_MAP1_VERTEX_ATTRIB9_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[9];
          break;
       case GL_MAP1_VERTEX_ATTRIB10_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[10];
          break;
       case GL_MAP1_VERTEX_ATTRIB11_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[11];
          break;
       case GL_MAP1_VERTEX_ATTRIB12_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[12];
          break;
       case GL_MAP1_VERTEX_ATTRIB13_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[13];
          break;
       case GL_MAP1_VERTEX_ATTRIB14_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[14];
          break;
       case GL_MAP1_VERTEX_ATTRIB15_4_NV:
-         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetBooleanv");
          params[0] = ctx->Eval.Map1Attrib[15];
          break;
       case GL_FRAGMENT_PROGRAM_NV:
-         CHECK_EXTENSION_B(NV_fragment_program, pname);
+         CHECK_EXT1(NV_fragment_program, "GetBooleanv");
          params[0] = ctx->FragmentProgram.Enabled;
          break;
       case GL_MAX_TEXTURE_COORDS_NV:
-         CHECK_EXTENSION_B(NV_fragment_program, pname);
+         CHECK_EXT2(NV_fragment_program, ARB_fragment_program, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.MaxTextureCoordUnits);
          break;
       case GL_MAX_TEXTURE_IMAGE_UNITS_NV:
-         CHECK_EXTENSION_B(NV_fragment_program, pname);
+         CHECK_EXT2(NV_fragment_program, ARB_fragment_program, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.MaxTextureImageUnits);
          break;
       case GL_FRAGMENT_PROGRAM_BINDING_NV:
-         CHECK_EXTENSION_B(NV_fragment_program, pname);
+         CHECK_EXT1(NV_fragment_program, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0);
          break;
       case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
-         CHECK_EXTENSION_B(NV_fragment_program, pname);
+         CHECK_EXT1(NV_fragment_program, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(MAX_NV_FRAGMENT_PROGRAM_PARAMS);
          break;
       case GL_TEXTURE_RECTANGLE_NV:
-         CHECK_EXTENSION_B(NV_texture_rectangle, pname);
+         CHECK_EXT1(NV_texture_rectangle, "GetBooleanv");
          params[0] = _mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV);
          break;
       case GL_TEXTURE_BINDING_RECTANGLE_NV:
-         CHECK_EXTENSION_B(NV_texture_rectangle, pname);
+         CHECK_EXT1(NV_texture_rectangle, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentRect->Name);
          break;
       case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
-         CHECK_EXTENSION_B(NV_texture_rectangle, pname);
+         CHECK_EXT1(NV_texture_rectangle, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.MaxTextureRectSize);
          break;
       case GL_STENCIL_TEST_TWO_SIDE_EXT:
-         CHECK_EXTENSION_B(EXT_stencil_two_side, pname);
+         CHECK_EXT1(EXT_stencil_two_side, "GetBooleanv");
          params[0] = ctx->Stencil.TestTwoSide;
          break;
       case GL_ACTIVE_STENCIL_FACE_EXT:
-         CHECK_EXTENSION_B(EXT_stencil_two_side, pname);
+         CHECK_EXT1(EXT_stencil_two_side, "GetBooleanv");
          params[0] = ENUM_TO_BOOLEAN(ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT);
          break;
       case GL_MAX_SHININESS_NV:
-         CHECK_EXTENSION_B(NV_light_max_exponent, pname);
+         CHECK_EXT1(NV_light_max_exponent, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Const.MaxShininess);
          break;
       case GL_MAX_SPOT_EXPONENT_NV:
-         CHECK_EXTENSION_B(NV_light_max_exponent, pname);
+         CHECK_EXT1(NV_light_max_exponent, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Const.MaxSpotExponent);
          break;
       case GL_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.ArrayBufferObj->Name);
          break;
       case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.Vertex.BufferObj->Name);
          break;
       case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.Normal.BufferObj->Name);
          break;
       case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.Color.BufferObj->Name);
          break;
       case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.Index.BufferObj->Name);
          break;
       case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.TexCoord[ctx->Array.ActiveTexture].BufferObj->Name);
          break;
       case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.EdgeFlag.BufferObj->Name);
          break;
       case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.SecondaryColor.BufferObj->Name);
          break;
       case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.FogCoord.BufferObj->Name);
          break;
       case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Array.ElementArrayBufferObj->Name);
          break;
       case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
-         CHECK_EXTENSION_B(EXT_pixel_buffer_object, pname);
+         CHECK_EXT1(EXT_pixel_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Pack.BufferObj->Name);
          break;
       case GL_PIXEL_UNPACK_BUFFER_BINDING_EXT:
-         CHECK_EXTENSION_B(EXT_pixel_buffer_object, pname);
+         CHECK_EXT1(EXT_pixel_buffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Unpack.BufferObj->Name);
          break;
       case GL_MAX_VERTEX_ATTRIBS_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_program, pname);
+         CHECK_EXT1(ARB_vertex_program, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.MaxVertexProgramAttribs);
          break;
-      case GL_FRAGMENT_PROGRAM_ARB:
-         CHECK_EXTENSION_B(ARB_fragment_program, pname);
-         params[0] = ctx->FragmentProgram.Enabled;
-         break;
       case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
-         CHECK_EXTENSION_B(ARB_fragment_program, pname);
+         CHECK_EXT2(ARB_vertex_program, ARB_fragment_program, "GetBooleanv");
          {
          const GLfloat *matrix = ctx->CurrentStack->Top->m;
          params[0] = FLOAT_TO_BOOLEAN(matrix[0]);
@@ -1753,41 +1762,45 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[15] = FLOAT_TO_BOOLEAN(matrix[15]);
          }
          break;
+      case GL_FRAGMENT_PROGRAM_ARB:
+         CHECK_EXT1(ARB_fragment_program, "GetBooleanv");
+         params[0] = ctx->FragmentProgram.Enabled;
+         break;
       case GL_DEPTH_BOUNDS_TEST_EXT:
-         CHECK_EXTENSION_B(EXT_depth_bounds_test, pname);
+         CHECK_EXT1(EXT_depth_bounds_test, "GetBooleanv");
          params[0] = ctx->Depth.BoundsTest;
          break;
       case GL_DEPTH_BOUNDS_EXT:
-         CHECK_EXTENSION_B(EXT_depth_bounds_test, pname);
+         CHECK_EXT1(EXT_depth_bounds_test, "GetBooleanv");
          params[0] = FLOAT_TO_BOOLEAN(ctx->Depth.BoundsMin);
          params[1] = FLOAT_TO_BOOLEAN(ctx->Depth.BoundsMax);
          break;
       case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
-         CHECK_EXTENSION_B(MESA_program_debug, pname);
+         CHECK_EXT1(MESA_program_debug, "GetBooleanv");
          params[0] = ctx->FragmentProgram.CallbackEnabled;
          break;
       case GL_VERTEX_PROGRAM_CALLBACK_MESA:
-         CHECK_EXTENSION_B(MESA_program_debug, pname);
+         CHECK_EXT1(MESA_program_debug, "GetBooleanv");
          params[0] = ctx->VertexProgram.CallbackEnabled;
          break;
       case GL_FRAGMENT_PROGRAM_POSITION_MESA:
-         CHECK_EXTENSION_B(MESA_program_debug, pname);
+         CHECK_EXT1(MESA_program_debug, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->FragmentProgram.CurrentPosition);
          break;
       case GL_VERTEX_PROGRAM_POSITION_MESA:
-         CHECK_EXTENSION_B(MESA_program_debug, pname);
+         CHECK_EXT1(MESA_program_debug, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->VertexProgram.CurrentPosition);
          break;
       case GL_MAX_DRAW_BUFFERS_ARB:
-         CHECK_EXTENSION_B(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.MaxDrawBuffers);
          break;
       case GL_DRAW_BUFFER0_ARB:
-         CHECK_EXTENSION_B(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetBooleanv");
          params[0] = ENUM_TO_BOOLEAN(ctx->Color.DrawBuffer[0]);
          break;
       case GL_DRAW_BUFFER1_ARB:
-         CHECK_EXTENSION_B(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetBooleanv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -1799,7 +1812,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          }
          break;
       case GL_DRAW_BUFFER2_ARB:
-         CHECK_EXTENSION_B(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetBooleanv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -1811,7 +1824,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          }
          break;
       case GL_DRAW_BUFFER3_ARB:
-         CHECK_EXTENSION_B(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetBooleanv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -1823,43 +1836,43 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          }
          break;
       case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES:
-         CHECK_EXTENSION_B(OES_read_format, pname);
+         CHECK_EXT1(OES_read_format, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.ColorReadType);
          break;
       case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES:
-         CHECK_EXTENSION_B(OES_read_format, pname);
+         CHECK_EXT1(OES_read_format, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.ColorReadFormat);
          break;
       case GL_NUM_FRAGMENT_REGISTERS_ATI:
-         CHECK_EXTENSION_B(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(6);
          break;
       case GL_NUM_FRAGMENT_CONSTANTS_ATI:
-         CHECK_EXTENSION_B(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(8);
          break;
       case GL_NUM_PASSES_ATI:
-         CHECK_EXTENSION_B(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(2);
          break;
       case GL_NUM_INSTRUCTIONS_PER_PASS_ATI:
-         CHECK_EXTENSION_B(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(8);
          break;
       case GL_NUM_INSTRUCTIONS_TOTAL_ATI:
-         CHECK_EXTENSION_B(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(16);
          break;
       case GL_COLOR_ALPHA_PAIRING_ATI:
-         CHECK_EXTENSION_B(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
          params[0] = GL_TRUE;
          break;
       case GL_NUM_LOOPBACK_COMPONENTS_ATI:
-         CHECK_EXTENSION_B(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(3);
          break;
       case GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI:
-         CHECK_EXTENSION_B(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(3);
          break;
       case GL_STENCIL_BACK_FUNC:
@@ -1881,43 +1894,43 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params )
          params[0] = ENUM_TO_BOOLEAN(ctx->Stencil.ZPassFunc[1]);
          break;
       case GL_FRAMEBUFFER_BINDING_EXT:
-         CHECK_EXTENSION_B(EXT_framebuffer_object, pname);
+         CHECK_EXT1(EXT_framebuffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->DrawBuffer->Name);
          break;
       case GL_RENDERBUFFER_BINDING_EXT:
-         CHECK_EXTENSION_B(EXT_framebuffer_object, pname);
+         CHECK_EXT1(EXT_framebuffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0);
          break;
       case GL_MAX_COLOR_ATTACHMENTS_EXT:
-         CHECK_EXTENSION_B(EXT_framebuffer_object, pname);
+         CHECK_EXT1(EXT_framebuffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.MaxColorAttachments);
          break;
       case GL_MAX_RENDERBUFFER_SIZE_EXT:
-         CHECK_EXTENSION_B(EXT_framebuffer_object, pname);
+         CHECK_EXT1(EXT_framebuffer_object, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(ctx->Const.MaxRenderbufferSize);
          break;
       case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
-         CHECK_EXTENSION_B(ARB_fragment_shader, pname);
+         CHECK_EXT1(ARB_fragment_shader, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(MAX_FRAGMENT_UNIFORM_COMPONENTS);
          break;
       case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB:
-         CHECK_EXTENSION_B(ARB_fragment_shader, pname);
+         CHECK_EXT1(ARB_fragment_shader, "GetBooleanv");
          params[0] = ENUM_TO_BOOLEAN(ctx->Hint.FragmentShaderDerivative);
          break;
       case GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_shader, pname);
+         CHECK_EXT1(ARB_vertex_shader, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(MAX_VERTEX_UNIFORM_COMPONENTS);
          break;
       case GL_MAX_VARYING_FLOATS_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_shader, pname);
+         CHECK_EXT1(ARB_vertex_shader, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(MAX_VARYING_FLOATS);
          break;
       case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_shader, pname);
+         CHECK_EXT1(ARB_vertex_shader, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(MAX_VERTEX_TEXTURE_IMAGE_UNITS);
          break;
       case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXTENSION_B(ARB_vertex_shader, pname);
+         CHECK_EXT1(ARB_vertex_shader, "GetBooleanv");
          params[0] = INT_TO_BOOLEAN(MAX_COMBINED_TEXTURE_IMAGE_UNITS);
          break;
       default:
@@ -2898,39 +2911,39 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = (GLfloat)(0);
          break;
       case GL_MAX_TEXTURE_UNITS_ARB:
-         CHECK_EXTENSION_F(ARB_multitexture, pname);
+         CHECK_EXT1(ARB_multitexture, "GetFloatv");
          params[0] = (GLfloat)(MIN2(ctx->Const.MaxTextureImageUnits, ctx->Const.MaxTextureCoordUnits));
          break;
       case GL_ACTIVE_TEXTURE_ARB:
-         CHECK_EXTENSION_F(ARB_multitexture, pname);
+         CHECK_EXT1(ARB_multitexture, "GetFloatv");
          params[0] = (GLfloat)(GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit);
          break;
       case GL_CLIENT_ACTIVE_TEXTURE_ARB:
-         CHECK_EXTENSION_F(ARB_multitexture, pname);
+         CHECK_EXT1(ARB_multitexture, "GetFloatv");
          params[0] = (GLfloat)(GL_TEXTURE0_ARB + ctx->Array.ActiveTexture);
          break;
       case GL_TEXTURE_CUBE_MAP_ARB:
-         CHECK_EXTENSION_F(ARB_texture_cube_map, pname);
+         CHECK_EXT1(ARB_texture_cube_map, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(_mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB));
          break;
       case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
-         CHECK_EXTENSION_F(ARB_texture_cube_map, pname);
+         CHECK_EXT1(ARB_texture_cube_map, "GetFloatv");
          params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap->Name);
          break;
       case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
-         CHECK_EXTENSION_F(ARB_texture_cube_map, pname);
+         CHECK_EXT1(ARB_texture_cube_map, "GetFloatv");
          params[0] = (GLfloat)((1 << (ctx->Const.MaxCubeTextureLevels - 1)));
          break;
       case GL_TEXTURE_COMPRESSION_HINT_ARB:
-         CHECK_EXTENSION_F(ARB_texture_compression, pname);
+         CHECK_EXT1(ARB_texture_compression, "GetFloatv");
          params[0] = (GLfloat)(ctx->Hint.TextureCompression);
          break;
       case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
-         CHECK_EXTENSION_F(ARB_texture_compression, pname);
+         CHECK_EXT1(ARB_texture_compression, "GetFloatv");
          params[0] = (GLfloat)(_mesa_get_compressed_formats(ctx, NULL));
          break;
       case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
-         CHECK_EXTENSION_F(ARB_texture_compression, pname);
+         CHECK_EXT1(ARB_texture_compression, "GetFloatv");
          {
          GLint formats[100];
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats);
@@ -2940,11 +2953,11 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          }
          break;
       case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
-         CHECK_EXTENSION_F(EXT_compiled_vertex_array, pname);
+         CHECK_EXT1(EXT_compiled_vertex_array, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.LockFirst);
          break;
       case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
-         CHECK_EXTENSION_F(EXT_compiled_vertex_array, pname);
+         CHECK_EXT1(EXT_compiled_vertex_array, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.LockCount);
          break;
       case GL_TRANSPOSE_COLOR_MATRIX_ARB:
@@ -3032,11 +3045,11 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          }
          break;
       case GL_OCCLUSION_TEST_HP:
-         CHECK_EXTENSION_F(HP_occlusion_test, pname);
+         CHECK_EXT1(HP_occlusion_test, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Depth.OcclusionTest);
          break;
       case GL_OCCLUSION_TEST_RESULT_HP:
-         CHECK_EXTENSION_F(HP_occlusion_test, pname);
+         CHECK_EXT1(HP_occlusion_test, "GetFloatv");
          {
          FLUSH_VERTICES(ctx, _NEW_DEPTH);
          if (ctx->Depth.OcclusionTest)
@@ -3050,15 +3063,15 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          }
          break;
       case GL_PIXEL_TEXTURE_SGIS:
-         CHECK_EXTENSION_F(SGIS_pixel_texture, pname);
+         CHECK_EXT1(SGIS_pixel_texture, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.PixelTextureEnabled);
          break;
       case GL_PIXEL_TEX_GEN_SGIX:
-         CHECK_EXTENSION_F(SGIX_pixel_texture, pname);
+         CHECK_EXT1(SGIX_pixel_texture, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.PixelTextureEnabled);
          break;
       case GL_PIXEL_TEX_GEN_MODE_SGIX:
-         CHECK_EXTENSION_F(SGIX_pixel_texture, pname);
+         CHECK_EXT1(SGIX_pixel_texture, "GetFloatv");
          params[0] = ENUM_TO_FLOAT(pixel_texgen_mode(ctx));
          break;
       case GL_COLOR_MATRIX_SGI:
@@ -3113,79 +3126,79 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = ctx->Pixel.PostColorMatrixBias[3];
          break;
       case GL_CONVOLUTION_1D_EXT:
-         CHECK_EXTENSION_F(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.Convolution1DEnabled);
          break;
       case GL_CONVOLUTION_2D_EXT:
-         CHECK_EXTENSION_F(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.Convolution2DEnabled);
          break;
       case GL_SEPARABLE_2D_EXT:
-         CHECK_EXTENSION_F(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.Separable2DEnabled);
          break;
       case GL_POST_CONVOLUTION_RED_SCALE_EXT:
-         CHECK_EXTENSION_F(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetFloatv");
          params[0] = ctx->Pixel.PostConvolutionScale[0];
          break;
       case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
-         CHECK_EXTENSION_F(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetFloatv");
          params[0] = ctx->Pixel.PostConvolutionScale[1];
          break;
       case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
-         CHECK_EXTENSION_F(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetFloatv");
          params[0] = ctx->Pixel.PostConvolutionScale[2];
          break;
       case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
-         CHECK_EXTENSION_F(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetFloatv");
          params[0] = ctx->Pixel.PostConvolutionScale[3];
          break;
       case GL_POST_CONVOLUTION_RED_BIAS_EXT:
-         CHECK_EXTENSION_F(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetFloatv");
          params[0] = ctx->Pixel.PostConvolutionBias[0];
          break;
       case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
-         CHECK_EXTENSION_F(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetFloatv");
          params[0] = ctx->Pixel.PostConvolutionBias[1];
          break;
       case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
-         CHECK_EXTENSION_F(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetFloatv");
          params[0] = ctx->Pixel.PostConvolutionBias[2];
          break;
       case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
-         CHECK_EXTENSION_F(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetFloatv");
          params[0] = ctx->Pixel.PostConvolutionBias[3];
          break;
       case GL_HISTOGRAM:
-         CHECK_EXTENSION_F(EXT_histogram, pname);
+         CHECK_EXT1(EXT_histogram, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.HistogramEnabled);
          break;
       case GL_MINMAX:
-         CHECK_EXTENSION_F(EXT_histogram, pname);
+         CHECK_EXT1(EXT_histogram, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.MinMaxEnabled);
          break;
       case GL_COLOR_TABLE_SGI:
-         CHECK_EXTENSION_F(SGI_color_table, pname);
+         CHECK_EXT1(SGI_color_table, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.ColorTableEnabled);
          break;
       case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
-         CHECK_EXTENSION_F(SGI_color_table, pname);
+         CHECK_EXT1(SGI_color_table, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.PostConvolutionColorTableEnabled);
          break;
       case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
-         CHECK_EXTENSION_F(SGI_color_table, pname);
+         CHECK_EXT1(SGI_color_table, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Pixel.PostColorMatrixColorTableEnabled);
          break;
       case GL_TEXTURE_COLOR_TABLE_SGI:
-         CHECK_EXTENSION_F(SGI_texture_color_table, pname);
+         CHECK_EXT1(SGI_texture_color_table, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled);
          break;
       case GL_COLOR_SUM_EXT:
-         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+         CHECK_EXT2(EXT_secondary_color, ARB_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Fog.ColorSumEnabled);
          break;
       case GL_CURRENT_SECONDARY_COLOR_EXT:
-         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetFloatv");
          {
          FLUSH_CURRENT(ctx, 0);
          params[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0];
@@ -3195,130 +3208,130 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          }
          break;
       case GL_SECONDARY_COLOR_ARRAY_EXT:
-         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.SecondaryColor.Enabled);
          break;
       case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
-         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetFloatv");
          params[0] = ENUM_TO_FLOAT(ctx->Array.SecondaryColor.Type);
          break;
       case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
-         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.SecondaryColor.Stride);
          break;
       case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
-         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.SecondaryColor.Size);
          break;
       case GL_CURRENT_FOG_COORDINATE_EXT:
-         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetFloatv");
          {
          FLUSH_CURRENT(ctx, 0);
          params[0] = ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
          }
          break;
       case GL_FOG_COORDINATE_ARRAY_EXT:
-         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.FogCoord.Enabled);
          break;
       case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
-         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetFloatv");
          params[0] = ENUM_TO_FLOAT(ctx->Array.FogCoord.Type);
          break;
       case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
-         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.FogCoord.Stride);
          break;
       case GL_FOG_COORDINATE_SOURCE_EXT:
-         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetFloatv");
          params[0] = ENUM_TO_FLOAT(ctx->Fog.FogCoordinateSource);
          break;
       case GL_MAX_TEXTURE_LOD_BIAS_EXT:
-         CHECK_EXTENSION_F(EXT_texture_lod_bias, pname);
+         CHECK_EXT1(EXT_texture_lod_bias, "GetFloatv");
          params[0] = ctx->Const.MaxTextureLodBias;
          break;
       case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
-         CHECK_EXTENSION_F(EXT_texture_filter_anisotropic, pname);
+         CHECK_EXT1(EXT_texture_filter_anisotropic, "GetFloatv");
          params[0] = ctx->Const.MaxTextureMaxAnisotropy;
          break;
       case GL_MULTISAMPLE_ARB:
-         CHECK_EXTENSION_F(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.Enabled);
          break;
       case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
-         CHECK_EXTENSION_F(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.SampleAlphaToCoverage);
          break;
       case GL_SAMPLE_ALPHA_TO_ONE_ARB:
-         CHECK_EXTENSION_F(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.SampleAlphaToOne);
          break;
       case GL_SAMPLE_COVERAGE_ARB:
-         CHECK_EXTENSION_F(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.SampleCoverage);
          break;
       case GL_SAMPLE_COVERAGE_VALUE_ARB:
-         CHECK_EXTENSION_F(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = ctx->Multisample.SampleCoverageValue;
          break;
       case GL_SAMPLE_COVERAGE_INVERT_ARB:
-         CHECK_EXTENSION_F(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Multisample.SampleCoverageInvert);
          break;
       case GL_SAMPLE_BUFFERS_ARB:
-         CHECK_EXTENSION_F(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = (GLfloat)(ctx->DrawBuffer->Visual.sampleBuffers);
          break;
       case GL_SAMPLES_ARB:
-         CHECK_EXTENSION_F(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetFloatv");
          params[0] = (GLfloat)(ctx->DrawBuffer->Visual.samples);
          break;
       case GL_RASTER_POSITION_UNCLIPPED_IBM:
-         CHECK_EXTENSION_F(IBM_rasterpos_clip, pname);
+         CHECK_EXT1(IBM_rasterpos_clip, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Transform.RasterPositionUnclipped);
          break;
       case GL_POINT_SPRITE_NV:
-         CHECK_EXTENSION_F(NV_point_sprite, pname);
+         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Point.PointSprite);
          break;
       case GL_POINT_SPRITE_R_MODE_NV:
-         CHECK_EXTENSION_F(NV_point_sprite, pname);
+         CHECK_EXT1(NV_point_sprite, "GetFloatv");
          params[0] = ENUM_TO_FLOAT(ctx->Point.SpriteRMode);
          break;
       case GL_POINT_SPRITE_COORD_ORIGIN:
-         CHECK_EXTENSION_F(NV_point_sprite, pname);
+         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetFloatv");
          params[0] = ENUM_TO_FLOAT(ctx->Point.SpriteOrigin);
          break;
       case GL_GENERATE_MIPMAP_HINT_SGIS:
-         CHECK_EXTENSION_F(SGIS_generate_mipmap, pname);
+         CHECK_EXT1(SGIS_generate_mipmap, "GetFloatv");
          params[0] = ENUM_TO_FLOAT(ctx->Hint.GenerateMipmap);
          break;
       case GL_VERTEX_PROGRAM_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT2(NV_vertex_program, ARB_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->VertexProgram.Enabled);
          break;
       case GL_VERTEX_PROGRAM_POINT_SIZE_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT2(NV_vertex_program, ARB_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->VertexProgram.PointSizeEnabled);
          break;
       case GL_VERTEX_PROGRAM_TWO_SIDE_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT2(NV_vertex_program, ARB_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->VertexProgram.TwoSideEnabled);
          break;
       case GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT3(NV_vertex_program, ARB_vertex_program, ARB_fragment_program, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.MaxProgramMatrixStackDepth);
          break;
       case GL_MAX_TRACK_MATRICES_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT3(NV_vertex_program, ARB_vertex_program, ARB_fragment_program, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.MaxProgramMatrices);
          break;
       case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT3(NV_vertex_program, ARB_vertex_program, ARB_fragment_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->CurrentStack->Depth + 1);
          break;
       case GL_CURRENT_MATRIX_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT3(NV_vertex_program, ARB_vertex_program, ARB_fragment_program, "GetFloatv");
          {
          const GLfloat *matrix = ctx->CurrentStack->Top->m;
          params[0] = matrix[0];
@@ -3340,247 +3353,243 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          }
          break;
       case GL_VERTEX_PROGRAM_BINDING_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = (GLfloat)((ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0));
          break;
       case GL_PROGRAM_ERROR_POSITION_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT4(NV_vertex_program, ARB_vertex_program, NV_fragment_program, ARB_fragment_program, "GetFloatv");
          params[0] = (GLfloat)(ctx->Program.ErrorPos);
          break;
       case GL_VERTEX_ATTRIB_ARRAY0_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[0].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY1_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[1].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY2_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[2].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY3_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[3].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[4].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY5_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[5].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY6_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[6].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY7_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[7].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY8_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[8].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY9_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[9].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY10_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[10].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY11_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[11].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY12_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[12].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY13_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[13].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY14_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[14].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY15_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Array.VertexAttrib[15].Enabled);
          break;
       case GL_MAP1_VERTEX_ATTRIB0_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[0]);
          break;
       case GL_MAP1_VERTEX_ATTRIB1_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[1]);
          break;
       case GL_MAP1_VERTEX_ATTRIB2_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[2]);
          break;
       case GL_MAP1_VERTEX_ATTRIB3_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[3]);
          break;
       case GL_MAP1_VERTEX_ATTRIB4_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[4]);
          break;
       case GL_MAP1_VERTEX_ATTRIB5_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[5]);
          break;
       case GL_MAP1_VERTEX_ATTRIB6_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[6]);
          break;
       case GL_MAP1_VERTEX_ATTRIB7_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[7]);
          break;
       case GL_MAP1_VERTEX_ATTRIB8_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[8]);
          break;
       case GL_MAP1_VERTEX_ATTRIB9_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[9]);
          break;
       case GL_MAP1_VERTEX_ATTRIB10_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[10]);
          break;
       case GL_MAP1_VERTEX_ATTRIB11_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[11]);
          break;
       case GL_MAP1_VERTEX_ATTRIB12_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[12]);
          break;
       case GL_MAP1_VERTEX_ATTRIB13_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[13]);
          break;
       case GL_MAP1_VERTEX_ATTRIB14_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[14]);
          break;
       case GL_MAP1_VERTEX_ATTRIB15_4_NV:
-         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Eval.Map1Attrib[15]);
          break;
       case GL_FRAGMENT_PROGRAM_NV:
-         CHECK_EXTENSION_F(NV_fragment_program, pname);
+         CHECK_EXT1(NV_fragment_program, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->FragmentProgram.Enabled);
          break;
       case GL_MAX_TEXTURE_COORDS_NV:
-         CHECK_EXTENSION_F(NV_fragment_program, pname);
+         CHECK_EXT2(NV_fragment_program, ARB_fragment_program, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.MaxTextureCoordUnits);
          break;
       case GL_MAX_TEXTURE_IMAGE_UNITS_NV:
-         CHECK_EXTENSION_F(NV_fragment_program, pname);
+         CHECK_EXT2(NV_fragment_program, ARB_fragment_program, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.MaxTextureImageUnits);
          break;
       case GL_FRAGMENT_PROGRAM_BINDING_NV:
-         CHECK_EXTENSION_F(NV_fragment_program, pname);
+         CHECK_EXT1(NV_fragment_program, "GetFloatv");
          params[0] = (GLfloat)(ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0);
          break;
       case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
-         CHECK_EXTENSION_F(NV_fragment_program, pname);
+         CHECK_EXT1(NV_fragment_program, "GetFloatv");
          params[0] = (GLfloat)(MAX_NV_FRAGMENT_PROGRAM_PARAMS);
          break;
       case GL_TEXTURE_RECTANGLE_NV:
-         CHECK_EXTENSION_F(NV_texture_rectangle, pname);
+         CHECK_EXT1(NV_texture_rectangle, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(_mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV));
          break;
       case GL_TEXTURE_BINDING_RECTANGLE_NV:
-         CHECK_EXTENSION_F(NV_texture_rectangle, pname);
+         CHECK_EXT1(NV_texture_rectangle, "GetFloatv");
          params[0] = (GLfloat)(ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentRect->Name);
          break;
       case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
-         CHECK_EXTENSION_F(NV_texture_rectangle, pname);
+         CHECK_EXT1(NV_texture_rectangle, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.MaxTextureRectSize);
          break;
       case GL_STENCIL_TEST_TWO_SIDE_EXT:
-         CHECK_EXTENSION_F(EXT_stencil_two_side, pname);
+         CHECK_EXT1(EXT_stencil_two_side, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Stencil.TestTwoSide);
          break;
       case GL_ACTIVE_STENCIL_FACE_EXT:
-         CHECK_EXTENSION_F(EXT_stencil_two_side, pname);
+         CHECK_EXT1(EXT_stencil_two_side, "GetFloatv");
          params[0] = ENUM_TO_FLOAT(ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT);
          break;
       case GL_MAX_SHININESS_NV:
-         CHECK_EXTENSION_F(NV_light_max_exponent, pname);
+         CHECK_EXT1(NV_light_max_exponent, "GetFloatv");
          params[0] = ctx->Const.MaxShininess;
          break;
       case GL_MAX_SPOT_EXPONENT_NV:
-         CHECK_EXTENSION_F(NV_light_max_exponent, pname);
+         CHECK_EXT1(NV_light_max_exponent, "GetFloatv");
          params[0] = ctx->Const.MaxSpotExponent;
          break;
       case GL_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.ArrayBufferObj->Name);
          break;
       case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.Vertex.BufferObj->Name);
          break;
       case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.Normal.BufferObj->Name);
          break;
       case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.Color.BufferObj->Name);
          break;
       case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.Index.BufferObj->Name);
          break;
       case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.TexCoord[ctx->Array.ActiveTexture].BufferObj->Name);
          break;
       case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.EdgeFlag.BufferObj->Name);
          break;
       case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.SecondaryColor.BufferObj->Name);
          break;
       case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.FogCoord.BufferObj->Name);
          break;
       case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Array.ElementArrayBufferObj->Name);
          break;
       case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
-         CHECK_EXTENSION_F(EXT_pixel_buffer_object, pname);
+         CHECK_EXT1(EXT_pixel_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Pack.BufferObj->Name);
          break;
       case GL_PIXEL_UNPACK_BUFFER_BINDING_EXT:
-         CHECK_EXTENSION_F(EXT_pixel_buffer_object, pname);
+         CHECK_EXT1(EXT_pixel_buffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Unpack.BufferObj->Name);
          break;
       case GL_MAX_VERTEX_ATTRIBS_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_program, pname);
+         CHECK_EXT1(ARB_vertex_program, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.MaxVertexProgramAttribs);
          break;
-      case GL_FRAGMENT_PROGRAM_ARB:
-         CHECK_EXTENSION_F(ARB_fragment_program, pname);
-         params[0] = BOOLEAN_TO_FLOAT(ctx->FragmentProgram.Enabled);
-         break;
       case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
-         CHECK_EXTENSION_F(ARB_fragment_program, pname);
+         CHECK_EXT2(ARB_vertex_program, ARB_fragment_program, "GetFloatv");
          {
          const GLfloat *matrix = ctx->CurrentStack->Top->m;
          params[0] = matrix[0];
@@ -3601,41 +3610,45 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[15] = matrix[15];
          }
          break;
+      case GL_FRAGMENT_PROGRAM_ARB:
+         CHECK_EXT1(ARB_fragment_program, "GetFloatv");
+         params[0] = BOOLEAN_TO_FLOAT(ctx->FragmentProgram.Enabled);
+         break;
       case GL_DEPTH_BOUNDS_TEST_EXT:
-         CHECK_EXTENSION_F(EXT_depth_bounds_test, pname);
+         CHECK_EXT1(EXT_depth_bounds_test, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->Depth.BoundsTest);
          break;
       case GL_DEPTH_BOUNDS_EXT:
-         CHECK_EXTENSION_F(EXT_depth_bounds_test, pname);
+         CHECK_EXT1(EXT_depth_bounds_test, "GetFloatv");
          params[0] = ctx->Depth.BoundsMin;
          params[1] = ctx->Depth.BoundsMax;
          break;
       case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
-         CHECK_EXTENSION_F(MESA_program_debug, pname);
+         CHECK_EXT1(MESA_program_debug, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->FragmentProgram.CallbackEnabled);
          break;
       case GL_VERTEX_PROGRAM_CALLBACK_MESA:
-         CHECK_EXTENSION_F(MESA_program_debug, pname);
+         CHECK_EXT1(MESA_program_debug, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(ctx->VertexProgram.CallbackEnabled);
          break;
       case GL_FRAGMENT_PROGRAM_POSITION_MESA:
-         CHECK_EXTENSION_F(MESA_program_debug, pname);
+         CHECK_EXT1(MESA_program_debug, "GetFloatv");
          params[0] = (GLfloat)(ctx->FragmentProgram.CurrentPosition);
          break;
       case GL_VERTEX_PROGRAM_POSITION_MESA:
-         CHECK_EXTENSION_F(MESA_program_debug, pname);
+         CHECK_EXT1(MESA_program_debug, "GetFloatv");
          params[0] = (GLfloat)(ctx->VertexProgram.CurrentPosition);
          break;
       case GL_MAX_DRAW_BUFFERS_ARB:
-         CHECK_EXTENSION_F(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.MaxDrawBuffers);
          break;
       case GL_DRAW_BUFFER0_ARB:
-         CHECK_EXTENSION_F(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetFloatv");
          params[0] = ENUM_TO_FLOAT(ctx->Color.DrawBuffer[0]);
          break;
       case GL_DRAW_BUFFER1_ARB:
-         CHECK_EXTENSION_F(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetFloatv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -3647,7 +3660,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          }
          break;
       case GL_DRAW_BUFFER2_ARB:
-         CHECK_EXTENSION_F(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetFloatv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -3659,7 +3672,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          }
          break;
       case GL_DRAW_BUFFER3_ARB:
-         CHECK_EXTENSION_F(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetFloatv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -3671,43 +3684,43 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          }
          break;
       case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES:
-         CHECK_EXTENSION_F(OES_read_format, pname);
+         CHECK_EXT1(OES_read_format, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.ColorReadType);
          break;
       case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES:
-         CHECK_EXTENSION_F(OES_read_format, pname);
+         CHECK_EXT1(OES_read_format, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.ColorReadFormat);
          break;
       case GL_NUM_FRAGMENT_REGISTERS_ATI:
-         CHECK_EXTENSION_F(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
          params[0] = (GLfloat)(6);
          break;
       case GL_NUM_FRAGMENT_CONSTANTS_ATI:
-         CHECK_EXTENSION_F(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
          params[0] = (GLfloat)(8);
          break;
       case GL_NUM_PASSES_ATI:
-         CHECK_EXTENSION_F(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
          params[0] = (GLfloat)(2);
          break;
       case GL_NUM_INSTRUCTIONS_PER_PASS_ATI:
-         CHECK_EXTENSION_F(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
          params[0] = (GLfloat)(8);
          break;
       case GL_NUM_INSTRUCTIONS_TOTAL_ATI:
-         CHECK_EXTENSION_F(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
          params[0] = (GLfloat)(16);
          break;
       case GL_COLOR_ALPHA_PAIRING_ATI:
-         CHECK_EXTENSION_F(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
          params[0] = BOOLEAN_TO_FLOAT(GL_TRUE);
          break;
       case GL_NUM_LOOPBACK_COMPONENTS_ATI:
-         CHECK_EXTENSION_F(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
          params[0] = (GLfloat)(3);
          break;
       case GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI:
-         CHECK_EXTENSION_F(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetFloatv");
          params[0] = (GLfloat)(3);
          break;
       case GL_STENCIL_BACK_FUNC:
@@ -3729,43 +3742,43 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params )
          params[0] = ENUM_TO_FLOAT(ctx->Stencil.ZPassFunc[1]);
          break;
       case GL_FRAMEBUFFER_BINDING_EXT:
-         CHECK_EXTENSION_F(EXT_framebuffer_object, pname);
+         CHECK_EXT1(EXT_framebuffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->DrawBuffer->Name);
          break;
       case GL_RENDERBUFFER_BINDING_EXT:
-         CHECK_EXTENSION_F(EXT_framebuffer_object, pname);
+         CHECK_EXT1(EXT_framebuffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0);
          break;
       case GL_MAX_COLOR_ATTACHMENTS_EXT:
-         CHECK_EXTENSION_F(EXT_framebuffer_object, pname);
+         CHECK_EXT1(EXT_framebuffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.MaxColorAttachments);
          break;
       case GL_MAX_RENDERBUFFER_SIZE_EXT:
-         CHECK_EXTENSION_F(EXT_framebuffer_object, pname);
+         CHECK_EXT1(EXT_framebuffer_object, "GetFloatv");
          params[0] = (GLfloat)(ctx->Const.MaxRenderbufferSize);
          break;
       case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
-         CHECK_EXTENSION_F(ARB_fragment_shader, pname);
+         CHECK_EXT1(ARB_fragment_shader, "GetFloatv");
          params[0] = (GLfloat)(MAX_FRAGMENT_UNIFORM_COMPONENTS);
          break;
       case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB:
-         CHECK_EXTENSION_F(ARB_fragment_shader, pname);
+         CHECK_EXT1(ARB_fragment_shader, "GetFloatv");
          params[0] = ENUM_TO_FLOAT(ctx->Hint.FragmentShaderDerivative);
          break;
       case GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_shader, pname);
+         CHECK_EXT1(ARB_vertex_shader, "GetFloatv");
          params[0] = (GLfloat)(MAX_VERTEX_UNIFORM_COMPONENTS);
          break;
       case GL_MAX_VARYING_FLOATS_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_shader, pname);
+         CHECK_EXT1(ARB_vertex_shader, "GetFloatv");
          params[0] = (GLfloat)(MAX_VARYING_FLOATS);
          break;
       case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_shader, pname);
+         CHECK_EXT1(ARB_vertex_shader, "GetFloatv");
          params[0] = (GLfloat)(MAX_VERTEX_TEXTURE_IMAGE_UNITS);
          break;
       case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXTENSION_F(ARB_vertex_shader, pname);
+         CHECK_EXT1(ARB_vertex_shader, "GetFloatv");
          params[0] = (GLfloat)(MAX_COMBINED_TEXTURE_IMAGE_UNITS);
          break;
       default:
@@ -4746,39 +4759,39 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = 0;
          break;
       case GL_MAX_TEXTURE_UNITS_ARB:
-         CHECK_EXTENSION_I(ARB_multitexture, pname);
+         CHECK_EXT1(ARB_multitexture, "GetIntegerv");
          params[0] = MIN2(ctx->Const.MaxTextureImageUnits, ctx->Const.MaxTextureCoordUnits);
          break;
       case GL_ACTIVE_TEXTURE_ARB:
-         CHECK_EXTENSION_I(ARB_multitexture, pname);
+         CHECK_EXT1(ARB_multitexture, "GetIntegerv");
          params[0] = GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit;
          break;
       case GL_CLIENT_ACTIVE_TEXTURE_ARB:
-         CHECK_EXTENSION_I(ARB_multitexture, pname);
+         CHECK_EXT1(ARB_multitexture, "GetIntegerv");
          params[0] = GL_TEXTURE0_ARB + ctx->Array.ActiveTexture;
          break;
       case GL_TEXTURE_CUBE_MAP_ARB:
-         CHECK_EXTENSION_I(ARB_texture_cube_map, pname);
+         CHECK_EXT1(ARB_texture_cube_map, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(_mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB));
          break;
       case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
-         CHECK_EXTENSION_I(ARB_texture_cube_map, pname);
+         CHECK_EXT1(ARB_texture_cube_map, "GetIntegerv");
          params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap->Name;
          break;
       case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
-         CHECK_EXTENSION_I(ARB_texture_cube_map, pname);
+         CHECK_EXT1(ARB_texture_cube_map, "GetIntegerv");
          params[0] = (1 << (ctx->Const.MaxCubeTextureLevels - 1));
          break;
       case GL_TEXTURE_COMPRESSION_HINT_ARB:
-         CHECK_EXTENSION_I(ARB_texture_compression, pname);
+         CHECK_EXT1(ARB_texture_compression, "GetIntegerv");
          params[0] = ctx->Hint.TextureCompression;
          break;
       case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
-         CHECK_EXTENSION_I(ARB_texture_compression, pname);
+         CHECK_EXT1(ARB_texture_compression, "GetIntegerv");
          params[0] = _mesa_get_compressed_formats(ctx, NULL);
          break;
       case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
-         CHECK_EXTENSION_I(ARB_texture_compression, pname);
+         CHECK_EXT1(ARB_texture_compression, "GetIntegerv");
          {
          GLint formats[100];
          GLuint i, n = _mesa_get_compressed_formats(ctx, formats);
@@ -4788,11 +4801,11 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          }
          break;
       case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
-         CHECK_EXTENSION_I(EXT_compiled_vertex_array, pname);
+         CHECK_EXT1(EXT_compiled_vertex_array, "GetIntegerv");
          params[0] = ctx->Array.LockFirst;
          break;
       case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
-         CHECK_EXTENSION_I(EXT_compiled_vertex_array, pname);
+         CHECK_EXT1(EXT_compiled_vertex_array, "GetIntegerv");
          params[0] = ctx->Array.LockCount;
          break;
       case GL_TRANSPOSE_COLOR_MATRIX_ARB:
@@ -4880,11 +4893,11 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          }
          break;
       case GL_OCCLUSION_TEST_HP:
-         CHECK_EXTENSION_I(HP_occlusion_test, pname);
+         CHECK_EXT1(HP_occlusion_test, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Depth.OcclusionTest);
          break;
       case GL_OCCLUSION_TEST_RESULT_HP:
-         CHECK_EXTENSION_I(HP_occlusion_test, pname);
+         CHECK_EXT1(HP_occlusion_test, "GetIntegerv");
          {
          FLUSH_VERTICES(ctx, _NEW_DEPTH);
          if (ctx->Depth.OcclusionTest)
@@ -4898,15 +4911,15 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          }
          break;
       case GL_PIXEL_TEXTURE_SGIS:
-         CHECK_EXTENSION_I(SGIS_pixel_texture, pname);
+         CHECK_EXT1(SGIS_pixel_texture, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Pixel.PixelTextureEnabled);
          break;
       case GL_PIXEL_TEX_GEN_SGIX:
-         CHECK_EXTENSION_I(SGIX_pixel_texture, pname);
+         CHECK_EXT1(SGIX_pixel_texture, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Pixel.PixelTextureEnabled);
          break;
       case GL_PIXEL_TEX_GEN_MODE_SGIX:
-         CHECK_EXTENSION_I(SGIX_pixel_texture, pname);
+         CHECK_EXT1(SGIX_pixel_texture, "GetIntegerv");
          params[0] = ENUM_TO_INT(pixel_texgen_mode(ctx));
          break;
       case GL_COLOR_MATRIX_SGI:
@@ -4961,79 +4974,79 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = IROUND(ctx->Pixel.PostColorMatrixBias[3]);
          break;
       case GL_CONVOLUTION_1D_EXT:
-         CHECK_EXTENSION_I(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Pixel.Convolution1DEnabled);
          break;
       case GL_CONVOLUTION_2D_EXT:
-         CHECK_EXTENSION_I(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Pixel.Convolution2DEnabled);
          break;
       case GL_SEPARABLE_2D_EXT:
-         CHECK_EXTENSION_I(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Pixel.Separable2DEnabled);
          break;
       case GL_POST_CONVOLUTION_RED_SCALE_EXT:
-         CHECK_EXTENSION_I(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetIntegerv");
          params[0] = IROUND(ctx->Pixel.PostConvolutionScale[0]);
          break;
       case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
-         CHECK_EXTENSION_I(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetIntegerv");
          params[0] = IROUND(ctx->Pixel.PostConvolutionScale[1]);
          break;
       case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
-         CHECK_EXTENSION_I(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetIntegerv");
          params[0] = IROUND(ctx->Pixel.PostConvolutionScale[2]);
          break;
       case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
-         CHECK_EXTENSION_I(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetIntegerv");
          params[0] = IROUND(ctx->Pixel.PostConvolutionScale[3]);
          break;
       case GL_POST_CONVOLUTION_RED_BIAS_EXT:
-         CHECK_EXTENSION_I(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetIntegerv");
          params[0] = IROUND(ctx->Pixel.PostConvolutionBias[0]);
          break;
       case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
-         CHECK_EXTENSION_I(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetIntegerv");
          params[0] = IROUND(ctx->Pixel.PostConvolutionBias[1]);
          break;
       case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
-         CHECK_EXTENSION_I(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetIntegerv");
          params[0] = IROUND(ctx->Pixel.PostConvolutionBias[2]);
          break;
       case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
-         CHECK_EXTENSION_I(EXT_convolution, pname);
+         CHECK_EXT1(EXT_convolution, "GetIntegerv");
          params[0] = IROUND(ctx->Pixel.PostConvolutionBias[3]);
          break;
       case GL_HISTOGRAM:
-         CHECK_EXTENSION_I(EXT_histogram, pname);
+         CHECK_EXT1(EXT_histogram, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Pixel.HistogramEnabled);
          break;
       case GL_MINMAX:
-         CHECK_EXTENSION_I(EXT_histogram, pname);
+         CHECK_EXT1(EXT_histogram, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Pixel.MinMaxEnabled);
          break;
       case GL_COLOR_TABLE_SGI:
-         CHECK_EXTENSION_I(SGI_color_table, pname);
+         CHECK_EXT1(SGI_color_table, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Pixel.ColorTableEnabled);
          break;
       case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
-         CHECK_EXTENSION_I(SGI_color_table, pname);
+         CHECK_EXT1(SGI_color_table, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Pixel.PostConvolutionColorTableEnabled);
          break;
       case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
-         CHECK_EXTENSION_I(SGI_color_table, pname);
+         CHECK_EXT1(SGI_color_table, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Pixel.PostColorMatrixColorTableEnabled);
          break;
       case GL_TEXTURE_COLOR_TABLE_SGI:
-         CHECK_EXTENSION_I(SGI_texture_color_table, pname);
+         CHECK_EXT1(SGI_texture_color_table, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled);
          break;
       case GL_COLOR_SUM_EXT:
-         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+         CHECK_EXT2(EXT_secondary_color, ARB_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Fog.ColorSumEnabled);
          break;
       case GL_CURRENT_SECONDARY_COLOR_EXT:
-         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetIntegerv");
          {
          FLUSH_CURRENT(ctx, 0);
          params[0] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0]);
@@ -5043,130 +5056,130 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          }
          break;
       case GL_SECONDARY_COLOR_ARRAY_EXT:
-         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.SecondaryColor.Enabled);
          break;
       case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
-         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetIntegerv");
          params[0] = ENUM_TO_INT(ctx->Array.SecondaryColor.Type);
          break;
       case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
-         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetIntegerv");
          params[0] = ctx->Array.SecondaryColor.Stride;
          break;
       case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
-         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+         CHECK_EXT1(EXT_secondary_color, "GetIntegerv");
          params[0] = ctx->Array.SecondaryColor.Size;
          break;
       case GL_CURRENT_FOG_COORDINATE_EXT:
-         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetIntegerv");
          {
          FLUSH_CURRENT(ctx, 0);
          params[0] = IROUND(ctx->Current.Attrib[VERT_ATTRIB_FOG][0]);
          }
          break;
       case GL_FOG_COORDINATE_ARRAY_EXT:
-         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.FogCoord.Enabled);
          break;
       case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
-         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetIntegerv");
          params[0] = ENUM_TO_INT(ctx->Array.FogCoord.Type);
          break;
       case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
-         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetIntegerv");
          params[0] = ctx->Array.FogCoord.Stride;
          break;
       case GL_FOG_COORDINATE_SOURCE_EXT:
-         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+         CHECK_EXT1(EXT_fog_coord, "GetIntegerv");
          params[0] = ENUM_TO_INT(ctx->Fog.FogCoordinateSource);
          break;
       case GL_MAX_TEXTURE_LOD_BIAS_EXT:
-         CHECK_EXTENSION_I(EXT_texture_lod_bias, pname);
+         CHECK_EXT1(EXT_texture_lod_bias, "GetIntegerv");
          params[0] = IROUND(ctx->Const.MaxTextureLodBias);
          break;
       case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
-         CHECK_EXTENSION_I(EXT_texture_filter_anisotropic, pname);
+         CHECK_EXT1(EXT_texture_filter_anisotropic, "GetIntegerv");
          params[0] = IROUND(ctx->Const.MaxTextureMaxAnisotropy);
          break;
       case GL_MULTISAMPLE_ARB:
-         CHECK_EXTENSION_I(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Multisample.Enabled);
          break;
       case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
-         CHECK_EXTENSION_I(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Multisample.SampleAlphaToCoverage);
          break;
       case GL_SAMPLE_ALPHA_TO_ONE_ARB:
-         CHECK_EXTENSION_I(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Multisample.SampleAlphaToOne);
          break;
       case GL_SAMPLE_COVERAGE_ARB:
-         CHECK_EXTENSION_I(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Multisample.SampleCoverage);
          break;
       case GL_SAMPLE_COVERAGE_VALUE_ARB:
-         CHECK_EXTENSION_I(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = IROUND(ctx->Multisample.SampleCoverageValue);
          break;
       case GL_SAMPLE_COVERAGE_INVERT_ARB:
-         CHECK_EXTENSION_I(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Multisample.SampleCoverageInvert);
          break;
       case GL_SAMPLE_BUFFERS_ARB:
-         CHECK_EXTENSION_I(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = ctx->DrawBuffer->Visual.sampleBuffers;
          break;
       case GL_SAMPLES_ARB:
-         CHECK_EXTENSION_I(ARB_multisample, pname);
+         CHECK_EXT1(ARB_multisample, "GetIntegerv");
          params[0] = ctx->DrawBuffer->Visual.samples;
          break;
       case GL_RASTER_POSITION_UNCLIPPED_IBM:
-         CHECK_EXTENSION_I(IBM_rasterpos_clip, pname);
+         CHECK_EXT1(IBM_rasterpos_clip, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Transform.RasterPositionUnclipped);
          break;
       case GL_POINT_SPRITE_NV:
-         CHECK_EXTENSION_I(NV_point_sprite, pname);
+         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Point.PointSprite);
          break;
       case GL_POINT_SPRITE_R_MODE_NV:
-         CHECK_EXTENSION_I(NV_point_sprite, pname);
+         CHECK_EXT1(NV_point_sprite, "GetIntegerv");
          params[0] = ENUM_TO_INT(ctx->Point.SpriteRMode);
          break;
       case GL_POINT_SPRITE_COORD_ORIGIN:
-         CHECK_EXTENSION_I(NV_point_sprite, pname);
+         CHECK_EXT2(NV_point_sprite, ARB_point_sprite, "GetIntegerv");
          params[0] = ENUM_TO_INT(ctx->Point.SpriteOrigin);
          break;
       case GL_GENERATE_MIPMAP_HINT_SGIS:
-         CHECK_EXTENSION_I(SGIS_generate_mipmap, pname);
+         CHECK_EXT1(SGIS_generate_mipmap, "GetIntegerv");
          params[0] = ENUM_TO_INT(ctx->Hint.GenerateMipmap);
          break;
       case GL_VERTEX_PROGRAM_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT2(NV_vertex_program, ARB_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->VertexProgram.Enabled);
          break;
       case GL_VERTEX_PROGRAM_POINT_SIZE_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT2(NV_vertex_program, ARB_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->VertexProgram.PointSizeEnabled);
          break;
       case GL_VERTEX_PROGRAM_TWO_SIDE_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT2(NV_vertex_program, ARB_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->VertexProgram.TwoSideEnabled);
          break;
       case GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT3(NV_vertex_program, ARB_vertex_program, ARB_fragment_program, "GetIntegerv");
          params[0] = ctx->Const.MaxProgramMatrixStackDepth;
          break;
       case GL_MAX_TRACK_MATRICES_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT3(NV_vertex_program, ARB_vertex_program, ARB_fragment_program, "GetIntegerv");
          params[0] = ctx->Const.MaxProgramMatrices;
          break;
       case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT3(NV_vertex_program, ARB_vertex_program, ARB_fragment_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->CurrentStack->Depth + 1);
          break;
       case GL_CURRENT_MATRIX_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT3(NV_vertex_program, ARB_vertex_program, ARB_fragment_program, "GetIntegerv");
          {
          const GLfloat *matrix = ctx->CurrentStack->Top->m;
          params[0] = IROUND(matrix[0]);
@@ -5188,247 +5201,243 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          }
          break;
       case GL_VERTEX_PROGRAM_BINDING_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = (ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0);
          break;
       case GL_PROGRAM_ERROR_POSITION_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT4(NV_vertex_program, ARB_vertex_program, NV_fragment_program, ARB_fragment_program, "GetIntegerv");
          params[0] = ctx->Program.ErrorPos;
          break;
       case GL_VERTEX_ATTRIB_ARRAY0_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[0].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY1_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[1].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY2_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[2].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY3_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[3].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[4].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY5_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[5].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY6_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[6].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY7_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[7].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY8_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[8].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY9_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[9].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY10_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[10].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY11_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[11].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY12_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[12].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY13_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[13].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY14_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[14].Enabled);
          break;
       case GL_VERTEX_ATTRIB_ARRAY15_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Array.VertexAttrib[15].Enabled);
          break;
       case GL_MAP1_VERTEX_ATTRIB0_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[0]);
          break;
       case GL_MAP1_VERTEX_ATTRIB1_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[1]);
          break;
       case GL_MAP1_VERTEX_ATTRIB2_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[2]);
          break;
       case GL_MAP1_VERTEX_ATTRIB3_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[3]);
          break;
       case GL_MAP1_VERTEX_ATTRIB4_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[4]);
          break;
       case GL_MAP1_VERTEX_ATTRIB5_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[5]);
          break;
       case GL_MAP1_VERTEX_ATTRIB6_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[6]);
          break;
       case GL_MAP1_VERTEX_ATTRIB7_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[7]);
          break;
       case GL_MAP1_VERTEX_ATTRIB8_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[8]);
          break;
       case GL_MAP1_VERTEX_ATTRIB9_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[9]);
          break;
       case GL_MAP1_VERTEX_ATTRIB10_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[10]);
          break;
       case GL_MAP1_VERTEX_ATTRIB11_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[11]);
          break;
       case GL_MAP1_VERTEX_ATTRIB12_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[12]);
          break;
       case GL_MAP1_VERTEX_ATTRIB13_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[13]);
          break;
       case GL_MAP1_VERTEX_ATTRIB14_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[14]);
          break;
       case GL_MAP1_VERTEX_ATTRIB15_4_NV:
-         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         CHECK_EXT1(NV_vertex_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Eval.Map1Attrib[15]);
          break;
       case GL_FRAGMENT_PROGRAM_NV:
-         CHECK_EXTENSION_I(NV_fragment_program, pname);
+         CHECK_EXT1(NV_fragment_program, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->FragmentProgram.Enabled);
          break;
       case GL_MAX_TEXTURE_COORDS_NV:
-         CHECK_EXTENSION_I(NV_fragment_program, pname);
+         CHECK_EXT2(NV_fragment_program, ARB_fragment_program, "GetIntegerv");
          params[0] = ctx->Const.MaxTextureCoordUnits;
          break;
       case GL_MAX_TEXTURE_IMAGE_UNITS_NV:
-         CHECK_EXTENSION_I(NV_fragment_program, pname);
+         CHECK_EXT2(NV_fragment_program, ARB_fragment_program, "GetIntegerv");
          params[0] = ctx->Const.MaxTextureImageUnits;
          break;
       case GL_FRAGMENT_PROGRAM_BINDING_NV:
-         CHECK_EXTENSION_I(NV_fragment_program, pname);
+         CHECK_EXT1(NV_fragment_program, "GetIntegerv");
          params[0] = ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0;
          break;
       case GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV:
-         CHECK_EXTENSION_I(NV_fragment_program, pname);
+         CHECK_EXT1(NV_fragment_program, "GetIntegerv");
          params[0] = MAX_NV_FRAGMENT_PROGRAM_PARAMS;
          break;
       case GL_TEXTURE_RECTANGLE_NV:
-         CHECK_EXTENSION_I(NV_texture_rectangle, pname);
+         CHECK_EXT1(NV_texture_rectangle, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(_mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV));
          break;
       case GL_TEXTURE_BINDING_RECTANGLE_NV:
-         CHECK_EXTENSION_I(NV_texture_rectangle, pname);
+         CHECK_EXT1(NV_texture_rectangle, "GetIntegerv");
          params[0] = ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentRect->Name;
          break;
       case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
-         CHECK_EXTENSION_I(NV_texture_rectangle, pname);
+         CHECK_EXT1(NV_texture_rectangle, "GetIntegerv");
          params[0] = ctx->Const.MaxTextureRectSize;
          break;
       case GL_STENCIL_TEST_TWO_SIDE_EXT:
-         CHECK_EXTENSION_I(EXT_stencil_two_side, pname);
+         CHECK_EXT1(EXT_stencil_two_side, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Stencil.TestTwoSide);
          break;
       case GL_ACTIVE_STENCIL_FACE_EXT:
-         CHECK_EXTENSION_I(EXT_stencil_two_side, pname);
+         CHECK_EXT1(EXT_stencil_two_side, "GetIntegerv");
          params[0] = ENUM_TO_INT(ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT);
          break;
       case GL_MAX_SHININESS_NV:
-         CHECK_EXTENSION_I(NV_light_max_exponent, pname);
+         CHECK_EXT1(NV_light_max_exponent, "GetIntegerv");
          params[0] = IROUND(ctx->Const.MaxShininess);
          break;
       case GL_MAX_SPOT_EXPONENT_NV:
-         CHECK_EXTENSION_I(NV_light_max_exponent, pname);
+         CHECK_EXT1(NV_light_max_exponent, "GetIntegerv");
          params[0] = IROUND(ctx->Const.MaxSpotExponent);
          break;
       case GL_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.ArrayBufferObj->Name;
          break;
       case GL_VERTEX_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.Vertex.BufferObj->Name;
          break;
       case GL_NORMAL_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.Normal.BufferObj->Name;
          break;
       case GL_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.Color.BufferObj->Name;
          break;
       case GL_INDEX_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.Index.BufferObj->Name;
          break;
       case GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.TexCoord[ctx->Array.ActiveTexture].BufferObj->Name;
          break;
       case GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.EdgeFlag.BufferObj->Name;
          break;
       case GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.SecondaryColor.BufferObj->Name;
          break;
       case GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.FogCoord.BufferObj->Name;
          break;
       case GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_buffer_object, pname);
+         CHECK_EXT1(ARB_vertex_buffer_object, "GetIntegerv");
          params[0] = ctx->Array.ElementArrayBufferObj->Name;
          break;
       case GL_PIXEL_PACK_BUFFER_BINDING_EXT:
-         CHECK_EXTENSION_I(EXT_pixel_buffer_object, pname);
+         CHECK_EXT1(EXT_pixel_buffer_object, "GetIntegerv");
          params[0] = ctx->Pack.BufferObj->Name;
          break;
       case GL_PIXEL_UNPACK_BUFFER_BINDING_EXT:
-         CHECK_EXTENSION_I(EXT_pixel_buffer_object, pname);
+         CHECK_EXT1(EXT_pixel_buffer_object, "GetIntegerv");
          params[0] = ctx->Unpack.BufferObj->Name;
          break;
       case GL_MAX_VERTEX_ATTRIBS_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_program, pname);
+         CHECK_EXT1(ARB_vertex_program, "GetIntegerv");
          params[0] = ctx->Const.MaxVertexProgramAttribs;
          break;
-      case GL_FRAGMENT_PROGRAM_ARB:
-         CHECK_EXTENSION_I(ARB_fragment_program, pname);
-         params[0] = BOOLEAN_TO_INT(ctx->FragmentProgram.Enabled);
-         break;
       case GL_TRANSPOSE_CURRENT_MATRIX_ARB:
-         CHECK_EXTENSION_I(ARB_fragment_program, pname);
+         CHECK_EXT2(ARB_vertex_program, ARB_fragment_program, "GetIntegerv");
          {
          const GLfloat *matrix = ctx->CurrentStack->Top->m;
          params[0] = IROUND(matrix[0]);
@@ -5449,41 +5458,45 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[15] = IROUND(matrix[15]);
          }
          break;
+      case GL_FRAGMENT_PROGRAM_ARB:
+         CHECK_EXT1(ARB_fragment_program, "GetIntegerv");
+         params[0] = BOOLEAN_TO_INT(ctx->FragmentProgram.Enabled);
+         break;
       case GL_DEPTH_BOUNDS_TEST_EXT:
-         CHECK_EXTENSION_I(EXT_depth_bounds_test, pname);
+         CHECK_EXT1(EXT_depth_bounds_test, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->Depth.BoundsTest);
          break;
       case GL_DEPTH_BOUNDS_EXT:
-         CHECK_EXTENSION_I(EXT_depth_bounds_test, pname);
+         CHECK_EXT1(EXT_depth_bounds_test, "GetIntegerv");
          params[0] = IROUND(ctx->Depth.BoundsMin);
          params[1] = IROUND(ctx->Depth.BoundsMax);
          break;
       case GL_FRAGMENT_PROGRAM_CALLBACK_MESA:
-         CHECK_EXTENSION_I(MESA_program_debug, pname);
+         CHECK_EXT1(MESA_program_debug, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->FragmentProgram.CallbackEnabled);
          break;
       case GL_VERTEX_PROGRAM_CALLBACK_MESA:
-         CHECK_EXTENSION_I(MESA_program_debug, pname);
+         CHECK_EXT1(MESA_program_debug, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(ctx->VertexProgram.CallbackEnabled);
          break;
       case GL_FRAGMENT_PROGRAM_POSITION_MESA:
-         CHECK_EXTENSION_I(MESA_program_debug, pname);
+         CHECK_EXT1(MESA_program_debug, "GetIntegerv");
          params[0] = ctx->FragmentProgram.CurrentPosition;
          break;
       case GL_VERTEX_PROGRAM_POSITION_MESA:
-         CHECK_EXTENSION_I(MESA_program_debug, pname);
+         CHECK_EXT1(MESA_program_debug, "GetIntegerv");
          params[0] = ctx->VertexProgram.CurrentPosition;
          break;
       case GL_MAX_DRAW_BUFFERS_ARB:
-         CHECK_EXTENSION_I(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetIntegerv");
          params[0] = ctx->Const.MaxDrawBuffers;
          break;
       case GL_DRAW_BUFFER0_ARB:
-         CHECK_EXTENSION_I(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetIntegerv");
          params[0] = ENUM_TO_INT(ctx->Color.DrawBuffer[0]);
          break;
       case GL_DRAW_BUFFER1_ARB:
-         CHECK_EXTENSION_I(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetIntegerv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -5495,7 +5508,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          }
          break;
       case GL_DRAW_BUFFER2_ARB:
-         CHECK_EXTENSION_I(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetIntegerv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -5507,7 +5520,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          }
          break;
       case GL_DRAW_BUFFER3_ARB:
-         CHECK_EXTENSION_I(ARB_draw_buffers, pname);
+         CHECK_EXT1(ARB_draw_buffers, "GetIntegerv");
          {
          GLenum buffer;
          if (pname - GL_DRAW_BUFFER0_ARB >= ctx->Const.MaxDrawBuffers) {
@@ -5519,43 +5532,43 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          }
          break;
       case GL_IMPLEMENTATION_COLOR_READ_TYPE_OES:
-         CHECK_EXTENSION_I(OES_read_format, pname);
+         CHECK_EXT1(OES_read_format, "GetIntegerv");
          params[0] = ctx->Const.ColorReadType;
          break;
       case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES:
-         CHECK_EXTENSION_I(OES_read_format, pname);
+         CHECK_EXT1(OES_read_format, "GetIntegerv");
          params[0] = ctx->Const.ColorReadFormat;
          break;
       case GL_NUM_FRAGMENT_REGISTERS_ATI:
-         CHECK_EXTENSION_I(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
          params[0] = 6;
          break;
       case GL_NUM_FRAGMENT_CONSTANTS_ATI:
-         CHECK_EXTENSION_I(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
          params[0] = 8;
          break;
       case GL_NUM_PASSES_ATI:
-         CHECK_EXTENSION_I(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
          params[0] = 2;
          break;
       case GL_NUM_INSTRUCTIONS_PER_PASS_ATI:
-         CHECK_EXTENSION_I(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
          params[0] = 8;
          break;
       case GL_NUM_INSTRUCTIONS_TOTAL_ATI:
-         CHECK_EXTENSION_I(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
          params[0] = 16;
          break;
       case GL_COLOR_ALPHA_PAIRING_ATI:
-         CHECK_EXTENSION_I(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
          params[0] = BOOLEAN_TO_INT(GL_TRUE);
          break;
       case GL_NUM_LOOPBACK_COMPONENTS_ATI:
-         CHECK_EXTENSION_I(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
          params[0] = 3;
          break;
       case GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI:
-         CHECK_EXTENSION_I(ATI_fragment_shader, pname);
+         CHECK_EXT1(ATI_fragment_shader, "GetIntegerv");
          params[0] = 3;
          break;
       case GL_STENCIL_BACK_FUNC:
@@ -5577,43 +5590,43 @@ _mesa_GetIntegerv( GLenum pname, GLint *params )
          params[0] = ENUM_TO_INT(ctx->Stencil.ZPassFunc[1]);
          break;
       case GL_FRAMEBUFFER_BINDING_EXT:
-         CHECK_EXTENSION_I(EXT_framebuffer_object, pname);
+         CHECK_EXT1(EXT_framebuffer_object, "GetIntegerv");
          params[0] = ctx->DrawBuffer->Name;
          break;
       case GL_RENDERBUFFER_BINDING_EXT:
-         CHECK_EXTENSION_I(EXT_framebuffer_object, pname);
+         CHECK_EXT1(EXT_framebuffer_object, "GetIntegerv");
          params[0] = ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0;
          break;
       case GL_MAX_COLOR_ATTACHMENTS_EXT:
-         CHECK_EXTENSION_I(EXT_framebuffer_object, pname);
+         CHECK_EXT1(EXT_framebuffer_object, "GetIntegerv");
          params[0] = ctx->Const.MaxColorAttachments;
          break;
       case GL_MAX_RENDERBUFFER_SIZE_EXT:
-         CHECK_EXTENSION_I(EXT_framebuffer_object, pname);
+         CHECK_EXT1(EXT_framebuffer_object, "GetIntegerv");
          params[0] = ctx->Const.MaxRenderbufferSize;
          break;
       case GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB:
-         CHECK_EXTENSION_I(ARB_fragment_shader, pname);
+         CHECK_EXT1(ARB_fragment_shader, "GetIntegerv");
          params[0] = MAX_FRAGMENT_UNIFORM_COMPONENTS;
          break;
       case GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB:
-         CHECK_EXTENSION_I(ARB_fragment_shader, pname);
+         CHECK_EXT1(ARB_fragment_shader, "GetIntegerv");
          params[0] = ENUM_TO_INT(ctx->Hint.FragmentShaderDerivative);
          break;
       case GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_shader, pname);
+         CHECK_EXT1(ARB_vertex_shader, "GetIntegerv");
          params[0] = MAX_VERTEX_UNIFORM_COMPONENTS;
          break;
       case GL_MAX_VARYING_FLOATS_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_shader, pname);
+         CHECK_EXT1(ARB_vertex_shader, "GetIntegerv");
          params[0] = MAX_VARYING_FLOATS;
          break;
       case GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_shader, pname);
+         CHECK_EXT1(ARB_vertex_shader, "GetIntegerv");
          params[0] = MAX_VERTEX_TEXTURE_IMAGE_UNITS;
          break;
       case GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB:
-         CHECK_EXTENSION_I(ARB_vertex_shader, pname);
+         CHECK_EXT1(ARB_vertex_shader, "GetIntegerv");
          params[0] = MAX_COMBINED_TEXTURE_IMAGE_UNITS;
          break;
       default:
diff --git a/src/mesa/main/get_gen.py b/src/mesa/main/get_gen.py
index 20c854a3f14..a2254ab804f 100644
--- a/src/mesa/main/get_gen.py
+++ b/src/mesa/main/get_gen.py
@@ -51,7 +51,7 @@ TypeStrings = {
 #  - the state datatype, one of GLint, GLfloat, GLboolean or GLenum
 #  - list of code fragments to get the state, such as ["ctx->Foo.Bar"]
 #  - optional extra code or empty string
-#  - optional extension to check, or None  (XXX this should be a list!)
+#  - optional extensions to check, or None
 #
 StateVars = [
 	( "GL_ACCUM_RED_BITS", GLint, ["ctx->DrawBuffer->Visual.accumRedBits"],
@@ -496,27 +496,27 @@ StateVars = [
 	# GL_ARB_multitexture
 	( "GL_MAX_TEXTURE_UNITS_ARB", GLint,
 	  ["MIN2(ctx->Const.MaxTextureImageUnits, ctx->Const.MaxTextureCoordUnits)"],
-	  "", "ARB_multitexture" ),
+	  "", ["ARB_multitexture"] ),
 	( "GL_ACTIVE_TEXTURE_ARB", GLint,
-	  [ "GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit"], "", "ARB_multitexture" ),
+	  [ "GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit"], "", ["ARB_multitexture"] ),
 	( "GL_CLIENT_ACTIVE_TEXTURE_ARB", GLint,
-	  ["GL_TEXTURE0_ARB + ctx->Array.ActiveTexture"], "", "ARB_multitexture" ),
+	  ["GL_TEXTURE0_ARB + ctx->Array.ActiveTexture"], "", ["ARB_multitexture"] ),
 
 	# GL_ARB_texture_cube_map
 	( "GL_TEXTURE_CUBE_MAP_ARB", GLboolean,
-	  ["_mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB)"], "", "ARB_texture_cube_map" ),
+	  ["_mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB)"], "", ["ARB_texture_cube_map"] ),
 	( "GL_TEXTURE_BINDING_CUBE_MAP_ARB", GLint,
 	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentCubeMap->Name"],
-	  "", "ARB_texture_cube_map" ),
+	  "", ["ARB_texture_cube_map"] ),
 	( "GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB", GLint,
 	  ["(1 << (ctx->Const.MaxCubeTextureLevels - 1))"],
-	  "", "ARB_texture_cube_map"),
+	  "", ["ARB_texture_cube_map"]),
 
 	# GL_ARB_texture_compression */
 	( "GL_TEXTURE_COMPRESSION_HINT_ARB", GLint,
-	  ["ctx->Hint.TextureCompression"], "", "ARB_texture_compression" ),
+	  ["ctx->Hint.TextureCompression"], "", ["ARB_texture_compression"] ),
 	( "GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB", GLint,
-	  ["_mesa_get_compressed_formats(ctx, NULL)"], "", "ARB_texture_compression" ),
+	  ["_mesa_get_compressed_formats(ctx, NULL)"], "", ["ARB_texture_compression"] ),
 	( "GL_COMPRESSED_TEXTURE_FORMATS_ARB", GLenum,
 	  [],
 	  """GLint formats[100];
@@ -524,13 +524,13 @@ StateVars = [
          ASSERT(n <= 100);
          for (i = 0; i < n; i++)
             params[i] = ENUM_TO_INT(formats[i]);""",
-	  "ARB_texture_compression" ),
+	  ["ARB_texture_compression"] ),
 
 	# GL_EXT_compiled_vertex_array
 	( "GL_ARRAY_ELEMENT_LOCK_FIRST_EXT", GLint, ["ctx->Array.LockFirst"],
-	  "", "EXT_compiled_vertex_array" ),
+	  "", ["EXT_compiled_vertex_array"] ),
 	( "GL_ARRAY_ELEMENT_LOCK_COUNT_EXT", GLint, ["ctx->Array.LockCount"],
-	  "", "EXT_compiled_vertex_array" ),
+	  "", ["EXT_compiled_vertex_array"] ),
 
 	# GL_ARB_transpose_matrix
 	( "GL_TRANSPOSE_COLOR_MATRIX_ARB", GLfloat,
@@ -560,7 +560,7 @@ StateVars = [
 
 	# GL_HP_occlusion_test
 	( "GL_OCCLUSION_TEST_HP", GLboolean, ["ctx->Depth.OcclusionTest"], "",
-	  "HP_occlusion_test" ),
+	  ["HP_occlusion_test"] ),
 	( "GL_OCCLUSION_TEST_RESULT_HP", GLboolean, [],
 	  """FLUSH_VERTICES(ctx, _NEW_DEPTH);
          if (ctx->Depth.OcclusionTest)
@@ -571,17 +571,17 @@ StateVars = [
          ctx->OcclusionResult = GL_FALSE;
          ctx->OcclusionResultSaved = GL_FALSE;
          return;""",
-	  "HP_occlusion_test" ),
+	  ["HP_occlusion_test"] ),
 
 	# GL_SGIS_pixel_texture
 	( "GL_PIXEL_TEXTURE_SGIS", GLboolean, ["ctx->Pixel.PixelTextureEnabled"],
-	  "", "SGIS_pixel_texture" ),
+	  "", ["SGIS_pixel_texture"] ),
 
 	# GL_SGIX_pixel_texture
 	( "GL_PIXEL_TEX_GEN_SGIX", GLboolean, ["ctx->Pixel.PixelTextureEnabled"],
-	  "", "SGIX_pixel_texture" ),
+	  "", ["SGIX_pixel_texture"] ),
 	( "GL_PIXEL_TEX_GEN_MODE_SGIX", GLenum, ["pixel_texgen_mode(ctx)"],
-	  "", "SGIX_pixel_texture" ),
+	  "", ["SGIX_pixel_texture"] ),
 
 	# GL_SGI_color_matrix (also in 1.2 imaging)
 	( "GL_COLOR_MATRIX_SGI", GLfloat,
@@ -613,311 +613,325 @@ StateVars = [
 
 	# GL_EXT_convolution (also in 1.2 imaging)
 	( "GL_CONVOLUTION_1D_EXT", GLboolean,
-	  ["ctx->Pixel.Convolution1DEnabled"], "", "EXT_convolution" ),
+	  ["ctx->Pixel.Convolution1DEnabled"], "", ["EXT_convolution"] ),
 	( "GL_CONVOLUTION_2D_EXT", GLboolean,
-	  ["ctx->Pixel.Convolution2DEnabled"], "", "EXT_convolution" ),
+	  ["ctx->Pixel.Convolution2DEnabled"], "", ["EXT_convolution"] ),
 	( "GL_SEPARABLE_2D_EXT", GLboolean,
-	  ["ctx->Pixel.Separable2DEnabled"], "", "EXT_convolution" ),
+	  ["ctx->Pixel.Separable2DEnabled"], "", ["EXT_convolution"] ),
 	( "GL_POST_CONVOLUTION_RED_SCALE_EXT", GLfloat,
-	  ["ctx->Pixel.PostConvolutionScale[0]"], "", "EXT_convolution" ),
+	  ["ctx->Pixel.PostConvolutionScale[0]"], "", ["EXT_convolution"] ),
 	( "GL_POST_CONVOLUTION_GREEN_SCALE_EXT", GLfloat,
-	  ["ctx->Pixel.PostConvolutionScale[1]"], "", "EXT_convolution" ),
+	  ["ctx->Pixel.PostConvolutionScale[1]"], "", ["EXT_convolution"] ),
 	( "GL_POST_CONVOLUTION_BLUE_SCALE_EXT", GLfloat,
-	  ["ctx->Pixel.PostConvolutionScale[2]"], "", "EXT_convolution" ),
+	  ["ctx->Pixel.PostConvolutionScale[2]"], "", ["EXT_convolution"] ),
 	( "GL_POST_CONVOLUTION_ALPHA_SCALE_EXT", GLfloat,
-	  ["ctx->Pixel.PostConvolutionScale[3]"], "", "EXT_convolution" ),
+	  ["ctx->Pixel.PostConvolutionScale[3]"], "", ["EXT_convolution"] ),
 	( "GL_POST_CONVOLUTION_RED_BIAS_EXT", GLfloat,
-	  ["ctx->Pixel.PostConvolutionBias[0]"], "", "EXT_convolution" ),
+	  ["ctx->Pixel.PostConvolutionBias[0]"], "", ["EXT_convolution"] ),
 	( "GL_POST_CONVOLUTION_GREEN_BIAS_EXT", GLfloat,
-	  ["ctx->Pixel.PostConvolutionBias[1]"], "", "EXT_convolution" ),
+	  ["ctx->Pixel.PostConvolutionBias[1]"], "", ["EXT_convolution"] ),
 	( "GL_POST_CONVOLUTION_BLUE_BIAS_EXT", GLfloat,
-	  ["ctx->Pixel.PostConvolutionBias[2]"], "", "EXT_convolution" ),
+	  ["ctx->Pixel.PostConvolutionBias[2]"], "", ["EXT_convolution"] ),
 	( "GL_POST_CONVOLUTION_ALPHA_BIAS_EXT", GLfloat,
-	  ["ctx->Pixel.PostConvolutionBias[3]"], "", "EXT_convolution" ),
+	  ["ctx->Pixel.PostConvolutionBias[3]"], "", ["EXT_convolution"] ),
 
 	# GL_EXT_histogram / GL_ARB_imaging
 	( "GL_HISTOGRAM", GLboolean,
-	  [ "ctx->Pixel.HistogramEnabled" ], "", "EXT_histogram" ),
+	  [ "ctx->Pixel.HistogramEnabled" ], "", ["EXT_histogram"] ),
 	( "GL_MINMAX", GLboolean,
-	  [ "ctx->Pixel.MinMaxEnabled" ], "", "EXT_histogram" ),
+	  [ "ctx->Pixel.MinMaxEnabled" ], "", ["EXT_histogram"] ),
 
 	# GL_SGI_color_table / GL_ARB_imaging
 	( "GL_COLOR_TABLE_SGI", GLboolean,
-	  ["ctx->Pixel.ColorTableEnabled"], "", "SGI_color_table" ),
+	  ["ctx->Pixel.ColorTableEnabled"], "", ["SGI_color_table"] ),
 	( "GL_POST_CONVOLUTION_COLOR_TABLE_SGI", GLboolean,
-	  ["ctx->Pixel.PostConvolutionColorTableEnabled"], "", "SGI_color_table" ),
+	  ["ctx->Pixel.PostConvolutionColorTableEnabled"], "", ["SGI_color_table"] ),
 	( "GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI", GLboolean,
-	  ["ctx->Pixel.PostColorMatrixColorTableEnabled"], "", "SGI_color_table" ),
+	  ["ctx->Pixel.PostColorMatrixColorTableEnabled"], "", ["SGI_color_table"] ),
 
 	# GL_SGI_texture_color_table
 	( "GL_TEXTURE_COLOR_TABLE_SGI", GLboolean,
 	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].ColorTableEnabled"],
-	  "", "SGI_texture_color_table" ),
+	  "", ["SGI_texture_color_table"] ),
 
 	# GL_EXT_secondary_color
 	( "GL_COLOR_SUM_EXT", GLboolean,
-	  ["ctx->Fog.ColorSumEnabled"], "", "EXT_secondary_color" ),
+	  ["ctx->Fog.ColorSumEnabled"], "",
+	  ["EXT_secondary_color", "ARB_vertex_program"] ),
 	( "GL_CURRENT_SECONDARY_COLOR_EXT", GLfloatN,
 	  ["ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0]",
 	   "ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1]",
 	   "ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2]",
 	   "ctx->Current.Attrib[VERT_ATTRIB_COLOR1][3]"],
-	  "FLUSH_CURRENT(ctx, 0);", "EXT_secondary_color" ),
+	  "FLUSH_CURRENT(ctx, 0);", ["EXT_secondary_color"] ),
 	( "GL_SECONDARY_COLOR_ARRAY_EXT", GLboolean,
-	  ["ctx->Array.SecondaryColor.Enabled"], "", "EXT_secondary_color" ),
+	  ["ctx->Array.SecondaryColor.Enabled"], "", ["EXT_secondary_color"] ),
 	( "GL_SECONDARY_COLOR_ARRAY_TYPE_EXT", GLenum,
-	  ["ctx->Array.SecondaryColor.Type"], "",  "EXT_secondary_color" ),
+	  ["ctx->Array.SecondaryColor.Type"], "",  ["EXT_secondary_color"] ),
 	( "GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT", GLint,
-	  ["ctx->Array.SecondaryColor.Stride"], "", "EXT_secondary_color" ),
+	  ["ctx->Array.SecondaryColor.Stride"], "", ["EXT_secondary_color"] ),
 	( "GL_SECONDARY_COLOR_ARRAY_SIZE_EXT", GLint,
-	  ["ctx->Array.SecondaryColor.Size"], "", "EXT_secondary_color" ),
+	  ["ctx->Array.SecondaryColor.Size"], "", ["EXT_secondary_color"] ),
 
 	# GL_EXT_fog_coord
 	( "GL_CURRENT_FOG_COORDINATE_EXT", GLfloat,
 	  ["ctx->Current.Attrib[VERT_ATTRIB_FOG][0]"],
-	  "FLUSH_CURRENT(ctx, 0);", "EXT_fog_coord" ),
+	  "FLUSH_CURRENT(ctx, 0);", ["EXT_fog_coord"] ),
 	( "GL_FOG_COORDINATE_ARRAY_EXT", GLboolean, ["ctx->Array.FogCoord.Enabled"],
-	  "",  "EXT_fog_coord" ),
+	  "",  ["EXT_fog_coord"] ),
 	( "GL_FOG_COORDINATE_ARRAY_TYPE_EXT", GLenum, ["ctx->Array.FogCoord.Type"],
-	  "", "EXT_fog_coord" ),
+	  "", ["EXT_fog_coord"] ),
 	( "GL_FOG_COORDINATE_ARRAY_STRIDE_EXT", GLint, ["ctx->Array.FogCoord.Stride"],
-	  "", "EXT_fog_coord" ),
+	  "", ["EXT_fog_coord"] ),
 	( "GL_FOG_COORDINATE_SOURCE_EXT", GLenum, ["ctx->Fog.FogCoordinateSource"],
-	  "", "EXT_fog_coord" ),
+	  "", ["EXT_fog_coord"] ),
 
 	# GL_EXT_texture_lod_bias
 	( "GL_MAX_TEXTURE_LOD_BIAS_EXT", GLfloat,
-	  ["ctx->Const.MaxTextureLodBias"], "", "EXT_texture_lod_bias"),
+	  ["ctx->Const.MaxTextureLodBias"], "", ["EXT_texture_lod_bias"]),
 
 	# GL_EXT_texture_filter_anisotropic
 	( "GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT", GLfloat,
-	  ["ctx->Const.MaxTextureMaxAnisotropy"], "", "EXT_texture_filter_anisotropic"),
+	  ["ctx->Const.MaxTextureMaxAnisotropy"], "", ["EXT_texture_filter_anisotropic"]),
 
 	# GL_ARB_multisample
 	( "GL_MULTISAMPLE_ARB", GLboolean,
-	  ["ctx->Multisample.Enabled"], "", "ARB_multisample" ),
+	  ["ctx->Multisample.Enabled"], "", ["ARB_multisample"] ),
 	( "GL_SAMPLE_ALPHA_TO_COVERAGE_ARB", GLboolean,
-	  ["ctx->Multisample.SampleAlphaToCoverage"], "", "ARB_multisample" ),
+	  ["ctx->Multisample.SampleAlphaToCoverage"], "", ["ARB_multisample"] ),
 	( "GL_SAMPLE_ALPHA_TO_ONE_ARB", GLboolean,
-	  ["ctx->Multisample.SampleAlphaToOne"], "", "ARB_multisample" ),
+	  ["ctx->Multisample.SampleAlphaToOne"], "", ["ARB_multisample"] ),
 	( "GL_SAMPLE_COVERAGE_ARB", GLboolean,
-	  ["ctx->Multisample.SampleCoverage"], "", "ARB_multisample" ),
+	  ["ctx->Multisample.SampleCoverage"], "", ["ARB_multisample"] ),
 	( "GL_SAMPLE_COVERAGE_VALUE_ARB", GLfloat,
-	  ["ctx->Multisample.SampleCoverageValue"], "", "ARB_multisample" ),
+	  ["ctx->Multisample.SampleCoverageValue"], "", ["ARB_multisample"] ),
 	( "GL_SAMPLE_COVERAGE_INVERT_ARB", GLboolean,
-	  ["ctx->Multisample.SampleCoverageInvert"], "", "ARB_multisample" ),
+	  ["ctx->Multisample.SampleCoverageInvert"], "", ["ARB_multisample"] ),
 	( "GL_SAMPLE_BUFFERS_ARB", GLint,
-	  ["ctx->DrawBuffer->Visual.sampleBuffers"], "", "ARB_multisample" ),
+	  ["ctx->DrawBuffer->Visual.sampleBuffers"], "", ["ARB_multisample"] ),
 	( "GL_SAMPLES_ARB", GLint,
-	  ["ctx->DrawBuffer->Visual.samples"], "", "ARB_multisample" ),
+	  ["ctx->DrawBuffer->Visual.samples"], "", ["ARB_multisample"] ),
 
 	# GL_IBM_rasterpos_clip
 	( "GL_RASTER_POSITION_UNCLIPPED_IBM", GLboolean,
-	  ["ctx->Transform.RasterPositionUnclipped"], "", "IBM_rasterpos_clip" ),
+	  ["ctx->Transform.RasterPositionUnclipped"], "", ["IBM_rasterpos_clip"] ),
 
 	# GL_NV_point_sprite
-	( "GL_POINT_SPRITE_NV", GLboolean, ["ctx->Point.PointSprite"],
-	  "", "NV_point_sprite" ), # OR ARB_point_sprite
+	( "GL_POINT_SPRITE_NV", GLboolean, ["ctx->Point.PointSprite"], # == GL_POINT_SPRITE_ARB
+	  "", ["NV_point_sprite", "ARB_point_sprite"] ),
 	( "GL_POINT_SPRITE_R_MODE_NV", GLenum, ["ctx->Point.SpriteRMode"],
-	  "", "NV_point_sprite" ), # OR ARB_point_sprite
+	  "", ["NV_point_sprite"] ),
 	( "GL_POINT_SPRITE_COORD_ORIGIN", GLenum, ["ctx->Point.SpriteOrigin"],
-	  "", "NV_point_sprite" ), # OR ARB_point_sprite
+	  "", ["NV_point_sprite", "ARB_point_sprite"] ),
 
 	# GL_SGIS_generate_mipmap
 	( "GL_GENERATE_MIPMAP_HINT_SGIS", GLenum, ["ctx->Hint.GenerateMipmap"],
-	  "", "SGIS_generate_mipmap" ),
+	  "", ["SGIS_generate_mipmap"] ),
 
 	# GL_NV_vertex_program
 	( "GL_VERTEX_PROGRAM_NV", GLboolean,
-	  ["ctx->VertexProgram.Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->VertexProgram.Enabled"], "",
+	  ["NV_vertex_program", "ARB_vertex_program"] ),
 	( "GL_VERTEX_PROGRAM_POINT_SIZE_NV", GLboolean,
-	  ["ctx->VertexProgram.PointSizeEnabled"], "", "NV_vertex_program" ),
+	  ["ctx->VertexProgram.PointSizeEnabled"], "",
+	  ["NV_vertex_program", "ARB_vertex_program"] ),
 	( "GL_VERTEX_PROGRAM_TWO_SIDE_NV", GLboolean,
-	  ["ctx->VertexProgram.TwoSideEnabled"], "", "NV_vertex_program" ),
+	  ["ctx->VertexProgram.TwoSideEnabled"], "",
+	  ["NV_vertex_program", "ARB_vertex_program"] ),
 	( "GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV", GLint,
-	  ["ctx->Const.MaxProgramMatrixStackDepth"], "", "NV_vertex_program" ),
+	  ["ctx->Const.MaxProgramMatrixStackDepth"], "",
+	  ["NV_vertex_program", "ARB_vertex_program", "ARB_fragment_program"] ),
 	( "GL_MAX_TRACK_MATRICES_NV", GLint,
-	  ["ctx->Const.MaxProgramMatrices"], "", "NV_vertex_program" ),
+	  ["ctx->Const.MaxProgramMatrices"], "",
+	  ["NV_vertex_program", "ARB_vertex_program", "ARB_fragment_program"] ),
 	( "GL_CURRENT_MATRIX_STACK_DEPTH_NV", GLboolean,
-	  ["ctx->CurrentStack->Depth + 1"], "", "NV_vertex_program" ),
+	  ["ctx->CurrentStack->Depth + 1"], "",
+	  ["NV_vertex_program", "ARB_vertex_program", "ARB_fragment_program"] ),
 	( "GL_CURRENT_MATRIX_NV", GLfloat,
 	  ["matrix[0]", "matrix[1]", "matrix[2]", "matrix[3]",
 	   "matrix[4]", "matrix[5]", "matrix[6]", "matrix[7]",
 	   "matrix[8]", "matrix[9]", "matrix[10]", "matrix[11]",
 	   "matrix[12]", "matrix[13]", "matrix[14]", "matrix[15]" ],
-	  "const GLfloat *matrix = ctx->CurrentStack->Top->m;", "NV_vertex_program" ),
+	  "const GLfloat *matrix = ctx->CurrentStack->Top->m;",
+	  ["NV_vertex_program", "ARB_vertex_program", "ARB_fragment_program"] ),
 	( "GL_VERTEX_PROGRAM_BINDING_NV", GLint,
 	  ["(ctx->VertexProgram.Current ? ctx->VertexProgram.Current->Base.Id : 0)"],
-	  "", "NV_vertex_program" ),
+	  "", ["NV_vertex_program"] ),
 	( "GL_PROGRAM_ERROR_POSITION_NV", GLint,
-	  ["ctx->Program.ErrorPos"], "", "NV_vertex_program" ),
+	  ["ctx->Program.ErrorPos"], "", ["NV_vertex_program",
+	   "ARB_vertex_program", "NV_fragment_program", "ARB_fragment_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY0_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[0].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[0].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY1_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[1].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[1].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY2_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[2].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[2].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY3_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[3].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[3].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY4_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[4].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[4].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY5_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[5].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[5].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY6_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[6].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[6].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY7_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[7].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[7].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY8_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[8].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[8].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY9_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[9].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[9].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY10_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[10].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[10].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY11_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[11].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[11].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY12_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[12].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[12].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY13_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[13].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[13].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY14_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[14].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[14].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_VERTEX_ATTRIB_ARRAY15_NV", GLboolean,
-	  ["ctx->Array.VertexAttrib[15].Enabled"], "", "NV_vertex_program" ),
+	  ["ctx->Array.VertexAttrib[15].Enabled"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB0_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[0]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[0]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB1_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[1]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[1]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB2_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[2]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[2]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB3_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[3]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[3]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB4_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[4]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[4]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB5_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[5]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[5]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB6_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[6]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[6]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB7_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[7]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[7]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB8_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[8]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[8]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB9_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[9]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[9]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB10_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[10]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[10]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB11_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[11]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[11]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB12_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[12]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[12]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB13_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[13]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[13]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB14_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[14]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[14]"], "", ["NV_vertex_program"] ),
 	( "GL_MAP1_VERTEX_ATTRIB15_4_NV", GLboolean,
-	  ["ctx->Eval.Map1Attrib[15]"], "", "NV_vertex_program" ),
+	  ["ctx->Eval.Map1Attrib[15]"], "", ["NV_vertex_program"] ),
 
 	# GL_NV_fragment_program
 	( "GL_FRAGMENT_PROGRAM_NV", GLboolean,
-	  ["ctx->FragmentProgram.Enabled"], "", "NV_fragment_program" ),
+	  ["ctx->FragmentProgram.Enabled"], "", ["NV_fragment_program"] ),
 	( "GL_MAX_TEXTURE_COORDS_NV", GLint,
-	  ["ctx->Const.MaxTextureCoordUnits"], "", "NV_fragment_program" ),
+	  ["ctx->Const.MaxTextureCoordUnits"], "",
+	  ["NV_fragment_program", "ARB_fragment_program"] ),
 	( "GL_MAX_TEXTURE_IMAGE_UNITS_NV", GLint,
-	  ["ctx->Const.MaxTextureImageUnits"], "", "NV_fragment_program" ),
+	  ["ctx->Const.MaxTextureImageUnits"], "",
+	  ["NV_fragment_program", "ARB_fragment_program"] ),
 	( "GL_FRAGMENT_PROGRAM_BINDING_NV", GLint,
 	  ["ctx->FragmentProgram.Current ? ctx->FragmentProgram.Current->Base.Id : 0"],
-	  "", "NV_fragment_program" ),
+	  "", ["NV_fragment_program"] ),
 	( "GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV", GLint,
-	  ["MAX_NV_FRAGMENT_PROGRAM_PARAMS"], "", "NV_fragment_program" ),
+	  ["MAX_NV_FRAGMENT_PROGRAM_PARAMS"], "", ["NV_fragment_program"] ),
 
 	# GL_NV_texture_rectangle
 	( "GL_TEXTURE_RECTANGLE_NV", GLboolean,
-	  ["_mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV)"], "", "NV_texture_rectangle" ),
+	  ["_mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV)"], "", ["NV_texture_rectangle"] ),
 	( "GL_TEXTURE_BINDING_RECTANGLE_NV", GLint,
 	  ["ctx->Texture.Unit[ctx->Texture.CurrentUnit].CurrentRect->Name"],
-	  "", "NV_texture_rectangle" ),
+	  "", ["NV_texture_rectangle"] ),
 	( "GL_MAX_RECTANGLE_TEXTURE_SIZE_NV", GLint,
-	  ["ctx->Const.MaxTextureRectSize"], "", "NV_texture_rectangle" ),
+	  ["ctx->Const.MaxTextureRectSize"], "", ["NV_texture_rectangle"] ),
 
 	# GL_EXT_stencil_two_side
 	( "GL_STENCIL_TEST_TWO_SIDE_EXT", GLboolean,
-	  ["ctx->Stencil.TestTwoSide"], "", "EXT_stencil_two_side" ),
+	  ["ctx->Stencil.TestTwoSide"], "", ["EXT_stencil_two_side"] ),
 	( "GL_ACTIVE_STENCIL_FACE_EXT", GLenum,
 	  ["ctx->Stencil.ActiveFace ? GL_BACK : GL_FRONT"],
-	  "", "EXT_stencil_two_side" ),
+	  "", ["EXT_stencil_two_side"] ),
 
 	# GL_NV_light_max_exponent
 	( "GL_MAX_SHININESS_NV", GLfloat,
-	  ["ctx->Const.MaxShininess"], "", "NV_light_max_exponent" ),
+	  ["ctx->Const.MaxShininess"], "", ["NV_light_max_exponent"] ),
 	( "GL_MAX_SPOT_EXPONENT_NV", GLfloat,
-	  ["ctx->Const.MaxSpotExponent"], "", "NV_light_max_exponent" ),
+	  ["ctx->Const.MaxSpotExponent"], "", ["NV_light_max_exponent"] ),
 
 	# GL_ARB_vertex_buffer_object
 	( "GL_ARRAY_BUFFER_BINDING_ARB", GLint,
-	  ["ctx->Array.ArrayBufferObj->Name"], "", "ARB_vertex_buffer_object" ),
+	  ["ctx->Array.ArrayBufferObj->Name"], "", ["ARB_vertex_buffer_object"] ),
 	( "GL_VERTEX_ARRAY_BUFFER_BINDING_ARB", GLint,
-	  ["ctx->Array.Vertex.BufferObj->Name"], "", "ARB_vertex_buffer_object" ),
+	  ["ctx->Array.Vertex.BufferObj->Name"], "", ["ARB_vertex_buffer_object"] ),
 	( "GL_NORMAL_ARRAY_BUFFER_BINDING_ARB", GLint,
-	  ["ctx->Array.Normal.BufferObj->Name"], "", "ARB_vertex_buffer_object" ),
+	  ["ctx->Array.Normal.BufferObj->Name"], "", ["ARB_vertex_buffer_object"] ),
 	( "GL_COLOR_ARRAY_BUFFER_BINDING_ARB", GLint,
-	  ["ctx->Array.Color.BufferObj->Name"], "", "ARB_vertex_buffer_object" ),
+	  ["ctx->Array.Color.BufferObj->Name"], "", ["ARB_vertex_buffer_object"] ),
 	( "GL_INDEX_ARRAY_BUFFER_BINDING_ARB", GLint,
-	  ["ctx->Array.Index.BufferObj->Name"], "", "ARB_vertex_buffer_object" ),
+	  ["ctx->Array.Index.BufferObj->Name"], "", ["ARB_vertex_buffer_object"] ),
 	( "GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB", GLint,
 	  ["ctx->Array.TexCoord[ctx->Array.ActiveTexture].BufferObj->Name"],
-	  "", "ARB_vertex_buffer_object" ),
+	  "", ["ARB_vertex_buffer_object"] ),
 	( "GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB", GLint,
-	  ["ctx->Array.EdgeFlag.BufferObj->Name"], "", "ARB_vertex_buffer_object" ),
+	  ["ctx->Array.EdgeFlag.BufferObj->Name"], "", ["ARB_vertex_buffer_object"] ),
 	( "GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB", GLint,
 	  ["ctx->Array.SecondaryColor.BufferObj->Name"],
-	  "", "ARB_vertex_buffer_object" ),
+	  "", ["ARB_vertex_buffer_object"] ),
 	( "GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB", GLint,
-	  ["ctx->Array.FogCoord.BufferObj->Name"], "", "ARB_vertex_buffer_object" ),
+	  ["ctx->Array.FogCoord.BufferObj->Name"],
+	  "", ["ARB_vertex_buffer_object"] ),
 	# GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB - not supported
 	( "GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB", GLint,
-	  ["ctx->Array.ElementArrayBufferObj->Name"], "", "ARB_vertex_buffer_object" ),
+	  ["ctx->Array.ElementArrayBufferObj->Name"],
+	  "", ["ARB_vertex_buffer_object"] ),
 
 	# GL_EXT_pixel_buffer_object
 	( "GL_PIXEL_PACK_BUFFER_BINDING_EXT", GLint,
-	  ["ctx->Pack.BufferObj->Name"], "", "EXT_pixel_buffer_object" ),
+	  ["ctx->Pack.BufferObj->Name"], "", ["EXT_pixel_buffer_object"] ),
 	( "GL_PIXEL_UNPACK_BUFFER_BINDING_EXT", GLint,
-	  ["ctx->Unpack.BufferObj->Name"], "", "EXT_pixel_buffer_object" ),
+	  ["ctx->Unpack.BufferObj->Name"], "", ["EXT_pixel_buffer_object"] ),
 
 	# GL_ARB_vertex_program
 	( "GL_MAX_VERTEX_ATTRIBS_ARB", GLint,
-	  ["ctx->Const.MaxVertexProgramAttribs"], "", "ARB_vertex_program" ),
-
-	# GL_ARB_fragment_program
-	( "GL_FRAGMENT_PROGRAM_ARB", GLboolean,
-	  ["ctx->FragmentProgram.Enabled"], "", "ARB_fragment_program" ),
+	  ["ctx->Const.MaxVertexProgramAttribs"], "", ["ARB_vertex_program"] ),
 	( "GL_TRANSPOSE_CURRENT_MATRIX_ARB", GLfloat,
 	  ["matrix[0]", "matrix[4]", "matrix[8]", "matrix[12]",
 	   "matrix[1]", "matrix[5]", "matrix[9]", "matrix[13]",
 	   "matrix[2]", "matrix[6]", "matrix[10]", "matrix[14]",
 	   "matrix[3]", "matrix[7]", "matrix[11]", "matrix[15]"],
-	  "const GLfloat *matrix = ctx->CurrentStack->Top->m;", "ARB_fragment_program" ),
+	  "const GLfloat *matrix = ctx->CurrentStack->Top->m;",
+	  ["ARB_vertex_program", "ARB_fragment_program"] ),
+
+	# GL_ARB_fragment_program
+	( "GL_FRAGMENT_PROGRAM_ARB", GLboolean,
+	  ["ctx->FragmentProgram.Enabled"], "", ["ARB_fragment_program"] ),
 
 	# GL_EXT_depth_bounds_test
 	( "GL_DEPTH_BOUNDS_TEST_EXT", GLboolean,
-	  ["ctx->Depth.BoundsTest"], "", "EXT_depth_bounds_test" ),
+	  ["ctx->Depth.BoundsTest"], "", ["EXT_depth_bounds_test"] ),
 	( "GL_DEPTH_BOUNDS_EXT", GLfloat,
 	  ["ctx->Depth.BoundsMin", "ctx->Depth.BoundsMax"],
-	  "", "EXT_depth_bounds_test" ),
+	  "", ["EXT_depth_bounds_test"] ),
 
 	# GL_MESA_program_debug
 	( "GL_FRAGMENT_PROGRAM_CALLBACK_MESA", GLboolean,
-	  ["ctx->FragmentProgram.CallbackEnabled"], "", "MESA_program_debug" ),
+	  ["ctx->FragmentProgram.CallbackEnabled"], "", ["MESA_program_debug"] ),
 	( "GL_VERTEX_PROGRAM_CALLBACK_MESA", GLboolean,
-	  ["ctx->VertexProgram.CallbackEnabled"], "", "MESA_program_debug" ),
+	  ["ctx->VertexProgram.CallbackEnabled"], "", ["MESA_program_debug"] ),
 	( "GL_FRAGMENT_PROGRAM_POSITION_MESA", GLint,
-	  ["ctx->FragmentProgram.CurrentPosition"], "", "MESA_program_debug" ),
+	  ["ctx->FragmentProgram.CurrentPosition"], "", ["MESA_program_debug"] ),
 	( "GL_VERTEX_PROGRAM_POSITION_MESA", GLint,
-	  ["ctx->VertexProgram.CurrentPosition"], "", "MESA_program_debug" ),
+	  ["ctx->VertexProgram.CurrentPosition"], "", ["MESA_program_debug"] ),
 
 	# GL_ARB_draw_buffers
 	( "GL_MAX_DRAW_BUFFERS_ARB", GLint,
-	  ["ctx->Const.MaxDrawBuffers"], "", "ARB_draw_buffers" ),
+	  ["ctx->Const.MaxDrawBuffers"], "", ["ARB_draw_buffers"] ),
 	( "GL_DRAW_BUFFER0_ARB", GLenum,
-	  ["ctx->Color.DrawBuffer[0]"], "", "ARB_draw_buffers" ),
+	  ["ctx->Color.DrawBuffer[0]"], "", ["ARB_draw_buffers"] ),
 	( "GL_DRAW_BUFFER1_ARB", GLenum,
 	  ["buffer"],
 	  """GLenum buffer;
@@ -925,7 +939,7 @@ StateVars = [
             _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
             return;
          }
-         buffer = ctx->Color.DrawBuffer[1];""", "ARB_draw_buffers" ),
+         buffer = ctx->Color.DrawBuffer[1];""", ["ARB_draw_buffers"] ),
 	( "GL_DRAW_BUFFER2_ARB", GLenum,
 	  ["buffer"],
 	  """GLenum buffer;
@@ -933,7 +947,7 @@ StateVars = [
             _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
             return;
          }
-         buffer = ctx->Color.DrawBuffer[2];""", "ARB_draw_buffers" ),
+         buffer = ctx->Color.DrawBuffer[2];""", ["ARB_draw_buffers"] ),
 	( "GL_DRAW_BUFFER3_ARB", GLenum,
 	  ["buffer"],
 	  """GLenum buffer;
@@ -941,24 +955,24 @@ StateVars = [
             _mesa_error(ctx, GL_INVALID_ENUM, "glGet(GL_DRAW_BUFFERx_ARB)");
             return;
          }
-         buffer = ctx->Color.DrawBuffer[3];""", "ARB_draw_buffers" ),
+         buffer = ctx->Color.DrawBuffer[3];""", ["ARB_draw_buffers"] ),
 	# XXX Add more GL_DRAW_BUFFERn_ARB entries as needed in the future
 
 	# GL_OES_read_format
 	( "GL_IMPLEMENTATION_COLOR_READ_TYPE_OES", GLint,
-	  ["ctx->Const.ColorReadType"], "", "OES_read_format" ),
+	  ["ctx->Const.ColorReadType"], "", ["OES_read_format"] ),
 	( "GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES", GLint,
-	  ["ctx->Const.ColorReadFormat"], "", "OES_read_format" ),
+	  ["ctx->Const.ColorReadFormat"], "", ["OES_read_format"] ),
 
 	# GL_ATI_fragment_shader
-	( "GL_NUM_FRAGMENT_REGISTERS_ATI", GLint, ["6"], "", "ATI_fragment_shader" ),
-	( "GL_NUM_FRAGMENT_CONSTANTS_ATI", GLint, ["8"], "", "ATI_fragment_shader" ),
-	( "GL_NUM_PASSES_ATI", GLint, ["2"], "", "ATI_fragment_shader" ),
-	( "GL_NUM_INSTRUCTIONS_PER_PASS_ATI", GLint, ["8"], "", "ATI_fragment_shader" ),
-	( "GL_NUM_INSTRUCTIONS_TOTAL_ATI", GLint, ["16"], "", "ATI_fragment_shader" ),
-	( "GL_COLOR_ALPHA_PAIRING_ATI", GLboolean, ["GL_TRUE"], "", "ATI_fragment_shader" ),
-	( "GL_NUM_LOOPBACK_COMPONENTS_ATI", GLint, ["3"], "", "ATI_fragment_shader" ),
-	( "GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI", GLint, ["3"], "", "ATI_fragment_shader" ),
+	( "GL_NUM_FRAGMENT_REGISTERS_ATI", GLint, ["6"], "", ["ATI_fragment_shader"] ),
+	( "GL_NUM_FRAGMENT_CONSTANTS_ATI", GLint, ["8"], "", ["ATI_fragment_shader"] ),
+	( "GL_NUM_PASSES_ATI", GLint, ["2"], "", ["ATI_fragment_shader"] ),
+	( "GL_NUM_INSTRUCTIONS_PER_PASS_ATI", GLint, ["8"], "", ["ATI_fragment_shader"] ),
+	( "GL_NUM_INSTRUCTIONS_TOTAL_ATI", GLint, ["16"], "", ["ATI_fragment_shader"] ),
+	( "GL_COLOR_ALPHA_PAIRING_ATI", GLboolean, ["GL_TRUE"], "", ["ATI_fragment_shader"] ),
+	( "GL_NUM_LOOPBACK_COMPONENTS_ATI", GLint, ["3"], "", ["ATI_fragment_shader"] ),
+	( "GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI", GLint, ["3"], "", ["ATI_fragment_shader"] ),
 
 	# OpenGL 2.0
 	( "GL_STENCIL_BACK_FUNC", GLenum, ["ctx->Stencil.Function[1]"], "", None ),
@@ -970,31 +984,32 @@ StateVars = [
 
 	# GL_EXT_framebuffer_object
 	( "GL_FRAMEBUFFER_BINDING_EXT", GLint, ["ctx->DrawBuffer->Name"], "",
-	  "EXT_framebuffer_object" ),
+	  ["EXT_framebuffer_object"] ),
 	( "GL_RENDERBUFFER_BINDING_EXT", GLint,
 	  ["ctx->CurrentRenderbuffer ? ctx->CurrentRenderbuffer->Name : 0"], "",
-	  "EXT_framebuffer_object" ),
+	  ["EXT_framebuffer_object"] ),
 	( "GL_MAX_COLOR_ATTACHMENTS_EXT", GLint,
 	  ["ctx->Const.MaxColorAttachments"], "",
-	  "EXT_framebuffer_object" ),
+	  ["EXT_framebuffer_object"] ),
 	( "GL_MAX_RENDERBUFFER_SIZE_EXT", GLint,
 	  ["ctx->Const.MaxRenderbufferSize"], "",
-	  "EXT_framebuffer_object" ),
+	  ["EXT_framebuffer_object"] ),
 
 	# GL_ARB_fragment_shader
-	( "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB", GLint, ["MAX_FRAGMENT_UNIFORM_COMPONENTS"], "",

-	"ARB_fragment_shader" ),

-	( "GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB", GLenum, ["ctx->Hint.FragmentShaderDerivative"], "",

-	"ARB_fragment_shader" ),

-

-	# GL_ARB_vertex_shader

-	( "GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB", GLint, ["MAX_VERTEX_UNIFORM_COMPONENTS"], "",

-	"ARB_vertex_shader" ),

-	( "GL_MAX_VARYING_FLOATS_ARB", GLint, ["MAX_VARYING_FLOATS"], "", "ARB_vertex_shader" ),

-	( "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB", GLint, ["MAX_VERTEX_TEXTURE_IMAGE_UNITS"], "",

-	"ARB_vertex_shader" ),

-	( "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB", GLint, ["MAX_COMBINED_TEXTURE_IMAGE_UNITS"], "",

-	"ARB_vertex_shader" )
+	( "GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB", GLint,
+	  ["MAX_FRAGMENT_UNIFORM_COMPONENTS"], "", ["ARB_fragment_shader"] ),
+	( "GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB", GLenum,
+	  ["ctx->Hint.FragmentShaderDerivative"], "", ["ARB_fragment_shader"] ),
+
+	# GL_ARB_vertex_shader
+	( "GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB", GLint,
+	  ["MAX_VERTEX_UNIFORM_COMPONENTS"], "", ["ARB_vertex_shader"] ),
+	( "GL_MAX_VARYING_FLOATS_ARB", GLint,
+	  ["MAX_VARYING_FLOATS"], "", ["ARB_vertex_shader"] ),
+	( "GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB", GLint,
+	  ["MAX_VERTEX_TEXTURE_IMAGE_UNITS"], "", ["ARB_vertex_shader"] ),
+	( "GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB", GLint,
+	  ["MAX_COMBINED_TEXTURE_IMAGE_UNITS"], "", ["ARB_vertex_shader"] )
 ]
 
 
@@ -1028,11 +1043,15 @@ def EmitGetFunction(stateVars, returnType):
 	# Capitalize first letter of return type
 	if returnType == GLint:
 		function = "GetIntegerv"
+	elif returnType == GLboolean:
+		function = "GetBooleanv"
+	elif returnType == GLfloat:
+		function = "GetFloatv"
 	else:
-		function = "Get" + string.upper(strType[2]) + strType[3:] + "v"
-	
+		abort()
+
 	print "void GLAPIENTRY"
-	print "_mesa_%s( GLenum pname, %s *params )" % (function, TypeStrings[returnType])
+	print "_mesa_%s( GLenum pname, %s *params )" % (function, strType)
 	print "{"
 	print "   GET_CURRENT_CONTEXT(ctx);"
 	print "   ASSERT_OUTSIDE_BEGIN_END(ctx);"
@@ -1049,12 +1068,22 @@ def EmitGetFunction(stateVars, returnType):
 	print ""
 	print "   switch (pname) {"
 
-	extCheck = "CHECK_EXTENSION_%s" % string.upper(TypeStrings[returnType][2])
-
-	for (name, varType, state, optionalCode, extension) in stateVars:
+	for (name, varType, state, optionalCode, extensions) in stateVars:
 		print "      case " + name + ":"
-		if extension:
-			print "         %s(%s, pname);" % (extCheck, extension)
+		if extensions:
+			if len(extensions) == 1:
+				print ('         CHECK_EXT1(%s, "%s");' %
+					   (extensions[0], function))
+			elif len(extensions) == 2:
+				print ('         CHECK_EXT2(%s, %s, "%s");' %
+					   (extensions[0], extensions[1], function))
+			elif len(extensions) == 3:
+				print ('         CHECK_EXT3(%s, %s, %s, "%s");' %
+					   (extensions[0], extensions[1], extensions[2], function))
+			else:
+				assert len(extensions) == 4
+				print ('         CHECK_EXT4(%s, %s, %s, %s, "%s");' %
+					   (extensions[0], extensions[1], extensions[2], extensions[3], function))
 		if optionalCode:
 			print "         {"
 			print "         " + optionalCode
@@ -1109,30 +1138,43 @@ def EmitHeader():
 #define BOOLEAN_TO_FLOAT(B)   ( (B) ? 1.0F : 0.0F )
 
 
-/* Check if named extension is enabled, if not generate error and return */
-
-#define CHECK1(E1, str, PNAME)                         \\
-   if (!ctx->Extensions.E1) {                          \\
-      _mesa_error(ctx, GL_INVALID_ENUM,                \\
-                  "glGet" str "v(0x%x)", (int) PNAME); \\
-      return;                                          \\
+/*
+ * Check if named extension is enabled, if not generate error and return.
+ */
+#define CHECK_EXT1(EXT1, FUNC)                                         \\
+   if (!ctx->Extensions.EXT1) {                                        \\
+      _mesa_error(ctx, GL_INVALID_ENUM, FUNC "(0x%x)", (int) pname);  \\
+      return;                                                          \\
    }
-    
-#define CHECK2(E1, E2, str, PNAME)                     \\
-   if (!ctx->Extensions.E1 && !ctx->Extensions.E2) {   \\
-      _mesa_error(ctx, GL_INVALID_ENUM,                \\
-                  "glGet" str "v(0x%x)", (int) PNAME); \\
-      return;                                          \\
+
+/*
+ * Check if either of two extensions is enabled.
+ */
+#define CHECK_EXT2(EXT1, EXT2, FUNC)                                   \\
+   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2) {               \\
+      _mesa_error(ctx, GL_INVALID_ENUM, FUNC "(0x%x)", (int) pname);  \\
+      return;                                                          \\
    }
-    
-#define CHECK_EXTENSION_B(EXTNAME, PNAME)      \\
-   CHECK1(EXTNAME, "Boolean", PNAME )
 
-#define CHECK_EXTENSION_I(EXTNAME, PNAME)      \\
-   CHECK1(EXTNAME, "Integer", PNAME )
+/*
+ * Check if either of three extensions is enabled.
+ */
+#define CHECK_EXT3(EXT1, EXT2, EXT3, FUNC)                             \\
+   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2 &&               \\
+       !ctx->Extensions.EXT3) {                                        \\
+      _mesa_error(ctx, GL_INVALID_ENUM, FUNC "(0x%x)", (int) pname);  \\
+      return;                                                          \\
+   }
 
-#define CHECK_EXTENSION_F(EXTNAME, PNAME)      \\
-   CHECK1(EXTNAME, "Float", PNAME )
+/*
+ * Check if either of four extensions is enabled.
+ */
+#define CHECK_EXT4(EXT1, EXT2, EXT3, EXT4, FUNC)                       \\
+   if (!ctx->Extensions.EXT1 && !ctx->Extensions.EXT2 &&               \\
+       !ctx->Extensions.EXT3 && !ctx->Extensions.EXT4) {               \\
+      _mesa_error(ctx, GL_INVALID_ENUM, FUNC "(0x%x)", (int) pname);  \\
+      return;                                                          \\
+   }
 
 
 /**
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c
index 0ccc741dd0c..2826451923d 100644
--- a/src/mesa/shader/program.c
+++ b/src/mesa/shader/program.c
@@ -99,14 +99,14 @@ _mesa_init_program(GLcontext *ctx)
 void
 _mesa_free_program_data(GLcontext *ctx)
 {
-#if FEATURE_NV_vertex_program
+#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program
    if (ctx->VertexProgram.Current) {
       ctx->VertexProgram.Current->Base.RefCount--;
       if (ctx->VertexProgram.Current->Base.RefCount <= 0)
          ctx->Driver.DeleteProgram(ctx, &(ctx->VertexProgram.Current->Base));
    }
 #endif
-#if FEATURE_NV_fragment_program
+#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
    if (ctx->FragmentProgram.Current) {
       ctx->FragmentProgram.Current->Base.RefCount--;
       if (ctx->FragmentProgram.Current->Base.RefCount <= 0)