Moved GL_PROGRAM_ERROR_POSITION_NV state (it's not per-program).

[mesa.git] / src / mesa / main / get.c

diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c
index 65a682c5472984caca905c51796ceb6fedf4cd2b..73e924e6b395c5a245f742cca0e6f9175bc6a084 100644 (file)
--- a/src/mesa/main/get.c
+++ b/src/mesa/main/get.c
@@ -1,21 +1,21 @@
-/* $Id: get.c,v 1.1 1999/08/19 00:55:41 jtg Exp $ */
+/* $Id: get.c,v 1.83 2002/06/18 16:53:46 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
- * 
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
+ * Version:  4.1
+ *
+ * Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -28,20 +28,18 @@
 #ifdef PC_HEADER
 #include "all.h"
 #else
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
+#include "glheader.h"
+#include "colormac.h"
 #include "context.h"
 #include "enable.h"
 #include "enums.h"
+#include "extensions.h"
 #include "get.h"
 #include "macros.h"
 #include "mmath.h"
-#include "types.h"
-#include "vb.h"
-#ifdef XFree86Server
-#include "GL/xf86glx.h"
-#endif
+#include "mtypes.h"
+
+#include "math/m_matrix.h"
 #endif
 
 
@@ -61,25 +59,101 @@
 #endif
 
 
+/* Check if named extension is enabled, if not generate error and return */
+
+#define CHECK_EXTENSION_B(EXTNAME, PNAME)                      \
+   if (!ctx->Extensions.EXTNAME) {                             \
+      char s[100];                                             \
+      sprintf(s, "glGetBooleanv(0x%x)", (int) PNAME);          \
+      _mesa_error(ctx, GL_INVALID_VALUE, s);                   \
+      return;                                                  \
+   }   
+
+#define CHECK_EXTENSION_I(EXTNAME, PNAME)                      \
+   if (!ctx->Extensions.EXTNAME) {                             \
+      char s[100];                                             \
+      sprintf(s, "glGetIntegerv(0x%x)", (int) PNAME);          \
+      _mesa_error(ctx, GL_INVALID_VALUE, s);                   \
+      return;                                                  \
+   }   
+
+#define CHECK_EXTENSION_F(EXTNAME, PNAME)                      \
+   if (!ctx->Extensions.EXTNAME) {                             \
+      char s[100];                                             \
+      sprintf(s, "glGetFloatv(0x%x)", (int) PNAME);            \
+      _mesa_error(ctx, GL_INVALID_VALUE, s);                   \
+      return;                                                  \
+   }   
+
+#define CHECK_EXTENSION_D(EXTNAME, PNAME)                      \
+   if (!ctx->Extensions.EXTNAME) {                             \
+      char s[100];                                             \
+      sprintf(s, "glGetDoublev(0x%x)", (int) PNAME);           \
+      _mesa_error(ctx, GL_INVALID_VALUE, s);                   \
+      return;                                                  \
+   }   
+
+
 
-void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
+
+static GLenum
+pixel_texgen_mode(const GLcontext *ctx)
+{
+   if (ctx->Pixel.FragmentRgbSource == GL_CURRENT_RASTER_POSITION) {
+      if (ctx->Pixel.FragmentAlphaSource == GL_CURRENT_RASTER_POSITION) {
+         return GL_RGBA;
+      }
+      else {
+         return GL_RGB;
+      }
+   }
+   else {
+      if (ctx->Pixel.FragmentAlphaSource == GL_CURRENT_RASTER_POSITION) {
+         return GL_ALPHA;
+      }
+      else {
+         return GL_NONE;
+      }
+   }
+}
+
+
+void
+_mesa_GetBooleanv( GLenum pname, GLboolean *params )
 {
+   GET_CURRENT_CONTEXT(ctx);
    GLuint i;
    GLuint texUnit = ctx->Texture.CurrentUnit;
-   GLuint texTransformUnit = ctx->Texture.CurrentTransformUnit;
    const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!params)
+      return;
 
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetBooleanv");
+   /* We need this in order to get correct results for
+    * GL_OCCLUSION_TEST_RESULT_HP.  There might be other important cases.
+    */
+   FLUSH_VERTICES(ctx, 0);
 
-   if (MESA_VERBOSE & VERBOSE_API) 
-      fprintf(stderr, "glGetBooleanv %s\n", gl_lookup_enum_by_nr(pname));
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetBooleanv %s\n", _mesa_lookup_enum_by_nr(pname));
+
+   if (ctx->Driver.GetBooleanv
+       && (*ctx->Driver.GetBooleanv)(ctx, pname, params))
+      return;
 
    switch (pname) {
       case GL_ACCUM_RED_BITS:
+         *params = INT_TO_BOOL(ctx->Visual.accumRedBits);
+         break;
       case GL_ACCUM_GREEN_BITS:
+         *params = INT_TO_BOOL(ctx->Visual.accumGreenBits);
+         break;
       case GL_ACCUM_BLUE_BITS:
+         *params = INT_TO_BOOL(ctx->Visual.accumBlueBits);
+         break;
       case GL_ACCUM_ALPHA_BITS:
-         *params = INT_TO_BOOL(ctx->Visual->AccumBits);
+         *params = INT_TO_BOOL(ctx->Visual.accumAlphaBits);
          break;
       case GL_ACCUM_CLEAR_VALUE:
          params[0] = FLOAT_TO_BOOL(ctx->Accum.ClearColor[0]);
@@ -91,7 +165,7 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
          *params = FLOAT_TO_BOOL(ctx->Pixel.AlphaBias);
          break;
       case GL_ALPHA_BITS:
-         *params = INT_TO_BOOL(ctx->Visual->AlphaBits);
+         *params = INT_TO_BOOL(ctx->Visual.alphaBits);
          break;
       case GL_ALPHA_SCALE:
          *params = FLOAT_TO_BOOL(ctx->Pixel.AlphaScale);
@@ -103,7 +177,7 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
          *params = ENUM_TO_BOOL(ctx->Color.AlphaFunc);
          break;
       case GL_ALPHA_TEST_REF:
-         *params = FLOAT_TO_BOOL((GLfloat) ctx->Color.AlphaRef / 255.0);
+         *params = FLOAT_TO_BOOL((GLfloat) ctx->Color.AlphaRef / CHAN_MAXF);
          break;
       case GL_ATTRIB_STACK_DEPTH:
          *params = INT_TO_BOOL(ctx->AttribStackDepth);
@@ -112,7 +186,7 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
          *params = ctx->Eval.AutoNormal;
          break;
       case GL_AUX_BUFFERS:
-         *params = (NUM_AUX_BUFFERS) ? GL_TRUE : GL_FALSE;
+         *params = (ctx->Const.NumAuxBuffers) ? GL_TRUE : GL_FALSE;
          break;
       case GL_BLEND:
          *params = ctx->Color.BlendEnabled;
@@ -123,16 +197,16 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
       case GL_BLEND_SRC:
          *params = ENUM_TO_BOOL(ctx->Color.BlendSrcRGB);
          break;
-      case GL_BLEND_SRC_RGB_INGR:
+      case GL_BLEND_SRC_RGB_EXT:
          *params = ENUM_TO_BOOL(ctx->Color.BlendSrcRGB);
          break;
-      case GL_BLEND_DST_RGB_INGR:
+      case GL_BLEND_DST_RGB_EXT:
          *params = ENUM_TO_BOOL(ctx->Color.BlendDstRGB);
          break;
-      case GL_BLEND_SRC_ALPHA_INGR:
+      case GL_BLEND_SRC_ALPHA_EXT:
          *params = ENUM_TO_BOOL(ctx->Color.BlendSrcA);
          break;
-      case GL_BLEND_DST_ALPHA_INGR:
+      case GL_BLEND_DST_ALPHA_EXT:
          *params = ENUM_TO_BOOL(ctx->Color.BlendDstA);
          break;
       case GL_BLEND_EQUATION_EXT:
@@ -148,7 +222,7 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
          *params = FLOAT_TO_BOOL(ctx->Pixel.BlueBias);
          break;
       case GL_BLUE_BITS:
-         *params = INT_TO_BOOL( ctx->Visual->BlueBits );
+         *params = INT_TO_BOOL( ctx->Visual.blueBits );
          break;
       case GL_BLUE_SCALE:
          *params = FLOAT_TO_BOOL(ctx->Pixel.BlueScale);
@@ -162,13 +236,16 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
       case GL_CLIP_PLANE3:
       case GL_CLIP_PLANE4:
       case GL_CLIP_PLANE5:
-         *params = ctx->Transform.ClipEnabled[pname-GL_CLIP_PLANE0];
+         if (ctx->Transform.ClipPlanesEnabled & (1 << (pname - GL_CLIP_PLANE0)))
+            *params = GL_TRUE;
+         else
+            *params = GL_FALSE;
          break;
       case GL_COLOR_CLEAR_VALUE:
-         params[0] = FLOAT_TO_BOOL(ctx->Color.ClearColor[0]);
-         params[1] = FLOAT_TO_BOOL(ctx->Color.ClearColor[1]);
-         params[2] = FLOAT_TO_BOOL(ctx->Color.ClearColor[2]);
-         params[3] = FLOAT_TO_BOOL(ctx->Color.ClearColor[3]);
+         params[0] = ctx->Color.ClearColor[0] ? GL_TRUE : GL_FALSE;
+         params[1] = ctx->Color.ClearColor[1] ? GL_TRUE : GL_FALSE;
+         params[2] = ctx->Color.ClearColor[2] ? GL_TRUE : GL_FALSE;
+         params[3] = ctx->Color.ClearColor[3] ? GL_TRUE : GL_FALSE;
          break;
       case GL_COLOR_MATERIAL:
          *params = ctx->Light.ColorMaterialEnabled;
@@ -192,18 +269,21 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
          *params = ENUM_TO_BOOL(ctx->Polygon.CullFaceMode);
          break;
       case GL_CURRENT_COLOR:
-         params[0] = INT_TO_BOOL(ctx->Current.ByteColor[0]);
-         params[1] = INT_TO_BOOL(ctx->Current.ByteColor[1]);
-         params[2] = INT_TO_BOOL(ctx->Current.ByteColor[2]);
-         params[3] = INT_TO_BOOL(ctx->Current.ByteColor[3]);
+        FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0]);
+         params[1] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1]);
+         params[2] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2]);
+         params[3] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3]);
          break;
       case GL_CURRENT_INDEX:
+        FLUSH_CURRENT(ctx, 0);
          *params = INT_TO_BOOL(ctx->Current.Index);
          break;
       case GL_CURRENT_NORMAL:
-         params[0] = FLOAT_TO_BOOL(ctx->Current.Normal[0]);
-         params[1] = FLOAT_TO_BOOL(ctx->Current.Normal[1]);
-         params[2] = FLOAT_TO_BOOL(ctx->Current.Normal[2]);
+        FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0]);
+         params[1] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1]);
+         params[2] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2]);
          break;
       case GL_CURRENT_RASTER_COLOR:
         params[0] = FLOAT_TO_BOOL(ctx->Current.RasterColor[0]);
@@ -224,25 +304,26 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
         params[3] = FLOAT_TO_BOOL(ctx->Current.RasterPos[3]);
         break;
       case GL_CURRENT_RASTER_TEXTURE_COORDS:
-         params[0] = FLOAT_TO_BOOL(ctx->Current.RasterMultiTexCoord[texTransformUnit][0]);
-         params[1] = FLOAT_TO_BOOL(ctx->Current.RasterMultiTexCoord[texTransformUnit][1]);
-         params[2] = FLOAT_TO_BOOL(ctx->Current.RasterMultiTexCoord[texTransformUnit][2]);
-         params[3] = FLOAT_TO_BOOL(ctx->Current.RasterMultiTexCoord[texTransformUnit][3]);
+         params[0] = FLOAT_TO_BOOL(ctx->Current.RasterTexCoords[texUnit][0]);
+         params[1] = FLOAT_TO_BOOL(ctx->Current.RasterTexCoords[texUnit][1]);
+         params[2] = FLOAT_TO_BOOL(ctx->Current.RasterTexCoords[texUnit][2]);
+         params[3] = FLOAT_TO_BOOL(ctx->Current.RasterTexCoords[texUnit][3]);
         break;
       case GL_CURRENT_RASTER_POSITION_VALID:
          *params = ctx->Current.RasterPosValid;
         break;
       case GL_CURRENT_TEXTURE_COORDS:
-         params[0] = FLOAT_TO_BOOL(ctx->Current.Texcoord[texTransformUnit][0]);
-         params[1] = FLOAT_TO_BOOL(ctx->Current.Texcoord[texTransformUnit][1]);
-         params[2] = FLOAT_TO_BOOL(ctx->Current.Texcoord[texTransformUnit][2]);
-         params[3] = FLOAT_TO_BOOL(ctx->Current.Texcoord[texTransformUnit][3]);
+        FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][0]);
+         params[1] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][1]);
+         params[2] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][2]);
+         params[3] = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][3]);
         break;
       case GL_DEPTH_BIAS:
          *params = FLOAT_TO_BOOL(ctx->Pixel.DepthBias);
         break;
       case GL_DEPTH_BITS:
-        *params = INT_TO_BOOL(ctx->Visual->DepthBits);
+        *params = INT_TO_BOOL(ctx->Visual.depthBits);
         break;
       case GL_DEPTH_CLEAR_VALUE:
          *params = FLOAT_TO_BOOL(ctx->Depth.Clear);
@@ -267,16 +348,16 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
         *params = ctx->Color.DitherFlag;
         break;
       case GL_DOUBLEBUFFER:
-        *params = ctx->Visual->DBflag;
+        *params = ctx->Visual.doubleBufferMode;
         break;
       case GL_DRAW_BUFFER:
         *params = ENUM_TO_BOOL(ctx->Color.DrawBuffer);
         break;
       case GL_EDGE_FLAG:
+        FLUSH_CURRENT(ctx, 0);
         *params = ctx->Current.EdgeFlag;
         break;
       case GL_FEEDBACK_BUFFER_SIZE:
-         /* TODO: is this right?  Or, return number of entries in buffer? */
          *params = INT_TO_BOOL(ctx->Feedback.BufferSize);
          break;
       case GL_FEEDBACK_BUFFER_TYPE:
@@ -316,19 +397,19 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
          *params = FLOAT_TO_BOOL(ctx->Pixel.GreenBias);
         break;
       case GL_GREEN_BITS:
-         *params = INT_TO_BOOL( ctx->Visual->GreenBits );
+         *params = INT_TO_BOOL( ctx->Visual.greenBits );
         break;
       case GL_GREEN_SCALE:
          *params = FLOAT_TO_BOOL(ctx->Pixel.GreenScale);
         break;
       case GL_INDEX_BITS:
-         *params = INT_TO_BOOL( ctx->Visual->IndexBits );
+         *params = INT_TO_BOOL( ctx->Visual.indexBits );
         break;
       case GL_INDEX_CLEAR_VALUE:
         *params = INT_TO_BOOL(ctx->Color.ClearIndex);
         break;
       case GL_INDEX_MODE:
-        *params = ctx->Visual->RGBAflag ? GL_FALSE : GL_TRUE;
+        *params = ctx->Visual.rgbMode ? GL_FALSE : GL_TRUE;
         break;
       case GL_INDEX_OFFSET:
         *params = INT_TO_BOOL(ctx->Pixel.IndexOffset);
@@ -386,11 +467,15 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
         *params = FLOAT_TO_BOOL(ctx->Line.Width);
         break;
       case GL_LINE_WIDTH_GRANULARITY:
-        *params = FLOAT_TO_BOOL(LINE_WIDTH_GRANULARITY);
+        *params = FLOAT_TO_BOOL(ctx->Const.LineWidthGranularity);
         break;
       case GL_LINE_WIDTH_RANGE:
-        params[0] = FLOAT_TO_BOOL(MIN_LINE_WIDTH);
-        params[1] = FLOAT_TO_BOOL(MAX_LINE_WIDTH);
+        params[0] = FLOAT_TO_BOOL(ctx->Const.MinLineWidthAA);
+        params[1] = FLOAT_TO_BOOL(ctx->Const.MaxLineWidthAA);
+         break;
+      case GL_ALIASED_LINE_WIDTH_RANGE:
+        params[0] = FLOAT_TO_BOOL(ctx->Const.MinLineWidth);
+        params[1] = FLOAT_TO_BOOL(ctx->Const.MaxLineWidth);
         break;
       case GL_LIST_BASE:
         *params = INT_TO_BOOL(ctx->List.ListBase);
@@ -498,19 +583,19 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
          *params = INT_TO_BOOL( MAX_CLIENT_ATTRIB_STACK_DEPTH);
          break;
       case GL_MAX_CLIP_PLANES:
-        *params = INT_TO_BOOL(MAX_CLIP_PLANES);
+        *params = INT_TO_BOOL(ctx->Const.MaxClipPlanes);
         break;
       case GL_MAX_ELEMENTS_VERTICES:  /* GL_VERSION_1_2 */
-         *params = INT_TO_BOOL(VB_MAX);
+         *params = INT_TO_BOOL(ctx->Const.MaxArrayLockSize);
          break;
       case GL_MAX_ELEMENTS_INDICES:   /* GL_VERSION_1_2 */
-         *params = INT_TO_BOOL(VB_MAX);
+         *params = INT_TO_BOOL(ctx->Const.MaxArrayLockSize);
          break;
       case GL_MAX_EVAL_ORDER:
         *params = INT_TO_BOOL(MAX_EVAL_ORDER);
         break;
       case GL_MAX_LIGHTS:
-        *params = INT_TO_BOOL(MAX_LIGHTS);
+        *params = INT_TO_BOOL(ctx->Const.MaxLights);
         break;
       case GL_MAX_LIST_NESTING:
         *params = INT_TO_BOOL(MAX_LIST_NESTING);
@@ -528,8 +613,10 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
         *params = INT_TO_BOOL(MAX_PROJECTION_STACK_DEPTH);
         break;
       case GL_MAX_TEXTURE_SIZE:
+         *params = INT_TO_BOOL(1 << (ctx->Const.MaxTextureLevels - 1));
+        break;
       case GL_MAX_3D_TEXTURE_SIZE:
-         *params = INT_TO_BOOL(ctx->Const.MaxTextureSize);
+         *params = INT_TO_BOOL(1 << (ctx->Const.Max3DTextureLevels - 1));
         break;
       case GL_MAX_TEXTURE_STACK_DEPTH:
         *params = INT_TO_BOOL(MAX_TEXTURE_STACK_DEPTH);
@@ -540,11 +627,11 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
         break;
       case GL_MODELVIEW_MATRIX:
         for (i=0;i<16;i++) {
-           params[i] = FLOAT_TO_BOOL(ctx->ModelView.m[i]);
+           params[i] = FLOAT_TO_BOOL(ctx->ModelviewMatrixStack.Top->m[i]);
         }
         break;
       case GL_MODELVIEW_STACK_DEPTH:
-        *params = INT_TO_BOOL(ctx->ModelViewStackDepth + 1);
+         *params = INT_TO_BOOL(ctx->ModelviewMatrixStack.Depth + 1);
         break;
       case GL_NAME_STACK_DEPTH:
         *params = INT_TO_BOOL(ctx->Select.NameStackDepth);
@@ -610,14 +697,18 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
         *params = INT_TO_BOOL(ctx->Pixel.MapStoSsize);
         break;
       case GL_POINT_SIZE:
-        *params = FLOAT_TO_BOOL(ctx->Point.Size );
+        *params = FLOAT_TO_BOOL(ctx->Point.Size);
         break;
       case GL_POINT_SIZE_GRANULARITY:
-        *params = FLOAT_TO_BOOL(POINT_SIZE_GRANULARITY );
+        *params = FLOAT_TO_BOOL(ctx->Const.PointSizeGranularity );
         break;
       case GL_POINT_SIZE_RANGE:
-        params[0] = FLOAT_TO_BOOL(MIN_POINT_SIZE );
-        params[1] = FLOAT_TO_BOOL(MAX_POINT_SIZE );
+        params[0] = FLOAT_TO_BOOL(ctx->Const.MinPointSizeAA);
+        params[1] = FLOAT_TO_BOOL(ctx->Const.MaxPointSizeAA);
+         break;
+      case GL_ALIASED_POINT_SIZE_RANGE:
+        params[0] = FLOAT_TO_BOOL(ctx->Const.MinPointSize);
+        params[1] = FLOAT_TO_BOOL(ctx->Const.MaxPointSize);
         break;
       case GL_POINT_SMOOTH:
         *params = ctx->Point.SmoothFlag;
@@ -643,11 +734,9 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
         params[0] = ENUM_TO_BOOL(ctx->Polygon.FrontMode);
         params[1] = ENUM_TO_BOOL(ctx->Polygon.BackMode);
         break;
-#ifdef GL_EXT_polygon_offset
-      case GL_POLYGON_OFFSET_BIAS_EXT:
+      case GL_POLYGON_OFFSET_BIAS_EXT:  /* GL_EXT_polygon_offset */
          *params = FLOAT_TO_BOOL( ctx->Polygon.OffsetUnits );
          break;
-#endif
       case GL_POLYGON_OFFSET_FACTOR:
          *params = FLOAT_TO_BOOL( ctx->Polygon.OffsetFactor );
          break;
@@ -665,11 +754,11 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
         break;
       case GL_PROJECTION_MATRIX:
         for (i=0;i<16;i++) {
-           params[i] = FLOAT_TO_BOOL(ctx->ProjectionMatrix.m[i]);
+           params[i] = FLOAT_TO_BOOL(ctx->ProjectionMatrixStack.Top->m[i]);
         }
         break;
       case GL_PROJECTION_STACK_DEPTH:
-        *params = INT_TO_BOOL(ctx->ProjectionStackDepth + 1);
+        *params = INT_TO_BOOL(ctx->ProjectionMatrixStack.Depth + 1);
         break;
       case GL_READ_BUFFER:
         *params = ENUM_TO_BOOL(ctx->Pixel.ReadBuffer);
@@ -678,7 +767,7 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
          *params = FLOAT_TO_BOOL(ctx->Pixel.RedBias);
         break;
       case GL_RED_BITS:
-         *params = INT_TO_BOOL( ctx->Visual->RedBits );
+         *params = INT_TO_BOOL( ctx->Visual.redBits );
         break;
       case GL_RED_SCALE:
          *params = FLOAT_TO_BOOL(ctx->Pixel.RedScale);
@@ -686,8 +775,11 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
       case GL_RENDER_MODE:
         *params = ENUM_TO_BOOL(ctx->RenderMode);
         break;
+      case GL_RESCALE_NORMAL:
+         *params = ctx->Transform.RescaleNormals;
+         break;
       case GL_RGBA_MODE:
-         *params = ctx->Visual->RGBAflag;
+         *params = ctx->Visual.rgbMode;
         break;
       case GL_SCISSOR_BOX:
         params[0] = INT_TO_BOOL(ctx->Scissor.X);
@@ -708,7 +800,7 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
          *params = ctx->Texture.SharedPalette;
          break;
       case GL_STENCIL_BITS:
-        *params = INT_TO_BOOL(ctx->Visual->StencilBits);
+        *params = INT_TO_BOOL(ctx->Visual.stencilBits);
         break;
       case GL_STENCIL_CLEAR_VALUE:
         *params = INT_TO_BOOL(ctx->Stencil.Clear);
@@ -738,29 +830,29 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
         *params = INT_TO_BOOL(ctx->Stencil.WriteMask);
         break;
       case GL_STEREO:
-        *params = ctx->Visual->StereoFlag;
+        *params = ctx->Visual.stereoMode;
         break;
       case GL_SUBPIXEL_BITS:
-        *params = INT_TO_BOOL(0);  /* TODO */
+        *params = INT_TO_BOOL(ctx->Const.SubPixelBits);
         break;
       case GL_TEXTURE_1D:
-         *params = gl_IsEnabled( ctx, GL_TEXTURE_1D );
+         *params = _mesa_IsEnabled(GL_TEXTURE_1D);
         break;
       case GL_TEXTURE_2D:
-         *params = gl_IsEnabled( ctx, GL_TEXTURE_2D );
+         *params = _mesa_IsEnabled(GL_TEXTURE_2D);
         break;
       case GL_TEXTURE_3D:
-         *params = gl_IsEnabled( ctx, GL_TEXTURE_3D );
+         *params = _mesa_IsEnabled(GL_TEXTURE_3D);
         break;
       case GL_TEXTURE_BINDING_1D:
-         *params = INT_TO_BOOL(textureUnit->CurrentD[1]->Name);
+         *params = INT_TO_BOOL(textureUnit->Current1D->Name);
           break;
       case GL_TEXTURE_BINDING_2D:
-         *params = INT_TO_BOOL(textureUnit->CurrentD[2]->Name);
+         *params = INT_TO_BOOL(textureUnit->Current2D->Name);
           break;
       case GL_TEXTURE_BINDING_3D:
-         *params = INT_TO_BOOL(textureUnit->CurrentD[3]->Name);
-          break;
+         *params = INT_TO_BOOL(textureUnit->Current3D->Name);
+         break;
       case GL_TEXTURE_ENV_COLOR:
          {
             params[0] = FLOAT_TO_BOOL(textureUnit->EnvColor[0]);
@@ -786,12 +878,12 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
         break;
       case GL_TEXTURE_MATRIX:
         for (i=0;i<16;i++) {
-           params[i] = 
-              FLOAT_TO_BOOL(ctx->TextureMatrix[texTransformUnit].m[i]);
+           params[i] =
+              FLOAT_TO_BOOL(ctx->TextureMatrixStack[texUnit].Top->m[i]);
         }
         break;
       case GL_TEXTURE_STACK_DEPTH:
-        *params = INT_TO_BOOL(ctx->TextureStackDepth[texTransformUnit] + 1);
+        *params = INT_TO_BOOL(ctx->TextureMatrixStack[texUnit].Depth + 1);
         break;
       case GL_UNPACK_ALIGNMENT:
         *params = INT_TO_BOOL(ctx->Unpack.Alignment);
@@ -829,6 +921,9 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
       case GL_ZOOM_Y:
         *params = FLOAT_TO_BOOL(ctx->Pixel.ZoomY);
         break;
+      case GL_VERTEX_ARRAY:
+         *params = ctx->Array.Vertex.Enabled;
+         break;
       case GL_VERTEX_ARRAY_SIZE:
          *params = INT_TO_BOOL(ctx->Array.Vertex.Size);
          break;
@@ -841,6 +936,9 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
       case GL_VERTEX_ARRAY_COUNT_EXT:
          *params = INT_TO_BOOL(0);
          break;
+      case GL_NORMAL_ARRAY:
+         *params = ctx->Array.Normal.Enabled;
+         break;
       case GL_NORMAL_ARRAY_TYPE:
          *params = ENUM_TO_BOOL(ctx->Array.Normal.Type);
          break;
@@ -850,6 +948,9 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
       case GL_NORMAL_ARRAY_COUNT_EXT:
          *params = INT_TO_BOOL(0);
          break;
+      case GL_COLOR_ARRAY:
+         *params = ctx->Array.Color.Enabled;
+         break;
       case GL_COLOR_ARRAY_SIZE:
          *params = INT_TO_BOOL(ctx->Array.Color.Size);
          break;
@@ -862,6 +963,9 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
       case GL_COLOR_ARRAY_COUNT_EXT:
          *params = INT_TO_BOOL(0);
          break;
+      case GL_INDEX_ARRAY:
+         *params = ctx->Array.Index.Enabled;
+         break;
       case GL_INDEX_ARRAY_TYPE:
          *params = ENUM_TO_BOOL(ctx->Array.Index.Type);
          break;
@@ -871,6 +975,9 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
       case GL_INDEX_ARRAY_COUNT_EXT:
          *params = INT_TO_BOOL(0);
          break;
+      case GL_TEXTURE_COORD_ARRAY:
+         *params = ctx->Array.TexCoord[texUnit].Enabled;
+         break;
       case GL_TEXTURE_COORD_ARRAY_SIZE:
          *params = INT_TO_BOOL(ctx->Array.TexCoord[texUnit].Size);
          break;
@@ -883,100 +990,531 @@ void gl_GetBooleanv( GLcontext *ctx, GLenum pname, GLboolean *params )
       case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
          *params = INT_TO_BOOL(0);
          break;
+      case GL_EDGE_FLAG_ARRAY:
+         *params = ctx->Array.EdgeFlag.Enabled;
+         break;
       case GL_EDGE_FLAG_ARRAY_STRIDE:
          *params = INT_TO_BOOL(ctx->Array.EdgeFlag.Stride);
          break;
-      case GL_EDGE_FLAG_ARRAY_EXT:
+      case GL_EDGE_FLAG_ARRAY_COUNT_EXT:
          *params = INT_TO_BOOL(0);
          break;
 
+      /* GL_ARB_multitexture */
       case GL_MAX_TEXTURE_UNITS_ARB:
-         *params = ctx->Const.MaxTextureUnits;
+         CHECK_EXTENSION_B(ARB_multitexture, pname);
+         *params = INT_TO_BOOL(ctx->Const.MaxTextureUnits);
          break;
       case GL_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_B(ARB_multitexture, pname);
          *params = INT_TO_BOOL(GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit);
          break;
       case GL_CLIENT_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_B(ARB_multitexture, pname);
          *params = INT_TO_BOOL(GL_TEXTURE0_ARB + ctx->Array.ActiveTexture);
          break;
 
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         CHECK_EXTENSION_B(ARB_texture_cube_map, pname);
+         *params = _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
+         break;
+      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+         CHECK_EXTENSION_B(ARB_texture_cube_map, pname);
+         *params = INT_TO_BOOL(textureUnit->CurrentCubeMap->Name);
+         break;
+      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+         CHECK_EXTENSION_B(ARB_texture_cube_map, pname);
+         *params = INT_TO_BOOL(1 << (ctx->Const.MaxCubeTextureLevels - 1));
+         break;
 
-      /* GL_PGI_misc_hints */
-      case GL_STRICT_DEPTHFUNC_HINT_PGI:
-        *params = ENUM_TO_BOOL(GL_NICEST);
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         CHECK_EXTENSION_B(ARB_texture_compression, pname);
+         *params = INT_TO_BOOL(ctx->Hint.TextureCompression);
          break;
-      case GL_STRICT_LIGHTING_HINT_PGI:
-        *params = ENUM_TO_BOOL(ctx->Hint.StrictLighting);
-        break;
-      case GL_STRICT_SCISSOR_HINT_PGI:
-      case GL_FULL_STIPPLE_HINT_PGI:
-        *params = ENUM_TO_BOOL(GL_TRUE);
-        break;
-      case GL_CONSERVE_MEMORY_HINT_PGI:
-        *params = ENUM_TO_BOOL(GL_FALSE);
-        break;
-      case GL_ALWAYS_FAST_HINT_PGI:
-        *params = (GLboolean) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-                             ctx->Hint.AllowDrawSpn == GL_FALSE && 
-                             ctx->Hint.AllowDrawMem == GL_FALSE);
-        break;
-      case GL_ALWAYS_SOFT_HINT_PGI:
-        *params = (GLboolean) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-                             ctx->Hint.AllowDrawSpn == GL_TRUE && 
-                             ctx->Hint.AllowDrawMem == GL_TRUE);
+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_B(ARB_texture_compression, pname);
+         *params = INT_TO_BOOL(ctx->Const.NumCompressedTextureFormats);
+         break;
+      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_B(ARB_texture_compression, pname);
+         {
+            GLuint i;
+            for (i = 0; i < ctx->Const.NumCompressedTextureFormats; i++)
+               params[i] = INT_TO_BOOL(ctx->Const.CompressedTextureFormats[i]);
+         }
+         break;
+
+      /* GL_EXT_compiled_vertex_array */
+      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
+        *params = ctx->Array.LockFirst ? GL_TRUE : GL_FALSE;
         break;
-      case GL_ALLOW_DRAW_OBJ_HINT_PGI:
-        *params = (GLboolean) GL_TRUE;
+      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
+        *params = ctx->Array.LockCount ? GL_TRUE : GL_FALSE;
         break;
-      case GL_ALLOW_DRAW_WIN_HINT_PGI:
-        *params = (GLboolean) ctx->Hint.AllowDrawWin;
+
+      /* GL_ARB_transpose_matrix */
+      case GL_TRANSPOSE_COLOR_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ColorMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = FLOAT_TO_BOOL(tm[i]);
+            }
+         }
+         break;
+      case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ModelviewMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = FLOAT_TO_BOOL(tm[i]);
+            }
+         }
+         break;
+      case GL_TRANSPOSE_PROJECTION_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ProjectionMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = FLOAT_TO_BOOL(tm[i]);
+            }
+         }
+         break;
+      case GL_TRANSPOSE_TEXTURE_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->TextureMatrixStack[texUnit].Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = FLOAT_TO_BOOL(tm[i]);
+            }
+         }
+         break;
+
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         CHECK_EXTENSION_B(HP_occlusion_test, pname);
+         *params = ctx->Depth.OcclusionTest;
+         return;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         CHECK_EXTENSION_B(HP_occlusion_test, pname);
+         if (ctx->Depth.OcclusionTest)
+            *params = ctx->OcclusionResult;
+         else
+            *params = ctx->OcclusionResultSaved;
+         /* reset flag now */
+         ctx->OcclusionResult = GL_FALSE;
+         ctx->OcclusionResultSaved = GL_FALSE;
+         return;
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         *params = ctx->Pixel.PixelTextureEnabled;
+         break;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         *params = ctx->Pixel.PixelTextureEnabled;
+         break;
+      case GL_PIXEL_TEX_GEN_MODE_SGIX:
+         *params = (GLboolean) pixel_texgen_mode(ctx);
+         break;
+
+      /* GL_SGI_color_matrix (also in 1.2 imaging) */
+      case GL_COLOR_MATRIX_SGI:
+         for (i=0;i<16;i++) {
+           params[i] = FLOAT_TO_BOOL(ctx->ColorMatrixStack.Top->m[i]);
+        }
         break;
-      case GL_ALLOW_DRAW_SPN_HINT_PGI:
-        *params = (GLboolean) ctx->Hint.AllowDrawSpn;
+      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = INT_TO_BOOL(ctx->ColorMatrixStack.Depth + 1);
+         break;
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = FLOAT_TO_BOOL(MAX_COLOR_STACK_DEPTH);
+         break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixScale[0]);
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixScale[1]);
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixScale[2]);
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixScale[3]);
+         break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixBias[0]);
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixBias[1]);
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixBias[2]);
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostColorMatrixBias[3]);
+         break;
+
+      /* GL_EXT_convolution (also in 1.2 imaging) */
+      case GL_CONVOLUTION_1D_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = ctx->Pixel.Convolution1DEnabled;
+         break;
+      case GL_CONVOLUTION_2D:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = ctx->Pixel.Convolution2DEnabled;
+         break;
+      case GL_SEPARABLE_2D:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = ctx->Pixel.Separable2DEnabled;
+         break;
+      case GL_MAX_CONVOLUTION_WIDTH:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = INT_TO_BOOL(ctx->Const.MaxConvolutionWidth);
+         break;
+      case GL_MAX_CONVOLUTION_HEIGHT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = INT_TO_BOOL(ctx->Const.MaxConvolutionHeight);
+         break;
+      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionScale[0]);
+         break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionScale[1]);
+         break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionScale[2]);
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionScale[3]);
+         break;
+      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionBias[0]);
+         break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionBias[1]);
+         break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionBias[2]);
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
+         CHECK_EXTENSION_B(EXT_convolution, pname);
+         *params = FLOAT_TO_BOOL(ctx->Pixel.PostConvolutionBias[2]);
+         break;
+
+      /* GL_EXT_histogram (also in 1.2 imaging) */
+      case GL_HISTOGRAM:
+         CHECK_EXTENSION_B(EXT_histogram, pname);
+         *params = ctx->Pixel.HistogramEnabled;
         break;
-      case GL_ALLOW_DRAW_MEM_HINT_PGI:
-        *params = (GLboolean) ctx->Hint.AllowDrawMem;
+      case GL_MINMAX:
+         CHECK_EXTENSION_B(EXT_histogram, pname);
+         *params = ctx->Pixel.MinMaxEnabled;
+         break;
+
+      /* GL_SGI_color_table (also in 1.2 imaging */
+      case GL_COLOR_TABLE_SGI:
+         *params = ctx->Pixel.ColorTableEnabled;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         *params = ctx->Pixel.PostConvolutionColorTableEnabled;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         *params = ctx->Pixel.PostColorMatrixColorTableEnabled;
+         break;
+
+      /* GL_EXT_secondary_color */
+      case GL_COLOR_SUM_EXT:
+         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+        *params = ctx->Fog.ColorSumEnabled;
+        break;
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
+         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+        FLUSH_CURRENT(ctx, 0);
+         params[0] = INT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0]);
+         params[1] = INT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1]);
+         params[2] = INT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2]);
+        break;
+      case GL_SECONDARY_COLOR_ARRAY_EXT:
+         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+         *params = ctx->Array.SecondaryColor.Enabled;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+        *params = ENUM_TO_BOOL(ctx->Array.SecondaryColor.Type);
+        break;
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+        *params = INT_TO_BOOL(ctx->Array.SecondaryColor.Stride);
+        break;
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
+         CHECK_EXTENSION_B(EXT_secondary_color, pname);
+        *params = INT_TO_BOOL(ctx->Array.SecondaryColor.Stride);
         break;
-      case GL_CLIP_NEAR_HINT_PGI:
-      case GL_CLIP_FAR_HINT_PGI:
-        *params = ENUM_TO_BOOL(GL_TRUE);
+
+      /* GL_EXT_fog_coord */
+      case GL_CURRENT_FOG_COORDINATE_EXT:
+         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+        FLUSH_CURRENT(ctx, 0);
+        *params = FLOAT_TO_BOOL(ctx->Current.Attrib[VERT_ATTRIB_FOG][0]);
         break;
-      case GL_WIDE_LINE_HINT_PGI:
-        *params = ENUM_TO_BOOL(GL_DONT_CARE);
+      case GL_FOG_COORDINATE_ARRAY_EXT:
+         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+         *params = ctx->Array.FogCoord.Enabled;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+        *params = ENUM_TO_BOOL(ctx->Array.FogCoord.Type);
         break;
-      case GL_BACK_NORMALS_HINT_PGI:
-        *params = ENUM_TO_BOOL(GL_TRUE);
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_B(EXT_fog_coord, pname);
+        *params = INT_TO_BOOL(ctx->Array.FogCoord.Stride);
         break;
-      case GL_NATIVE_GRAPHICS_HANDLE_PGI:
-        *params = 0;
+
+      /* GL_EXT_texture_lod_bias */
+      case GL_MAX_TEXTURE_LOD_BIAS_EXT:
+         *params = FLOAT_TO_BOOL(ctx->Const.MaxTextureLodBias);
+         break;
+
+      /* GL_EXT_texture_filter_anisotropic */
+      case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+         CHECK_EXTENSION_B(EXT_texture_filter_anisotropic, pname);
+         *params = FLOAT_TO_BOOL(ctx->Const.MaxTextureMaxAnisotropy);
         break;
+
+      /* GL_ARB_multisample */
+      case GL_MULTISAMPLE_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = ctx->Multisample.Enabled;
+         break;
+      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = ctx->Multisample.SampleAlphaToCoverage;
+         break;
+      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = ctx->Multisample.SampleAlphaToOne;
+         break;
+      case GL_SAMPLE_COVERAGE_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = ctx->Multisample.SampleCoverage;
+         break;
+      case GL_SAMPLE_COVERAGE_VALUE_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = FLOAT_TO_BOOL(ctx->Multisample.SampleCoverageValue);
+         break;
+      case GL_SAMPLE_COVERAGE_INVERT_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = ctx->Multisample.SampleCoverageInvert;
+         break;
+      case GL_SAMPLE_BUFFERS_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = 0; /* XXX fix someday */
+         break;
+      case GL_SAMPLES_ARB:
+         CHECK_EXTENSION_B(ARB_multisample, pname);
+         *params = 0; /* XXX fix someday */
+         break;
+
+      /* GL_IBM_rasterpos_clip */
+      case GL_RASTER_POSITION_UNCLIPPED_IBM:
+         CHECK_EXTENSION_B(IBM_rasterpos_clip, pname);
+         *params = ctx->Transform.RasterPositionUnclipped;
+         break;
+
+      /* GL_NV_point_sprite */
+      case GL_POINT_SPRITE_NV:
+         CHECK_EXTENSION_B(NV_point_sprite, pname);
+         *params = ctx->Point.PointSprite;
+         break;
+      case GL_POINT_SPRITE_R_MODE_NV:
+         CHECK_EXTENSION_B(NV_point_sprite, pname);
+         *params = ENUM_TO_BOOL(ctx->Point.SpriteRMode);
+         break;
+
+      /* GL_SGIS_generate_mipmap */
+      case GL_GENERATE_MIPMAP_HINT_SGIS:
+         CHECK_EXTENSION_B(SGIS_generate_mipmap, pname);
+         *params = ENUM_TO_BOOL(ctx->Hint.GenerateMipmap);
+         break;
+
+      /* GL_NV_vertex_program */
+      case GL_VERTEX_PROGRAM_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = ctx->VertexProgram.Enabled;
+         break;
+      case GL_VERTEX_PROGRAM_POINT_SIZE_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = ctx->VertexProgram.PointSizeEnabled;
+         break;
+      case GL_VERTEX_PROGRAM_TWO_SIDE_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = ctx->VertexProgram.TwoSideEnabled;
+         break;
+      case GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = (MAX_PROGRAM_STACK_DEPTH > 0) ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_MAX_TRACK_MATRICES_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = (MAX_PROGRAM_MATRICES > 0) ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = (ctx->CurrentStack->Depth > 0) ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_CURRENT_MATRIX_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = (ctx->Transform.MatrixMode != 0) ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_VERTEX_PROGRAM_BINDING_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = (ctx->VertexProgram.CurrentID != 0) ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_PROGRAM_ERROR_POSITION_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         *params = (ctx->VertexProgram.ErrorPos != 0) ? GL_TRUE : GL_FALSE;
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY0_NV:
+      case GL_VERTEX_ATTRIB_ARRAY1_NV:
+      case GL_VERTEX_ATTRIB_ARRAY2_NV:
+      case GL_VERTEX_ATTRIB_ARRAY3_NV:
+      case GL_VERTEX_ATTRIB_ARRAY4_NV:
+      case GL_VERTEX_ATTRIB_ARRAY5_NV:
+      case GL_VERTEX_ATTRIB_ARRAY6_NV:
+      case GL_VERTEX_ATTRIB_ARRAY7_NV:
+      case GL_VERTEX_ATTRIB_ARRAY8_NV:
+      case GL_VERTEX_ATTRIB_ARRAY9_NV:
+      case GL_VERTEX_ATTRIB_ARRAY10_NV:
+      case GL_VERTEX_ATTRIB_ARRAY11_NV:
+      case GL_VERTEX_ATTRIB_ARRAY12_NV:
+      case GL_VERTEX_ATTRIB_ARRAY13_NV:
+      case GL_VERTEX_ATTRIB_ARRAY14_NV:
+      case GL_VERTEX_ATTRIB_ARRAY15_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_VERTEX_ATTRIB_ARRAY0_NV;
+            *params = ctx->Array.VertexAttrib[n].Enabled;
+         }
+         break;
+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP1_VERTEX_ATTRIB0_4_NV;
+            *params = ctx->Eval.Map1Attrib[n];
+         }
+         break;
+      case GL_MAP2_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP2_VERTEX_ATTRIB0_4_NV;
+            *params = ctx->Eval.Map2Attrib[n];
+         }
+         break;
+
+      /* GL_NV_texture_rectangle */
+      case GL_TEXTURE_RECTANGLE_NV:
+         CHECK_EXTENSION_B(NV_texture_rectangle, pname);
+         *params = _mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV);
+         break;
+      case GL_TEXTURE_BINDING_RECTANGLE_NV:
+         CHECK_EXTENSION_B(NV_texture_rectangle, pname);
+         *params = INT_TO_BOOL(textureUnit->CurrentRect->Name);
+         break;
+      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
+         CHECK_EXTENSION_B(NV_texture_rectangle, pname);
+         *params = INT_TO_BOOL(ctx->Const.MaxTextureRectSize);
+         break;
+
       default:
-        printf("invalid enum: %x\n", pname);
-         gl_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
+         {
+            char s[100];
+            sprintf(s, "glGetBooleanv(pname=0x%x)", pname);
+            _mesa_error( ctx, GL_INVALID_ENUM, s );
+         }
    }
 }
 
 
-
-
-void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
+void
+_mesa_GetDoublev( GLenum pname, GLdouble *params )
 {
+   GET_CURRENT_CONTEXT(ctx);
    GLuint i;
    GLuint texUnit = ctx->Texture.CurrentUnit;
-   GLuint texTransformUnit = ctx->Texture.CurrentTransformUnit;
    const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
 
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetDoublev");
+   if (!params)
+      return;
 
-   if (MESA_VERBOSE & VERBOSE_API) 
-      fprintf(stderr, "glGetDoublev %s\n", gl_lookup_enum_by_nr(pname));
+   /* We need this in order to get correct results for
+    * GL_OCCLUSION_TEST_RESULT_HP.  There might be other important cases.
+    */
+   FLUSH_VERTICES(ctx, 0);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetDoublev %s\n", _mesa_lookup_enum_by_nr(pname));
+
+   if (ctx->Driver.GetDoublev && (*ctx->Driver.GetDoublev)(ctx, pname, params))
+      return;
 
    switch (pname) {
       case GL_ACCUM_RED_BITS:
+         *params = (GLdouble) ctx->Visual.accumRedBits;
+         break;
       case GL_ACCUM_GREEN_BITS:
+         *params = (GLdouble) ctx->Visual.accumGreenBits;
+         break;
       case GL_ACCUM_BLUE_BITS:
+         *params = (GLdouble) ctx->Visual.accumBlueBits;
+         break;
       case GL_ACCUM_ALPHA_BITS:
-         *params = (GLdouble) ctx->Visual->AccumBits;
+         *params = (GLdouble) ctx->Visual.accumAlphaBits;
          break;
       case GL_ACCUM_CLEAR_VALUE:
          params[0] = (GLdouble) ctx->Accum.ClearColor[0];
@@ -988,7 +1526,7 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
          *params = (GLdouble) ctx->Pixel.AlphaBias;
          break;
       case GL_ALPHA_BITS:
-         *params = (GLdouble) ctx->Visual->AlphaBits;
+         *params = (GLdouble) ctx->Visual.alphaBits;
          break;
       case GL_ALPHA_SCALE:
          *params = (GLdouble) ctx->Pixel.AlphaScale;
@@ -1000,7 +1538,7 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
          *params = ENUM_TO_DOUBLE(ctx->Color.AlphaFunc);
          break;
       case GL_ALPHA_TEST_REF:
-         *params = (GLdouble) ctx->Color.AlphaRef / 255.0;
+         *params = (GLdouble) ctx->Color.AlphaRef / CHAN_MAXF;
          break;
       case GL_ATTRIB_STACK_DEPTH:
          *params = (GLdouble ) (ctx->AttribStackDepth);
@@ -1009,7 +1547,7 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
          *params = (GLdouble) ctx->Eval.AutoNormal;
          break;
       case GL_AUX_BUFFERS:
-         *params = (GLdouble) NUM_AUX_BUFFERS;
+         *params = (GLdouble) ctx->Const.NumAuxBuffers;
          break;
       case GL_BLEND:
          *params = (GLdouble) ctx->Color.BlendEnabled;
@@ -1020,16 +1558,16 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
       case GL_BLEND_SRC:
          *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcRGB);
          break;
-      case GL_BLEND_SRC_RGB_INGR:
+      case GL_BLEND_SRC_RGB_EXT:
          *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcRGB);
          break;
-      case GL_BLEND_DST_RGB_INGR:
+      case GL_BLEND_DST_RGB_EXT:
          *params = ENUM_TO_DOUBLE(ctx->Color.BlendDstRGB);
          break;
-      case GL_BLEND_SRC_ALPHA_INGR:
+      case GL_BLEND_SRC_ALPHA_EXT:
          *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcA);
          break;
-      case GL_BLEND_DST_ALPHA_INGR:
+      case GL_BLEND_DST_ALPHA_EXT:
          *params = ENUM_TO_DOUBLE(ctx->Color.BlendDstA);
          break;
       case GL_BLEND_EQUATION_EXT:
@@ -1045,7 +1583,7 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
          *params = (GLdouble) ctx->Pixel.BlueBias;
          break;
       case GL_BLUE_BITS:
-         *params = (GLdouble) ctx->Visual->BlueBits;
+         *params = (GLdouble) ctx->Visual.blueBits;
          break;
       case GL_BLUE_SCALE:
          *params = (GLdouble) ctx->Pixel.BlueScale;
@@ -1059,13 +1597,16 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
       case GL_CLIP_PLANE3:
       case GL_CLIP_PLANE4:
       case GL_CLIP_PLANE5:
-         *params = (GLdouble) ctx->Transform.ClipEnabled[pname-GL_CLIP_PLANE0];
+         if (ctx->Transform.ClipPlanesEnabled & (1 << (pname - GL_CLIP_PLANE0)))
+            *params = 1.0;
+         else
+            *params = 0.0;
          break;
       case GL_COLOR_CLEAR_VALUE:
-         params[0] = (GLdouble) ctx->Color.ClearColor[0];
-         params[1] = (GLdouble) ctx->Color.ClearColor[1];
-         params[2] = (GLdouble) ctx->Color.ClearColor[2];
-         params[3] = (GLdouble) ctx->Color.ClearColor[3];
+         params[0] = (GLdouble) CHAN_TO_FLOAT(ctx->Color.ClearColor[0]);
+         params[1] = (GLdouble) CHAN_TO_FLOAT(ctx->Color.ClearColor[1]);
+         params[2] = (GLdouble) CHAN_TO_FLOAT(ctx->Color.ClearColor[2]);
+         params[3] = (GLdouble) CHAN_TO_FLOAT(ctx->Color.ClearColor[3]);
          break;
       case GL_COLOR_MATERIAL:
          *params = (GLdouble) ctx->Light.ColorMaterialEnabled;
@@ -1089,18 +1630,21 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
          *params = ENUM_TO_DOUBLE(ctx->Polygon.CullFaceMode);
          break;
       case GL_CURRENT_COLOR:
-         params[0] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.ByteColor[0]);
-         params[1] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.ByteColor[1]);
-         params[2] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.ByteColor[2]);
-         params[3] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.ByteColor[3]);
+        FLUSH_CURRENT(ctx, 0);
+         params[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0];
+         params[1] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1];
+         params[2] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2];
+         params[3] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3];
          break;
       case GL_CURRENT_INDEX:
+        FLUSH_CURRENT(ctx, 0);
          *params = (GLdouble) ctx->Current.Index;
          break;
       case GL_CURRENT_NORMAL:
-         params[0] = (GLdouble) ctx->Current.Normal[0];
-         params[1] = (GLdouble) ctx->Current.Normal[1];
-         params[2] = (GLdouble) ctx->Current.Normal[2];
+        FLUSH_CURRENT(ctx, 0);
+         params[0] = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0];
+         params[1] = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1];
+         params[2] = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2];
          break;
       case GL_CURRENT_RASTER_COLOR:
         params[0] = (GLdouble) ctx->Current.RasterColor[0];
@@ -1121,25 +1665,26 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
         params[3] = (GLdouble) ctx->Current.RasterPos[3];
         break;
       case GL_CURRENT_RASTER_TEXTURE_COORDS:
-        params[0] = (GLdouble) ctx->Current.RasterMultiTexCoord[texTransformUnit][0];
-        params[1] = (GLdouble) ctx->Current.RasterMultiTexCoord[texTransformUnit][1];
-        params[2] = (GLdouble) ctx->Current.RasterMultiTexCoord[texTransformUnit][2];
-        params[3] = (GLdouble) ctx->Current.RasterMultiTexCoord[texTransformUnit][3];
+        params[0] = (GLdouble) ctx->Current.RasterTexCoords[texUnit][0];
+        params[1] = (GLdouble) ctx->Current.RasterTexCoords[texUnit][1];
+        params[2] = (GLdouble) ctx->Current.RasterTexCoords[texUnit][2];
+        params[3] = (GLdouble) ctx->Current.RasterTexCoords[texUnit][3];
         break;
       case GL_CURRENT_RASTER_POSITION_VALID:
         *params = (GLdouble) ctx->Current.RasterPosValid;
         break;
       case GL_CURRENT_TEXTURE_COORDS:
-        params[0] = (GLdouble) ctx->Current.Texcoord[texTransformUnit][0];
-        params[1] = (GLdouble) ctx->Current.Texcoord[texTransformUnit][1];
-        params[2] = (GLdouble) ctx->Current.Texcoord[texTransformUnit][2];
-        params[3] = (GLdouble) ctx->Current.Texcoord[texTransformUnit][3];
+        FLUSH_CURRENT(ctx, 0);
+        params[0] = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][0];
+        params[1] = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][1];
+        params[2] = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][2];
+        params[3] = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][3];
         break;
       case GL_DEPTH_BIAS:
         *params = (GLdouble) ctx->Pixel.DepthBias;
         break;
       case GL_DEPTH_BITS:
-        *params = (GLdouble) ctx->Visual->DepthBits;
+        *params = (GLdouble) ctx->Visual.depthBits;
         break;
       case GL_DEPTH_CLEAR_VALUE:
         *params = (GLdouble) ctx->Depth.Clear;
@@ -1164,16 +1709,16 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
         *params = (GLdouble) ctx->Color.DitherFlag;
         break;
       case GL_DOUBLEBUFFER:
-        *params = (GLdouble) ctx->Visual->DBflag;
+        *params = (GLdouble) ctx->Visual.doubleBufferMode;
         break;
       case GL_DRAW_BUFFER:
         *params = ENUM_TO_DOUBLE(ctx->Color.DrawBuffer);
         break;
       case GL_EDGE_FLAG:
+        FLUSH_CURRENT(ctx, 0);
         *params = (GLdouble) ctx->Current.EdgeFlag;
         break;
       case GL_FEEDBACK_BUFFER_SIZE:
-         /* TODO: is this right?  Or, return number of entries in buffer? */
          *params = (GLdouble) ctx->Feedback.BufferSize;
          break;
       case GL_FEEDBACK_BUFFER_TYPE:
@@ -1213,19 +1758,19 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
          *params = (GLdouble) ctx->Pixel.GreenBias;
          break;
       case GL_GREEN_BITS:
-         *params = (GLdouble) ctx->Visual->GreenBits;
+         *params = (GLdouble) ctx->Visual.greenBits;
          break;
       case GL_GREEN_SCALE:
          *params = (GLdouble) ctx->Pixel.GreenScale;
          break;
       case GL_INDEX_BITS:
-         *params = (GLdouble) ctx->Visual->IndexBits;
+         *params = (GLdouble) ctx->Visual.indexBits;
         break;
       case GL_INDEX_CLEAR_VALUE:
          *params = (GLdouble) ctx->Color.ClearIndex;
         break;
       case GL_INDEX_MODE:
-        *params = ctx->Visual->RGBAflag ? 0.0 : 1.0;
+        *params = ctx->Visual.rgbMode ? 0.0 : 1.0;
         break;
       case GL_INDEX_OFFSET:
         *params = (GLdouble) ctx->Pixel.IndexOffset;
@@ -1283,11 +1828,15 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
         *params = (GLdouble) ctx->Line.Width;
         break;
       case GL_LINE_WIDTH_GRANULARITY:
-        *params = (GLdouble) LINE_WIDTH_GRANULARITY;
+        *params = (GLdouble) ctx->Const.LineWidthGranularity;
         break;
       case GL_LINE_WIDTH_RANGE:
-        params[0] = (GLdouble) MIN_LINE_WIDTH;
-        params[1] = (GLdouble) MAX_LINE_WIDTH;
+        params[0] = (GLdouble) ctx->Const.MinLineWidthAA;
+        params[1] = (GLdouble) ctx->Const.MaxLineWidthAA;
+        break;
+      case GL_ALIASED_LINE_WIDTH_RANGE:
+        params[0] = (GLdouble) ctx->Const.MinLineWidth;
+        params[1] = (GLdouble) ctx->Const.MaxLineWidth;
         break;
       case GL_LIST_BASE:
         *params = (GLdouble) ctx->List.ListBase;
@@ -1395,19 +1944,19 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
          *params = (GLdouble) MAX_CLIENT_ATTRIB_STACK_DEPTH;
          break;
       case GL_MAX_CLIP_PLANES:
-        *params = (GLdouble) MAX_CLIP_PLANES;
+        *params = (GLdouble) ctx->Const.MaxClipPlanes;
         break;
       case GL_MAX_ELEMENTS_VERTICES:  /* GL_VERSION_1_2 */
-         *params = (GLdouble) VB_MAX;
+         *params = (GLdouble) ctx->Const.MaxArrayLockSize;
          break;
       case GL_MAX_ELEMENTS_INDICES:   /* GL_VERSION_1_2 */
-         *params = (GLdouble) VB_MAX;
+         *params = (GLdouble) ctx->Const.MaxArrayLockSize;
          break;
       case GL_MAX_EVAL_ORDER:
         *params = (GLdouble) MAX_EVAL_ORDER;
         break;
       case GL_MAX_LIGHTS:
-        *params = (GLdouble) MAX_LIGHTS;
+        *params = (GLdouble) ctx->Const.MaxLights;
         break;
       case GL_MAX_LIST_NESTING:
         *params = (GLdouble) MAX_LIST_NESTING;
@@ -1425,8 +1974,10 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
         *params = (GLdouble) MAX_PROJECTION_STACK_DEPTH;
         break;
       case GL_MAX_TEXTURE_SIZE:
+         *params = (GLdouble) (1 << (ctx->Const.MaxTextureLevels - 1));
+        break;
       case GL_MAX_3D_TEXTURE_SIZE:
-         *params = (GLdouble) ctx->Const.MaxTextureSize;
+         *params = (GLdouble) (1 << (ctx->Const.Max3DTextureLevels - 1));
         break;
       case GL_MAX_TEXTURE_STACK_DEPTH:
         *params = (GLdouble) MAX_TEXTURE_STACK_DEPTH;
@@ -1437,11 +1988,11 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
          break;
       case GL_MODELVIEW_MATRIX:
         for (i=0;i<16;i++) {
-           params[i] = (GLdouble) ctx->ModelView.m[i];
+           params[i] = (GLdouble) ctx->ModelviewMatrixStack.Top->m[i];
         }
         break;
       case GL_MODELVIEW_STACK_DEPTH:
-        *params = (GLdouble) (ctx->ModelViewStackDepth + 1);
+        *params = (GLdouble) (ctx->ModelviewMatrixStack.Depth + 1);
         break;
       case GL_NAME_STACK_DEPTH:
         *params = (GLdouble) ctx->Select.NameStackDepth;
@@ -1510,11 +2061,15 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
          *params = (GLdouble) ctx->Point.Size;
          break;
       case GL_POINT_SIZE_GRANULARITY:
-        *params = (GLdouble) POINT_SIZE_GRANULARITY;
+        *params = (GLdouble) ctx->Const.PointSizeGranularity;
         break;
       case GL_POINT_SIZE_RANGE:
-        params[0] = (GLdouble) MIN_POINT_SIZE;
-        params[1] = (GLdouble) MAX_POINT_SIZE;
+        params[0] = (GLdouble) ctx->Const.MinPointSizeAA;
+        params[1] = (GLdouble) ctx->Const.MaxPointSizeAA;
+        break;
+      case GL_ALIASED_POINT_SIZE_RANGE:
+        params[0] = (GLdouble) ctx->Const.MinPointSize;
+        params[1] = (GLdouble) ctx->Const.MaxPointSize;
         break;
       case GL_POINT_SMOOTH:
         *params = (GLdouble) ctx->Point.SmoothFlag;
@@ -1540,11 +2095,9 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
         params[0] = ENUM_TO_DOUBLE(ctx->Polygon.FrontMode);
         params[1] = ENUM_TO_DOUBLE(ctx->Polygon.BackMode);
         break;
-#ifdef GL_EXT_polygon_offset
-      case GL_POLYGON_OFFSET_BIAS_EXT:
+      case GL_POLYGON_OFFSET_BIAS_EXT:  /* GL_EXT_polygon_offset */
          *params = (GLdouble) ctx->Polygon.OffsetUnits;
          break;
-#endif
       case GL_POLYGON_OFFSET_FACTOR:
          *params = (GLdouble) ctx->Polygon.OffsetFactor;
          break;
@@ -1562,11 +2115,11 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
         break;
       case GL_PROJECTION_MATRIX:
         for (i=0;i<16;i++) {
-           params[i] = (GLdouble) ctx->ProjectionMatrix.m[i];
+           params[i] = (GLdouble) ctx->ProjectionMatrixStack.Top->m[i];
         }
         break;
       case GL_PROJECTION_STACK_DEPTH:
-        *params = (GLdouble) (ctx->ProjectionStackDepth + 1);
+        *params = (GLdouble) (ctx->ProjectionMatrixStack.Depth + 1);
         break;
       case GL_READ_BUFFER:
         *params = ENUM_TO_DOUBLE(ctx->Pixel.ReadBuffer);
@@ -1575,7 +2128,7 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
          *params = (GLdouble) ctx->Pixel.RedBias;
          break;
       case GL_RED_BITS:
-         *params = (GLdouble) ctx->Visual->RedBits;
+         *params = (GLdouble) ctx->Visual.redBits;
          break;
       case GL_RED_SCALE:
          *params = (GLdouble) ctx->Pixel.RedScale;
@@ -1583,8 +2136,11 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
       case GL_RENDER_MODE:
         *params = ENUM_TO_DOUBLE(ctx->RenderMode);
         break;
+      case GL_RESCALE_NORMAL:
+         *params = (GLdouble) ctx->Transform.RescaleNormals;
+         break;
       case GL_RGBA_MODE:
-        *params = (GLdouble) ctx->Visual->RGBAflag;
+        *params = (GLdouble) ctx->Visual.rgbMode;
         break;
       case GL_SCISSOR_BOX:
         params[0] = (GLdouble) ctx->Scissor.X;
@@ -1605,7 +2161,7 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
          *params = (GLdouble) ctx->Texture.SharedPalette;
          break;
       case GL_STENCIL_BITS:
-         *params = (GLdouble) ctx->Visual->StencilBits;
+         *params = (GLdouble) ctx->Visual.stencilBits;
          break;
       case GL_STENCIL_CLEAR_VALUE:
         *params = (GLdouble) ctx->Stencil.Clear;
@@ -1635,28 +2191,28 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
         *params = (GLdouble) ctx->Stencil.WriteMask;
         break;
       case GL_STEREO:
-        *params = (GLdouble) ctx->Visual->StereoFlag;
+        *params = (GLdouble) ctx->Visual.stereoMode;
         break;
       case GL_SUBPIXEL_BITS:
-        *params = 0.0;   /* TODO */
+        *params = (GLdouble) ctx->Const.SubPixelBits;
         break;
       case GL_TEXTURE_1D:
-         *params = gl_IsEnabled(ctx, GL_TEXTURE_1D) ? 1.0 : 0.0;
+         *params = _mesa_IsEnabled(GL_TEXTURE_1D) ? 1.0 : 0.0;
         break;
       case GL_TEXTURE_2D:
-         *params = gl_IsEnabled(ctx, GL_TEXTURE_2D) ? 1.0 : 0.0;
+         *params = _mesa_IsEnabled(GL_TEXTURE_2D) ? 1.0 : 0.0;
         break;
       case GL_TEXTURE_3D:
-         *params = gl_IsEnabled(ctx, GL_TEXTURE_3D) ? 1.0 : 0.0;
+         *params = _mesa_IsEnabled(GL_TEXTURE_3D) ? 1.0 : 0.0;
         break;
       case GL_TEXTURE_BINDING_1D:
-         *params = (GLdouble) textureUnit->CurrentD[1]->Name;
+         *params = (GLdouble) textureUnit->Current1D->Name;
           break;
       case GL_TEXTURE_BINDING_2D:
-         *params = (GLdouble) textureUnit->CurrentD[2]->Name;
+         *params = (GLdouble) textureUnit->Current2D->Name;
           break;
       case GL_TEXTURE_BINDING_3D:
-         *params = (GLdouble) textureUnit->CurrentD[3]->Name;
+         *params = (GLdouble) textureUnit->Current3D->Name;
           break;
       case GL_TEXTURE_ENV_COLOR:
         params[0] = (GLdouble) textureUnit->EnvColor[0];
@@ -1681,11 +2237,11 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
         break;
       case GL_TEXTURE_MATRIX:
          for (i=0;i<16;i++) {
-           params[i] = (GLdouble) ctx->TextureMatrix[texTransformUnit].m[i];
+           params[i] = (GLdouble) ctx->TextureMatrixStack[texUnit].Top->m[i];
         }
         break;
       case GL_TEXTURE_STACK_DEPTH:
-        *params = (GLdouble) (ctx->TextureStackDepth[texTransformUnit] + 1);
+        *params = (GLdouble) (ctx->TextureMatrixStack[texUnit].Depth + 1);
         break;
       case GL_UNPACK_ALIGNMENT:
         *params = (GLdouble) ctx->Unpack.Alignment;
@@ -1723,6 +2279,9 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
       case GL_ZOOM_Y:
         *params = (GLdouble) ctx->Pixel.ZoomY;
         break;
+      case GL_VERTEX_ARRAY:
+         *params = (GLdouble) ctx->Array.Vertex.Enabled;
+         break;
       case GL_VERTEX_ARRAY_SIZE:
          *params = (GLdouble) ctx->Array.Vertex.Size;
          break;
@@ -1735,6 +2294,9 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
       case GL_VERTEX_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
+      case GL_NORMAL_ARRAY:
+         *params = (GLdouble) ctx->Array.Normal.Enabled;
+         break;
       case GL_NORMAL_ARRAY_TYPE:
          *params = ENUM_TO_DOUBLE(ctx->Array.Normal.Type);
          break;
@@ -1744,6 +2306,9 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
       case GL_NORMAL_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
+      case GL_COLOR_ARRAY:
+         *params = (GLdouble) ctx->Array.Color.Enabled;
+         break;
       case GL_COLOR_ARRAY_SIZE:
          *params = (GLdouble) ctx->Array.Color.Size;
          break;
@@ -1756,6 +2321,9 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
       case GL_COLOR_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
+      case GL_INDEX_ARRAY:
+         *params = (GLdouble) ctx->Array.Index.Enabled;
+         break;
       case GL_INDEX_ARRAY_TYPE:
          *params = ENUM_TO_DOUBLE(ctx->Array.Index.Type);
          break;
@@ -1765,6 +2333,9 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
       case GL_INDEX_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
+      case GL_TEXTURE_COORD_ARRAY:
+         *params = (GLdouble) ctx->Array.TexCoord[texUnit].Enabled;
+         break;
       case GL_TEXTURE_COORD_ARRAY_SIZE:
          *params = (GLdouble) ctx->Array.TexCoord[texUnit].Size;
          break;
@@ -1777,6 +2348,9 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
       case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
+      case GL_EDGE_FLAG_ARRAY:
+         *params = (GLdouble) ctx->Array.EdgeFlag.Enabled;
+         break;
       case GL_EDGE_FLAG_ARRAY_STRIDE:
          *params = (GLdouble) ctx->Array.EdgeFlag.Stride;
          break;
@@ -1784,153 +2358,578 @@ void gl_GetDoublev( GLcontext *ctx, GLenum pname, GLdouble *params )
          *params = 0.0;
          break;
 
+      /* GL_ARB_multitexture */
       case GL_MAX_TEXTURE_UNITS_ARB:
+         CHECK_EXTENSION_D(ARB_multitexture, pname);
          *params = (GLdouble) ctx->Const.MaxTextureUnits;
          break;
       case GL_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_D(ARB_multitexture, pname);
          *params = (GLdouble) (GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit);
          break;
       case GL_CLIENT_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_D(ARB_multitexture, pname);
          *params = (GLdouble) (GL_TEXTURE0_ARB + ctx->Array.ActiveTexture);
          break;
 
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         CHECK_EXTENSION_D(ARB_texture_cube_map, pname);
+         *params = (GLdouble) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
+         break;
+      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+         CHECK_EXTENSION_D(ARB_texture_cube_map, pname);
+         *params = (GLdouble) textureUnit->CurrentCubeMap->Name;
+         break;
+      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+         CHECK_EXTENSION_D(ARB_texture_cube_map, pname);
+         *params = (GLdouble) (1 << (ctx->Const.MaxCubeTextureLevels - 1));
+         break;
 
-      /* GL_PGI_misc_hints */
-      case GL_STRICT_DEPTHFUNC_HINT_PGI:
-        *params = ENUM_TO_DOUBLE(GL_NICEST);
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         CHECK_EXTENSION_D(ARB_texture_compression, pname);
+         *params = (GLdouble) ctx->Hint.TextureCompression;
          break;
-      case GL_STRICT_LIGHTING_HINT_PGI:
-        *params = ENUM_TO_DOUBLE(ctx->Hint.StrictLighting);
-        break;
-      case GL_STRICT_SCISSOR_HINT_PGI:
-      case GL_FULL_STIPPLE_HINT_PGI:
-        *params = ENUM_TO_DOUBLE(GL_TRUE);
-        break;
-      case GL_CONSERVE_MEMORY_HINT_PGI:
-        *params = ENUM_TO_DOUBLE(GL_FALSE);
-        break;
-      case GL_ALWAYS_FAST_HINT_PGI:
-        *params = (GLdouble) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-                             ctx->Hint.AllowDrawSpn == GL_FALSE && 
-                             ctx->Hint.AllowDrawMem == GL_FALSE);
-        break;
-      case GL_ALWAYS_SOFT_HINT_PGI:
-        *params = (GLdouble) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-                             ctx->Hint.AllowDrawSpn == GL_TRUE && 
-                             ctx->Hint.AllowDrawMem == GL_TRUE);
-        break;
-      case GL_ALLOW_DRAW_OBJ_HINT_PGI:
-        *params = (GLdouble) GL_TRUE;
-        break;
-      case GL_ALLOW_DRAW_WIN_HINT_PGI:
-        *params = (GLdouble) ctx->Hint.AllowDrawWin;
-        break;
-      case GL_ALLOW_DRAW_SPN_HINT_PGI:
-        *params = (GLdouble) ctx->Hint.AllowDrawSpn;
-        break;
-      case GL_ALLOW_DRAW_MEM_HINT_PGI:
-        *params = (GLdouble) ctx->Hint.AllowDrawMem;
-        break;
-      case GL_CLIP_NEAR_HINT_PGI:
-      case GL_CLIP_FAR_HINT_PGI:
-        *params = ENUM_TO_DOUBLE(GL_TRUE);
-        break;
-      case GL_WIDE_LINE_HINT_PGI:
-        *params = ENUM_TO_DOUBLE(GL_DONT_CARE);
-        break;
-      case GL_BACK_NORMALS_HINT_PGI:
-        *params = ENUM_TO_DOUBLE(GL_TRUE);
+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_D(ARB_texture_compression, pname);
+         *params = (GLdouble) ctx->Const.NumCompressedTextureFormats;
+         break;
+      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_D(ARB_texture_compression, pname);
+         {
+            GLuint i;
+            for (i = 0; i < ctx->Const.NumCompressedTextureFormats; i++)
+               params[i] = (GLdouble) ctx->Const.CompressedTextureFormats[i];
+         }
+         break;
+
+      /* GL_EXT_compiled_vertex_array */
+      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
+        *params = (GLdouble) ctx->Array.LockFirst;
         break;
-      case GL_NATIVE_GRAPHICS_HANDLE_PGI:
-        *params = 0;
+      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
+        *params = (GLdouble) ctx->Array.LockCount;
         break;
 
+      /* GL_ARB_transpose_matrix */
+      case GL_TRANSPOSE_COLOR_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ColorMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLdouble) tm[i];
+            }
+         }
+         break;
+      case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ModelviewMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLdouble) tm[i];
+            }
+         }
+         break;
+      case GL_TRANSPOSE_PROJECTION_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ProjectionMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLdouble) tm[i];
+            }
+         }
+         break;
+      case GL_TRANSPOSE_TEXTURE_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->TextureMatrixStack[texUnit].Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLdouble) tm[i];
+            }
+         }
+         break;
 
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         CHECK_EXTENSION_D(HP_occlusion_test, pname);
+         *params = (GLdouble) ctx->Depth.OcclusionTest;
+         break;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         CHECK_EXTENSION_D(HP_occlusion_test, pname);
+         if (ctx->Depth.OcclusionTest)
+            *params = (GLdouble) ctx->OcclusionResult;
+         else
+            *params = (GLdouble) ctx->OcclusionResultSaved;
+         /* reset flag now */
+         ctx->OcclusionResult = GL_FALSE;
+         ctx->OcclusionResultSaved = GL_FALSE;
+         break;
 
-      default:
-        printf("invalid enum: %x\n", pname);
-         gl_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
-   }
-}
-
-
-
-
-void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
-{
-   GLuint i;
-   GLuint texUnit = ctx->Texture.CurrentUnit;
-   GLuint texTransformUnit = ctx->Texture.CurrentTransformUnit;
-   const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetFloatv");
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         *params = (GLdouble) ctx->Pixel.PixelTextureEnabled;
+         break;
 
-   if (MESA_VERBOSE & VERBOSE_API) 
-      fprintf(stderr, "glGetFloatv %s\n", gl_lookup_enum_by_nr(pname));
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         *params = (GLdouble) ctx->Pixel.PixelTextureEnabled;
+         break;
+      case GL_PIXEL_TEX_GEN_MODE_SGIX:
+         *params = (GLdouble) pixel_texgen_mode(ctx);
+         break;
 
-   switch (pname) {
-      case GL_ACCUM_RED_BITS:
-      case GL_ACCUM_GREEN_BITS:
-      case GL_ACCUM_BLUE_BITS:
-      case GL_ACCUM_ALPHA_BITS:
-         *params = (GLfloat) ctx->Visual->AccumBits;
+      /* GL_SGI_color_matrix (also in 1.2 imaging) */
+      case GL_COLOR_MATRIX_SGI:
+         for (i=0;i<16;i++) {
+           params[i] = (GLdouble) ctx->ColorMatrixStack.Top->m[i];
+        }
+        break;
+      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = (GLdouble) (ctx->ColorMatrixStack.Depth + 1);
          break;
-      case GL_ACCUM_CLEAR_VALUE:
-         params[0] = ctx->Accum.ClearColor[0];
-         params[1] = ctx->Accum.ClearColor[1];
-         params[2] = ctx->Accum.ClearColor[2];
-         params[3] = ctx->Accum.ClearColor[3];
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = (GLdouble) MAX_COLOR_STACK_DEPTH;
          break;
-      case GL_ALPHA_BIAS:
-         *params = ctx->Pixel.AlphaBias;
+      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixScale[0];
          break;
-      case GL_ALPHA_BITS:
-         *params = (GLfloat) ctx->Visual->AlphaBits;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixScale[1];
          break;
-      case GL_ALPHA_SCALE:
-         *params = ctx->Pixel.AlphaScale;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixScale[2];
          break;
-      case GL_ALPHA_TEST:
-         *params = (GLfloat) ctx->Color.AlphaEnabled;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixScale[3];
          break;
-      case GL_ALPHA_TEST_FUNC:
-         *params = ENUM_TO_FLOAT(ctx->Color.AlphaFunc);
+      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixBias[0];
          break;
-      case GL_ALPHA_TEST_REF:
-         *params = (GLfloat) ctx->Color.AlphaRef / 255.0;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixBias[1];
          break;
-      case GL_ATTRIB_STACK_DEPTH:
-         *params = (GLfloat) (ctx->AttribStackDepth);
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixBias[2];
          break;
-      case GL_AUTO_NORMAL:
-         *params = (GLfloat) ctx->Eval.AutoNormal;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixBias[3];
          break;
-      case GL_AUX_BUFFERS:
-         *params = (GLfloat) NUM_AUX_BUFFERS;
+
+      /* GL_EXT_convolution (also in 1.2 imaging) */
+      case GL_CONVOLUTION_1D_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.Convolution1DEnabled;
          break;
-      case GL_BLEND:
-         *params = (GLfloat) ctx->Color.BlendEnabled;
+      case GL_CONVOLUTION_2D:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.Convolution2DEnabled;
          break;
-      case GL_BLEND_DST:
-         *params = ENUM_TO_FLOAT(ctx->Color.BlendDstRGB);
+      case GL_SEPARABLE_2D:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.Separable2DEnabled;
          break;
-      case GL_BLEND_SRC:
-         *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB);
+      case GL_MAX_CONVOLUTION_WIDTH:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Const.MaxConvolutionWidth;
          break;
-      case GL_BLEND_SRC_RGB_INGR:
-         *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB);
+      case GL_MAX_CONVOLUTION_HEIGHT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Const.MaxConvolutionHeight;
          break;
-      case GL_BLEND_DST_RGB_INGR:
-         *params = ENUM_TO_FLOAT(ctx->Color.BlendDstRGB);
+      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionScale[0];
          break;
-      case GL_BLEND_SRC_ALPHA_INGR:
-         *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcA);
+      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionScale[1];
          break;
-      case GL_BLEND_DST_ALPHA_INGR:
-         *params = ENUM_TO_FLOAT(ctx->Color.BlendDstA);
+      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionScale[2];
          break;
-      case GL_BLEND_EQUATION_EXT:
-        *params = ENUM_TO_FLOAT(ctx->Color.BlendEquation);
+      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionScale[3];
+         break;
+      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionBias[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionBias[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionBias[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
+         CHECK_EXTENSION_D(EXT_convolution, pname);
+         *params = (GLdouble) ctx->Pixel.PostConvolutionBias[2];
+         break;
+
+      /* GL_EXT_histogram (also in 1.2 imaging) */
+      case GL_HISTOGRAM:
+         CHECK_EXTENSION_D(EXT_histogram, pname);
+         *params = (GLdouble) ctx->Pixel.HistogramEnabled;
+        break;
+      case GL_MINMAX:
+         CHECK_EXTENSION_D(EXT_histogram, pname);
+         *params = (GLdouble) ctx->Pixel.MinMaxEnabled;
+         break;
+
+      /* GL_SGI_color_table (also in 1.2 imaging */
+      case GL_COLOR_TABLE_SGI:
+         *params = (GLdouble) ctx->Pixel.ColorTableEnabled;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostConvolutionColorTableEnabled;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         *params = (GLdouble) ctx->Pixel.PostColorMatrixColorTableEnabled;
+         break;
+
+      /* GL_EXT_secondary_color */
+      case GL_COLOR_SUM_EXT:
+         CHECK_EXTENSION_D(EXT_secondary_color, pname);
+        *params = (GLdouble) ctx->Fog.ColorSumEnabled;
+        break;
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
+         CHECK_EXTENSION_D(EXT_secondary_color, pname);
+        FLUSH_CURRENT(ctx, 0);
+         params[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0];
+         params[1] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1];
+         params[2] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2];
+        break;
+      case GL_SECONDARY_COLOR_ARRAY_EXT:
+         CHECK_EXTENSION_D(EXT_secondary_color, pname);
+         *params = (GLdouble) ctx->Array.SecondaryColor.Enabled;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_D(EXT_secondary_color, pname);
+        *params = (GLdouble) ctx->Array.SecondaryColor.Type;
+        break;
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_D(EXT_secondary_color, pname);
+        *params = (GLdouble) ctx->Array.SecondaryColor.Stride;
+        break;
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
+         CHECK_EXTENSION_D(EXT_secondary_color, pname);
+        *params = (GLdouble) ctx->Array.SecondaryColor.Stride;
+        break;
+
+      /* GL_EXT_fog_coord */
+      case GL_CURRENT_FOG_COORDINATE_EXT:
+         CHECK_EXTENSION_D(EXT_fog_coord, pname);
+        FLUSH_CURRENT(ctx, 0);
+        *params = (GLdouble) ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
+        break;
+      case GL_FOG_COORDINATE_ARRAY_EXT:
+         CHECK_EXTENSION_D(EXT_fog_coord, pname);
+         *params = (GLdouble) ctx->Array.FogCoord.Enabled;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_D(EXT_fog_coord, pname);
+        *params = (GLdouble) ctx->Array.FogCoord.Type;
+        break;
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_D(EXT_fog_coord, pname);
+        *params = (GLdouble) ctx->Array.FogCoord.Stride;
+        break;
+
+      /* GL_EXT_texture_lod_bias */
+      case GL_MAX_TEXTURE_LOD_BIAS_EXT:
+         *params = (GLdouble) ctx->Const.MaxTextureLodBias;
+         break;
+
+      /* GL_EXT_texture_filter_anisotropic */
+      case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+         CHECK_EXTENSION_D(EXT_texture_filter_anisotropic, pname);
+         *params = (GLdouble) ctx->Const.MaxTextureMaxAnisotropy;
+        break;
+
+      /* GL_ARB_multisample */
+      case GL_MULTISAMPLE_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = (GLdouble) ctx->Multisample.Enabled;
+         break;
+      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = (GLdouble) ctx->Multisample.SampleAlphaToCoverage;
+         break;
+      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = (GLdouble) ctx->Multisample.SampleAlphaToOne;
+         break;
+      case GL_SAMPLE_COVERAGE_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = (GLdouble) ctx->Multisample.SampleCoverage;
+         break;
+      case GL_SAMPLE_COVERAGE_VALUE_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = ctx->Multisample.SampleCoverageValue;
+         break;
+      case GL_SAMPLE_COVERAGE_INVERT_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = (GLdouble) ctx->Multisample.SampleCoverageInvert;
+         break;
+      case GL_SAMPLE_BUFFERS_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = 0.0; /* XXX fix someday */
+         break;
+      case GL_SAMPLES_ARB:
+         CHECK_EXTENSION_D(ARB_multisample, pname);
+         *params = 0.0; /* XXX fix someday */
+         break;
+
+      /* GL_IBM_rasterpos_clip */
+      case GL_RASTER_POSITION_UNCLIPPED_IBM:
+         CHECK_EXTENSION_D(IBM_rasterpos_clip, pname);
+         *params = (GLdouble) ctx->Transform.RasterPositionUnclipped;
+         break;
+
+      /* GL_NV_point_sprite */
+      case GL_POINT_SPRITE_NV:
+         CHECK_EXTENSION_B(NV_point_sprite, pname);
+         *params = (GLdouble) ctx->Point.PointSprite;
+         break;
+      case GL_POINT_SPRITE_R_MODE_NV:
+         CHECK_EXTENSION_B(NV_point_sprite, pname);
+         *params = (GLdouble) ctx->Point.SpriteRMode;
+         break;
+
+      /* GL_SGIS_generate_mipmap */
+      case GL_GENERATE_MIPMAP_HINT_SGIS:
+         CHECK_EXTENSION_D(SGIS_generate_mipmap, pname);
+         *params = (GLdouble) ctx->Hint.GenerateMipmap;
+         break;
+
+      /* GL_NV_vertex_program */
+      case GL_VERTEX_PROGRAM_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) ctx->VertexProgram.Enabled;
+         break;
+      case GL_VERTEX_PROGRAM_POINT_SIZE_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) ctx->VertexProgram.PointSizeEnabled;
+         break;
+      case GL_VERTEX_PROGRAM_TWO_SIDE_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) ctx->VertexProgram.TwoSideEnabled;
+         break;
+      case GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) MAX_PROGRAM_STACK_DEPTH;
+         break;
+      case GL_MAX_TRACK_MATRICES_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) MAX_PROGRAM_MATRICES;
+         break;
+      case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) ctx->CurrentStack->Depth;
+         break;
+      case GL_CURRENT_MATRIX_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) ctx->Transform.MatrixMode;
+         break;
+      case GL_VERTEX_PROGRAM_BINDING_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) ctx->VertexProgram.CurrentID;
+         break;
+      case GL_PROGRAM_ERROR_POSITION_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         *params = (GLdouble) ctx->VertexProgram.ErrorPos;
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY0_NV:
+      case GL_VERTEX_ATTRIB_ARRAY1_NV:
+      case GL_VERTEX_ATTRIB_ARRAY2_NV:
+      case GL_VERTEX_ATTRIB_ARRAY3_NV:
+      case GL_VERTEX_ATTRIB_ARRAY4_NV:
+      case GL_VERTEX_ATTRIB_ARRAY5_NV:
+      case GL_VERTEX_ATTRIB_ARRAY6_NV:
+      case GL_VERTEX_ATTRIB_ARRAY7_NV:
+      case GL_VERTEX_ATTRIB_ARRAY8_NV:
+      case GL_VERTEX_ATTRIB_ARRAY9_NV:
+      case GL_VERTEX_ATTRIB_ARRAY10_NV:
+      case GL_VERTEX_ATTRIB_ARRAY11_NV:
+      case GL_VERTEX_ATTRIB_ARRAY12_NV:
+      case GL_VERTEX_ATTRIB_ARRAY13_NV:
+      case GL_VERTEX_ATTRIB_ARRAY14_NV:
+      case GL_VERTEX_ATTRIB_ARRAY15_NV:
+         CHECK_EXTENSION_D(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_VERTEX_ATTRIB_ARRAY0_NV;
+            *params = (GLdouble) ctx->Array.VertexAttrib[n].Enabled;
+         }
+         break;
+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP1_VERTEX_ATTRIB0_4_NV;
+            *params = (GLdouble) ctx->Eval.Map1Attrib[n];
+         }
+         break;
+      case GL_MAP2_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP2_VERTEX_ATTRIB0_4_NV;
+            *params = (GLdouble) ctx->Eval.Map2Attrib[n];
+         }
+         break;
+
+      /* GL_NV_texture_rectangle */
+      case GL_TEXTURE_RECTANGLE_NV:
+         CHECK_EXTENSION_D(NV_texture_rectangle, pname);
+         *params = (GLdouble) _mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV);
+         break;
+      case GL_TEXTURE_BINDING_RECTANGLE_NV:
+         CHECK_EXTENSION_D(NV_texture_rectangle, pname);
+         *params = (GLdouble) textureUnit->CurrentRect->Name;
+         break;
+      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
+         CHECK_EXTENSION_D(NV_texture_rectangle, pname);
+         *params = (GLdouble) ctx->Const.MaxTextureRectSize;
+         break;
+
+      default:
+         {
+            char s[100];
+            sprintf(s, "glGetDoublev(pname=0x%x)", pname);
+            _mesa_error( ctx, GL_INVALID_ENUM, s );
+         }
+   }
+}
+
+
+void
+_mesa_GetFloatv( GLenum pname, GLfloat *params )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLuint i;
+   GLuint texUnit = ctx->Texture.CurrentUnit;
+   const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!params)
+      return;
+
+   /* We need this in order to get correct results for
+    * GL_OCCLUSION_TEST_RESULT_HP.  There might be other important cases.
+    */
+   FLUSH_VERTICES(ctx, 0);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetFloatv %s\n", _mesa_lookup_enum_by_nr(pname));
+
+   if (ctx->Driver.GetFloatv && (*ctx->Driver.GetFloatv)(ctx, pname, params))
+      return;
+
+   switch (pname) {
+      case GL_ACCUM_RED_BITS:
+         *params = (GLfloat) ctx->Visual.accumRedBits;
+         break;
+      case GL_ACCUM_GREEN_BITS:
+         *params = (GLfloat) ctx->Visual.accumGreenBits;
+         break;
+      case GL_ACCUM_BLUE_BITS:
+         *params = (GLfloat) ctx->Visual.accumBlueBits;
+         break;
+      case GL_ACCUM_ALPHA_BITS:
+         *params = (GLfloat) ctx->Visual.accumAlphaBits;
+         break;
+      case GL_ACCUM_CLEAR_VALUE:
+         params[0] = ctx->Accum.ClearColor[0];
+         params[1] = ctx->Accum.ClearColor[1];
+         params[2] = ctx->Accum.ClearColor[2];
+         params[3] = ctx->Accum.ClearColor[3];
+         break;
+      case GL_ALPHA_BIAS:
+         *params = ctx->Pixel.AlphaBias;
+         break;
+      case GL_ALPHA_BITS:
+         *params = (GLfloat) ctx->Visual.alphaBits;
+         break;
+      case GL_ALPHA_SCALE:
+         *params = ctx->Pixel.AlphaScale;
+         break;
+      case GL_ALPHA_TEST:
+         *params = (GLfloat) ctx->Color.AlphaEnabled;
+         break;
+      case GL_ALPHA_TEST_FUNC:
+         *params = ENUM_TO_FLOAT(ctx->Color.AlphaFunc);
+         break;
+      case GL_ALPHA_TEST_REF:
+         *params = (GLfloat) ctx->Color.AlphaRef / CHAN_MAXF;
+         break;
+      case GL_ATTRIB_STACK_DEPTH:
+         *params = (GLfloat) (ctx->AttribStackDepth);
+         break;
+      case GL_AUTO_NORMAL:
+         *params = (GLfloat) ctx->Eval.AutoNormal;
+         break;
+      case GL_AUX_BUFFERS:
+         *params = (GLfloat) ctx->Const.NumAuxBuffers;
+         break;
+      case GL_BLEND:
+         *params = (GLfloat) ctx->Color.BlendEnabled;
+         break;
+      case GL_BLEND_DST:
+         *params = ENUM_TO_FLOAT(ctx->Color.BlendDstRGB);
+         break;
+      case GL_BLEND_SRC:
+         *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB);
+         break;
+      case GL_BLEND_SRC_RGB_EXT:
+         *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB);
+         break;
+      case GL_BLEND_DST_RGB_EXT:
+         *params = ENUM_TO_FLOAT(ctx->Color.BlendDstRGB);
+         break;
+      case GL_BLEND_SRC_ALPHA_EXT:
+         *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcA);
+         break;
+      case GL_BLEND_DST_ALPHA_EXT:
+         *params = ENUM_TO_FLOAT(ctx->Color.BlendDstA);
+         break;
+      case GL_BLEND_EQUATION_EXT:
+        *params = ENUM_TO_FLOAT(ctx->Color.BlendEquation);
         break;
       case GL_BLEND_COLOR_EXT:
         params[0] = ctx->Color.BlendColor[0];
@@ -1942,7 +2941,7 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
          *params = ctx->Pixel.BlueBias;
          break;
       case GL_BLUE_BITS:
-         *params = (GLfloat) ctx->Visual->BlueBits;
+         *params = (GLfloat) ctx->Visual.blueBits;
          break;
       case GL_BLUE_SCALE:
          *params = ctx->Pixel.BlueScale;
@@ -1956,13 +2955,16 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
       case GL_CLIP_PLANE3:
       case GL_CLIP_PLANE4:
       case GL_CLIP_PLANE5:
-         *params = (GLfloat) ctx->Transform.ClipEnabled[pname-GL_CLIP_PLANE0];
+         if (ctx->Transform.ClipPlanesEnabled & (1 << (pname - GL_CLIP_PLANE0)))
+            *params = 1.0;
+         else
+            *params = 0.0;
          break;
       case GL_COLOR_CLEAR_VALUE:
-         params[0] = (GLfloat) ctx->Color.ClearColor[0];
-         params[1] = (GLfloat) ctx->Color.ClearColor[1];
-         params[2] = (GLfloat) ctx->Color.ClearColor[2];
-         params[3] = (GLfloat) ctx->Color.ClearColor[3];
+         params[0] = CHAN_TO_FLOAT(ctx->Color.ClearColor[0]);
+         params[1] = CHAN_TO_FLOAT(ctx->Color.ClearColor[1]);
+         params[2] = CHAN_TO_FLOAT(ctx->Color.ClearColor[2]);
+         params[3] = CHAN_TO_FLOAT(ctx->Color.ClearColor[3]);
          break;
       case GL_COLOR_MATERIAL:
          *params = (GLfloat) ctx->Light.ColorMaterialEnabled;
@@ -1986,15 +2988,21 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
          *params = ENUM_TO_FLOAT(ctx->Polygon.CullFaceMode);
          break;
       case GL_CURRENT_COLOR:
-        UBYTE_RGBA_TO_FLOAT_RGBA(params, ctx->Current.ByteColor);
+        FLUSH_CURRENT(ctx, 0);
+         params[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0];
+         params[1] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1];
+         params[2] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2];
+         params[3] = ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3];
          break;
       case GL_CURRENT_INDEX:
+        FLUSH_CURRENT(ctx, 0);
          *params = (GLfloat) ctx->Current.Index;
          break;
       case GL_CURRENT_NORMAL:
-         params[0] = ctx->Current.Normal[0];
-         params[1] = ctx->Current.Normal[1];
-         params[2] = ctx->Current.Normal[2];
+        FLUSH_CURRENT(ctx, 0);
+         params[0] = ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0];
+         params[1] = ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1];
+         params[2] = ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2];
          break;
       case GL_CURRENT_RASTER_COLOR:
         params[0] = ctx->Current.RasterColor[0];
@@ -2015,25 +3023,26 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
         params[3] = ctx->Current.RasterPos[3];
         break;
       case GL_CURRENT_RASTER_TEXTURE_COORDS:
-        params[0] = ctx->Current.RasterMultiTexCoord[texTransformUnit][0];
-        params[1] = ctx->Current.RasterMultiTexCoord[texTransformUnit][1];
-        params[2] = ctx->Current.RasterMultiTexCoord[texTransformUnit][2];
-        params[3] = ctx->Current.RasterMultiTexCoord[texTransformUnit][3];
+        params[0] = ctx->Current.RasterTexCoords[texUnit][0];
+        params[1] = ctx->Current.RasterTexCoords[texUnit][1];
+        params[2] = ctx->Current.RasterTexCoords[texUnit][2];
+        params[3] = ctx->Current.RasterTexCoords[texUnit][3];
         break;
       case GL_CURRENT_RASTER_POSITION_VALID:
         *params = (GLfloat) ctx->Current.RasterPosValid;
         break;
       case GL_CURRENT_TEXTURE_COORDS:
-        params[0] = (GLfloat) ctx->Current.Texcoord[texTransformUnit][0];
-        params[1] = (GLfloat) ctx->Current.Texcoord[texTransformUnit][1];
-        params[2] = (GLfloat) ctx->Current.Texcoord[texTransformUnit][2];
-        params[3] = (GLfloat) ctx->Current.Texcoord[texTransformUnit][3];
+        FLUSH_CURRENT(ctx, 0);
+        params[0] = (GLfloat) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][0];
+        params[1] = (GLfloat) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][1];
+        params[2] = (GLfloat) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][2];
+        params[3] = (GLfloat) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][3];
         break;
       case GL_DEPTH_BIAS:
         *params = (GLfloat) ctx->Pixel.DepthBias;
         break;
       case GL_DEPTH_BITS:
-        *params = (GLfloat) ctx->Visual->DepthBits;
+        *params = (GLfloat) ctx->Visual.depthBits;
         break;
       case GL_DEPTH_CLEAR_VALUE:
         *params = (GLfloat) ctx->Depth.Clear;
@@ -2058,16 +3067,16 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
         *params = (GLfloat) ctx->Color.DitherFlag;
         break;
       case GL_DOUBLEBUFFER:
-        *params = (GLfloat) ctx->Visual->DBflag;
+        *params = (GLfloat) ctx->Visual.doubleBufferMode;
         break;
       case GL_DRAW_BUFFER:
         *params = ENUM_TO_FLOAT(ctx->Color.DrawBuffer);
         break;
       case GL_EDGE_FLAG:
+        FLUSH_CURRENT(ctx, 0);
         *params = (GLfloat) ctx->Current.EdgeFlag;
         break;
       case GL_FEEDBACK_BUFFER_SIZE:
-         /* TODO: is this right?  Or, return number of entries in buffer? */
          *params = (GLfloat) ctx->Feedback.BufferSize;
          break;
       case GL_FEEDBACK_BUFFER_TYPE:
@@ -2107,19 +3116,19 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
          *params = (GLfloat) ctx->Pixel.GreenBias;
          break;
       case GL_GREEN_BITS:
-         *params = (GLfloat) ctx->Visual->GreenBits;
+         *params = (GLfloat) ctx->Visual.greenBits;
          break;
       case GL_GREEN_SCALE:
          *params = (GLfloat) ctx->Pixel.GreenScale;
          break;
       case GL_INDEX_BITS:
-         *params = (GLfloat) ctx->Visual->IndexBits;
+         *params = (GLfloat) ctx->Visual.indexBits;
         break;
       case GL_INDEX_CLEAR_VALUE:
          *params = (GLfloat) ctx->Color.ClearIndex;
         break;
       case GL_INDEX_MODE:
-        *params = ctx->Visual->RGBAflag ? 0.0F : 1.0F;
+        *params = ctx->Visual.rgbMode ? 0.0F : 1.0F;
         break;
       case GL_INDEX_OFFSET:
         *params = (GLfloat) ctx->Pixel.IndexOffset;
@@ -2177,11 +3186,15 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
         *params = (GLfloat) ctx->Line.Width;
         break;
       case GL_LINE_WIDTH_GRANULARITY:
-        *params = (GLfloat) LINE_WIDTH_GRANULARITY;
+        *params = (GLfloat) ctx->Const.LineWidthGranularity;
         break;
       case GL_LINE_WIDTH_RANGE:
-        params[0] = (GLfloat) MIN_LINE_WIDTH;
-        params[1] = (GLfloat) MAX_LINE_WIDTH;
+        params[0] = (GLfloat) ctx->Const.MinLineWidthAA;
+        params[1] = (GLfloat) ctx->Const.MaxLineWidthAA;
+        break;
+      case GL_ALIASED_LINE_WIDTH_RANGE:
+        params[0] = (GLfloat) ctx->Const.MinLineWidth;
+        params[1] = (GLfloat) ctx->Const.MaxLineWidth;
         break;
       case GL_LIST_BASE:
         *params = (GLfloat) ctx->List.ListBase;
@@ -2289,19 +3302,19 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
          *params = (GLfloat) MAX_CLIENT_ATTRIB_STACK_DEPTH;
          break;
       case GL_MAX_CLIP_PLANES:
-        *params = (GLfloat) MAX_CLIP_PLANES;
+        *params = (GLfloat) ctx->Const.MaxClipPlanes;
         break;
       case GL_MAX_ELEMENTS_VERTICES:  /* GL_VERSION_1_2 */
-         *params = (GLfloat) VB_MAX;
+         *params = (GLfloat) ctx->Const.MaxArrayLockSize;
          break;
       case GL_MAX_ELEMENTS_INDICES:   /* GL_VERSION_1_2 */
-         *params = (GLfloat) VB_MAX;
+         *params = (GLfloat) ctx->Const.MaxArrayLockSize;
          break;
       case GL_MAX_EVAL_ORDER:
         *params = (GLfloat) MAX_EVAL_ORDER;
         break;
       case GL_MAX_LIGHTS:
-        *params = (GLfloat) MAX_LIGHTS;
+        *params = (GLfloat) ctx->Const.MaxLights;
         break;
       case GL_MAX_LIST_NESTING:
         *params = (GLfloat) MAX_LIST_NESTING;
@@ -2319,8 +3332,10 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
         *params = (GLfloat) MAX_PROJECTION_STACK_DEPTH;
         break;
       case GL_MAX_TEXTURE_SIZE:
+         *params = (GLfloat) (1 << (ctx->Const.MaxTextureLevels - 1));
+        break;
       case GL_MAX_3D_TEXTURE_SIZE:
-         *params = (GLfloat) ctx->Const.MaxTextureSize;
+         *params = (GLfloat) (1 << (ctx->Const.Max3DTextureLevels - 1));
         break;
       case GL_MAX_TEXTURE_STACK_DEPTH:
         *params = (GLfloat) MAX_TEXTURE_STACK_DEPTH;
@@ -2331,11 +3346,11 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
          break;
       case GL_MODELVIEW_MATRIX:
         for (i=0;i<16;i++) {
-           params[i] = ctx->ModelView.m[i];
+           params[i] = ctx->ModelviewMatrixStack.Top->m[i];
         }
         break;
       case GL_MODELVIEW_STACK_DEPTH:
-        *params = (GLfloat) (ctx->ModelViewStackDepth + 1);
+        *params = (GLfloat) (ctx->ModelviewMatrixStack.Depth + 1);
         break;
       case GL_NAME_STACK_DEPTH:
         *params = (GLfloat) ctx->Select.NameStackDepth;
@@ -2404,11 +3419,15 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
          *params = (GLfloat) ctx->Point.Size;
          break;
       case GL_POINT_SIZE_GRANULARITY:
-        *params = (GLfloat) POINT_SIZE_GRANULARITY;
+        *params = (GLfloat) ctx->Const.PointSizeGranularity;
         break;
       case GL_POINT_SIZE_RANGE:
-        params[0] = (GLfloat) MIN_POINT_SIZE;
-        params[1] = (GLfloat) MAX_POINT_SIZE;
+        params[0] = (GLfloat) ctx->Const.MinPointSizeAA;
+        params[1] = (GLfloat) ctx->Const.MaxPointSizeAA;
+        break;
+      case GL_ALIASED_POINT_SIZE_RANGE:
+        params[0] = (GLfloat) ctx->Const.MinPointSize;
+        params[1] = (GLfloat) ctx->Const.MaxPointSize;
         break;
       case GL_POINT_SMOOTH:
         *params = (GLfloat) ctx->Point.SmoothFlag;
@@ -2456,11 +3475,11 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
         break;
       case GL_PROJECTION_MATRIX:
         for (i=0;i<16;i++) {
-           params[i] = ctx->ProjectionMatrix.m[i];
+           params[i] = ctx->ProjectionMatrixStack.Top->m[i];
         }
         break;
       case GL_PROJECTION_STACK_DEPTH:
-        *params = (GLfloat) (ctx->ProjectionStackDepth + 1);
+        *params = (GLfloat) (ctx->ProjectionMatrixStack.Depth + 1);
         break;
       case GL_READ_BUFFER:
         *params = ENUM_TO_FLOAT(ctx->Pixel.ReadBuffer);
@@ -2469,7 +3488,7 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
          *params = ctx->Pixel.RedBias;
          break;
       case GL_RED_BITS:
-         *params = (GLfloat) ctx->Visual->RedBits;
+         *params = (GLfloat) ctx->Visual.redBits;
          break;
       case GL_RED_SCALE:
          *params = ctx->Pixel.RedScale;
@@ -2477,8 +3496,11 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
       case GL_RENDER_MODE:
         *params = ENUM_TO_FLOAT(ctx->RenderMode);
         break;
+      case GL_RESCALE_NORMAL:
+         *params = (GLfloat) ctx->Transform.RescaleNormals;
+         break;
       case GL_RGBA_MODE:
-        *params = (GLfloat) ctx->Visual->RGBAflag;
+        *params = (GLfloat) ctx->Visual.rgbMode;
         break;
       case GL_SCISSOR_BOX:
         params[0] = (GLfloat) ctx->Scissor.X;
@@ -2499,7 +3521,7 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
          *params = (GLfloat) ctx->Texture.SharedPalette;
          break;
       case GL_STENCIL_BITS:
-         *params = (GLfloat) ctx->Visual->StencilBits;
+         *params = (GLfloat) ctx->Visual.stencilBits;
          break;
       case GL_STENCIL_CLEAR_VALUE:
         *params = (GLfloat) ctx->Stencil.Clear;
@@ -2529,28 +3551,28 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
         *params = (GLfloat) ctx->Stencil.WriteMask;
         break;
       case GL_STEREO:
-        *params = (GLfloat) ctx->Visual->StereoFlag;
+        *params = (GLfloat) ctx->Visual.stereoMode;
         break;
       case GL_SUBPIXEL_BITS:
-        *params = 0.0F;  /* TODO */
+        *params = (GLfloat) ctx->Const.SubPixelBits;
         break;
       case GL_TEXTURE_1D:
-         *params = gl_IsEnabled(ctx, GL_TEXTURE_1D) ? 1.0 : 0.0;
+         *params = _mesa_IsEnabled(GL_TEXTURE_1D) ? 1.0F : 0.0F;
         break;
       case GL_TEXTURE_2D:
-         *params = gl_IsEnabled(ctx, GL_TEXTURE_2D) ? 1.0 : 0.0;
+         *params = _mesa_IsEnabled(GL_TEXTURE_2D) ? 1.0F : 0.0F;
         break;
       case GL_TEXTURE_3D:
-         *params = gl_IsEnabled(ctx, GL_TEXTURE_3D) ? 1.0 : 0.0;
+         *params = _mesa_IsEnabled(GL_TEXTURE_3D) ? 1.0F : 0.0F;
         break;
       case GL_TEXTURE_BINDING_1D:
-         *params = (GLfloat) textureUnit->CurrentD[1]->Name;
+         *params = (GLfloat) textureUnit->Current1D->Name;
           break;
       case GL_TEXTURE_BINDING_2D:
-         *params = (GLfloat) textureUnit->CurrentD[2]->Name;
+         *params = (GLfloat) textureUnit->Current2D->Name;
           break;
       case GL_TEXTURE_BINDING_3D:
-         *params = (GLfloat) textureUnit->CurrentD[2]->Name;
+         *params = (GLfloat) textureUnit->Current2D->Name;
           break;
       case GL_TEXTURE_ENV_COLOR:
         params[0] = textureUnit->EnvColor[0];
@@ -2562,24 +3584,24 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
         *params = ENUM_TO_FLOAT(textureUnit->EnvMode);
         break;
       case GL_TEXTURE_GEN_S:
-        *params = (textureUnit->TexGenEnabled & S_BIT) ? 1.0 : 0.0;
+        *params = (textureUnit->TexGenEnabled & S_BIT) ? 1.0F : 0.0F;
         break;
       case GL_TEXTURE_GEN_T:
-        *params = (textureUnit->TexGenEnabled & T_BIT) ? 1.0 : 0.0;
+        *params = (textureUnit->TexGenEnabled & T_BIT) ? 1.0F : 0.0F;
         break;
       case GL_TEXTURE_GEN_R:
-        *params = (textureUnit->TexGenEnabled & R_BIT) ? 1.0 : 0.0;
+        *params = (textureUnit->TexGenEnabled & R_BIT) ? 1.0F : 0.0F;
         break;
       case GL_TEXTURE_GEN_Q:
-        *params = (textureUnit->TexGenEnabled & Q_BIT) ? 1.0 : 0.0;
+        *params = (textureUnit->TexGenEnabled & Q_BIT) ? 1.0F : 0.0F;
         break;
       case GL_TEXTURE_MATRIX:
          for (i=0;i<16;i++) {
-           params[i] = ctx->TextureMatrix[texTransformUnit].m[i];
+           params[i] = ctx->TextureMatrixStack[texUnit].Top->m[i];
         }
         break;
       case GL_TEXTURE_STACK_DEPTH:
-        *params = (GLfloat) (ctx->TextureStackDepth[texTransformUnit] + 1);
+        *params = (GLfloat) (ctx->TextureMatrixStack[texUnit].Depth + 1);
         break;
       case GL_UNPACK_ALIGNMENT:
         *params = (GLfloat) ctx->Unpack.Alignment;
@@ -2617,6 +3639,9 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
       case GL_ZOOM_Y:
         *params = (GLfloat) ctx->Pixel.ZoomY;
         break;
+      case GL_VERTEX_ARRAY:
+         *params = (GLfloat) ctx->Array.Vertex.Enabled;
+         break;
       case GL_VERTEX_ARRAY_SIZE:
          *params = (GLfloat) ctx->Array.Vertex.Size;
          break;
@@ -2629,6 +3654,9 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
       case GL_VERTEX_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
+      case GL_NORMAL_ARRAY:
+         *params = (GLfloat) ctx->Array.Normal.Enabled;
+         break;
       case GL_NORMAL_ARRAY_TYPE:
          *params = ENUM_TO_FLOAT(ctx->Array.Normal.Type);
          break;
@@ -2638,6 +3666,9 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
       case GL_NORMAL_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
+      case GL_COLOR_ARRAY:
+         *params = (GLfloat) ctx->Array.Color.Enabled;
+         break;
       case GL_COLOR_ARRAY_SIZE:
          *params = (GLfloat) ctx->Array.Color.Size;
          break;
@@ -2650,6 +3681,9 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
       case GL_COLOR_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
+      case GL_INDEX_ARRAY:
+         *params = (GLfloat) ctx->Array.Index.Enabled;
+         break;
       case GL_INDEX_ARRAY_TYPE:
          *params = ENUM_TO_FLOAT(ctx->Array.Index.Type);
          break;
@@ -2659,6 +3693,9 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
       case GL_INDEX_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
+      case GL_TEXTURE_COORD_ARRAY:
+         *params = (GLfloat) ctx->Array.TexCoord[texUnit].Enabled;
+         break;
       case GL_TEXTURE_COORD_ARRAY_SIZE:
          *params = (GLfloat) ctx->Array.TexCoord[texUnit].Size;
          break;
@@ -2671,6 +3708,9 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
       case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
          *params = 0.0;
          break;
+      case GL_EDGE_FLAG_ARRAY:
+         *params = (GLfloat) ctx->Array.EdgeFlag.Enabled;
+         break;
       case GL_EDGE_FLAG_ARRAY_STRIDE:
          *params = (GLfloat) ctx->Array.EdgeFlag.Stride;
          break;
@@ -2678,93 +3718,496 @@ void gl_GetFloatv( GLcontext *ctx, GLenum pname, GLfloat *params )
          *params = 0.0;
          break;
 
+      /* GL_ARB_multitexture */
       case GL_MAX_TEXTURE_UNITS_ARB:
+         CHECK_EXTENSION_F(ARB_multitexture, pname);
          *params = (GLfloat) ctx->Const.MaxTextureUnits;
          break;
       case GL_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_F(ARB_multitexture, pname);
          *params = (GLfloat) (GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit);
          break;
       case GL_CLIENT_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_F(ARB_multitexture, pname);
          *params = (GLfloat) (GL_TEXTURE0_ARB + ctx->Array.ActiveTexture);
          break;
 
-      /* GL_PGI_misc_hints */
-      case GL_STRICT_DEPTHFUNC_HINT_PGI:
-        *params = ENUM_TO_FLOAT(GL_NICEST);
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         CHECK_EXTENSION_F(ARB_texture_cube_map, pname);
+         *params = (GLfloat) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
          break;
-      case GL_STRICT_LIGHTING_HINT_PGI:
-        *params = ENUM_TO_FLOAT(ctx->Hint.StrictLighting);
-        break;
-      case GL_STRICT_SCISSOR_HINT_PGI:
-      case GL_FULL_STIPPLE_HINT_PGI:
-        *params = ENUM_TO_FLOAT(GL_TRUE);
-        break;
-      case GL_CONSERVE_MEMORY_HINT_PGI:
-        *params = ENUM_TO_FLOAT(GL_FALSE);
-        break;
-      case GL_ALWAYS_FAST_HINT_PGI:
-        *params = (GLfloat) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-                             ctx->Hint.AllowDrawSpn == GL_FALSE && 
-                             ctx->Hint.AllowDrawMem == GL_FALSE);
-        break;
-      case GL_ALWAYS_SOFT_HINT_PGI:
-        *params = (GLfloat) (ctx->Hint.AllowDrawWin == GL_TRUE &&
-                             ctx->Hint.AllowDrawSpn == GL_TRUE && 
-                             ctx->Hint.AllowDrawMem == GL_TRUE);
+      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+         CHECK_EXTENSION_F(ARB_texture_cube_map, pname);
+         *params = (GLfloat) textureUnit->CurrentCubeMap->Name;
+         break;
+      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+         CHECK_EXTENSION_F(ARB_texture_cube_map, pname);
+         *params = (GLfloat) (1 << (ctx->Const.MaxCubeTextureLevels - 1));
+         break;
+
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         CHECK_EXTENSION_F(ARB_texture_compression, pname);
+         *params = (GLfloat) ctx->Hint.TextureCompression;
+         break;
+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_F(ARB_texture_compression, pname);
+         *params = (GLfloat) ctx->Const.NumCompressedTextureFormats;
+         break;
+      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_F(ARB_texture_compression, pname);
+         {
+            GLuint i;
+            for (i = 0; i < ctx->Const.NumCompressedTextureFormats; i++)
+               params[i] = (GLfloat) ctx->Const.CompressedTextureFormats[i];
+         }
+         break;
+
+      /* GL_EXT_compiled_vertex_array */
+      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
+         CHECK_EXTENSION_F(EXT_compiled_vertex_array, pname);
+        *params = (GLfloat) ctx->Array.LockFirst;
         break;
-      case GL_ALLOW_DRAW_OBJ_HINT_PGI:
-        *params = (GLfloat) GL_TRUE;
+      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
+         CHECK_EXTENSION_F(EXT_compiled_vertex_array, pname);
+        *params = (GLfloat) ctx->Array.LockCount;
         break;
-      case GL_ALLOW_DRAW_WIN_HINT_PGI:
-        *params = (GLfloat) ctx->Hint.AllowDrawWin;
+
+      /* GL_ARB_transpose_matrix */
+      case GL_TRANSPOSE_COLOR_MATRIX_ARB:
+         _math_transposef(params, ctx->ColorMatrixStack.Top->m);
+         break;
+      case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
+         _math_transposef(params, ctx->ModelviewMatrixStack.Top->m);
+         break;
+      case GL_TRANSPOSE_PROJECTION_MATRIX_ARB:
+         _math_transposef(params, ctx->ProjectionMatrixStack.Top->m);
+         break;
+      case GL_TRANSPOSE_TEXTURE_MATRIX_ARB:
+         _math_transposef(params, ctx->TextureMatrixStack[texUnit].Top->m);
+         break;
+
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         CHECK_EXTENSION_F(HP_occlusion_test, pname);
+         *params = (GLfloat) ctx->Depth.OcclusionTest;
+         break;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         CHECK_EXTENSION_F(HP_occlusion_test, pname);
+         if (ctx->Depth.OcclusionTest)
+            *params = (GLfloat) ctx->OcclusionResult;
+         else
+            *params = (GLfloat) ctx->OcclusionResultSaved;
+         /* reset flag now */
+         ctx->OcclusionResult = GL_FALSE;
+         ctx->OcclusionResultSaved = GL_FALSE;
+         break;
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         *params = (GLfloat) ctx->Pixel.PixelTextureEnabled;
+         break;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         *params = (GLfloat) ctx->Pixel.PixelTextureEnabled;
+         break;
+      case GL_PIXEL_TEX_GEN_MODE_SGIX:
+         *params = (GLfloat) pixel_texgen_mode(ctx);
+         break;
+
+      /* GL_SGI_color_matrix (also in 1.2 imaging) */
+      case GL_COLOR_MATRIX_SGI:
+         for (i=0;i<16;i++) {
+           params[i] = ctx->ColorMatrixStack.Top->m[i];
+        }
         break;
-      case GL_ALLOW_DRAW_SPN_HINT_PGI:
-        *params = (GLfloat) ctx->Hint.AllowDrawSpn;
+      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = (GLfloat) (ctx->ColorMatrixStack.Depth + 1);
+         break;
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
+         *params = (GLfloat) MAX_COLOR_STACK_DEPTH;
+         break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
+         *params = ctx->Pixel.PostColorMatrixScale[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
+         *params = ctx->Pixel.PostColorMatrixScale[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
+         *params = ctx->Pixel.PostColorMatrixScale[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
+         *params = ctx->Pixel.PostColorMatrixScale[3];
+         break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
+         *params = ctx->Pixel.PostColorMatrixBias[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
+         *params = ctx->Pixel.PostColorMatrixBias[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
+         *params = ctx->Pixel.PostColorMatrixBias[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
+         *params = ctx->Pixel.PostColorMatrixBias[3];
+         break;
+
+      /* GL_EXT_convolution (also in 1.2 imaging) */
+      case GL_CONVOLUTION_1D_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = (GLfloat) ctx->Pixel.Convolution1DEnabled;
+         break;
+      case GL_CONVOLUTION_2D:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = (GLfloat) ctx->Pixel.Convolution2DEnabled;
+         break;
+      case GL_SEPARABLE_2D:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = (GLfloat) ctx->Pixel.Separable2DEnabled;
+         break;
+      case GL_MAX_CONVOLUTION_WIDTH:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = (GLfloat) ctx->Const.MaxConvolutionWidth;
+         break;
+      case GL_MAX_CONVOLUTION_HEIGHT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = (GLfloat) ctx->Const.MaxConvolutionHeight;
+         break;
+      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionScale[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionScale[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionScale[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionScale[3];
+         break;
+      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionBias[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionBias[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionBias[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
+         CHECK_EXTENSION_F(EXT_convolution, pname);
+         *params = ctx->Pixel.PostConvolutionBias[2];
+         break;
+
+      /* GL_EXT_histogram (also in 1.2 imaging) */
+      case GL_HISTOGRAM:
+         CHECK_EXTENSION_F(EXT_histogram, pname);
+         *params = (GLfloat) ctx->Pixel.HistogramEnabled;
         break;
-      case GL_ALLOW_DRAW_MEM_HINT_PGI:
-        *params = (GLfloat) ctx->Hint.AllowDrawMem;
+      case GL_MINMAX:
+         CHECK_EXTENSION_F(EXT_histogram, pname);
+         *params = (GLfloat) ctx->Pixel.MinMaxEnabled;
+         break;
+
+      /* GL_SGI_color_table (also in 1.2 imaging */
+      case GL_COLOR_TABLE_SGI:
+         *params = (GLfloat) ctx->Pixel.ColorTableEnabled;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         *params = (GLfloat) ctx->Pixel.PostConvolutionColorTableEnabled;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         *params = (GLfloat) ctx->Pixel.PostColorMatrixColorTableEnabled;
+         break;
+
+      /* GL_EXT_secondary_color */
+      case GL_COLOR_SUM_EXT:
+         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+        *params = (GLfloat) ctx->Fog.ColorSumEnabled;
+        break;
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
+         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+        FLUSH_CURRENT(ctx, 0);
+         params[0] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0];
+         params[1] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1];
+         params[2] = ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2];
+        break;
+      case GL_SECONDARY_COLOR_ARRAY_EXT:
+         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+         *params = (GLfloat) ctx->Array.SecondaryColor.Enabled;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+        *params = (GLfloat) ctx->Array.SecondaryColor.Type;
+        break;
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+        *params = (GLfloat) ctx->Array.SecondaryColor.Stride;
+        break;
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
+         CHECK_EXTENSION_F(EXT_secondary_color, pname);
+        *params = (GLfloat) ctx->Array.SecondaryColor.Stride;
         break;
-      case GL_CLIP_NEAR_HINT_PGI:
-      case GL_CLIP_FAR_HINT_PGI:
-        *params = ENUM_TO_FLOAT(GL_TRUE);
+
+      /* GL_EXT_fog_coord */
+      case GL_CURRENT_FOG_COORDINATE_EXT:
+         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+        FLUSH_CURRENT(ctx, 0);
+        *params = (GLfloat) ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
         break;
-      case GL_WIDE_LINE_HINT_PGI:
-        *params = ENUM_TO_FLOAT(GL_DONT_CARE);
+      case GL_FOG_COORDINATE_ARRAY_EXT:
+         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+         *params = (GLfloat) ctx->Array.FogCoord.Enabled;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+        *params = (GLfloat) ctx->Array.FogCoord.Type;
         break;
-      case GL_BACK_NORMALS_HINT_PGI:
-        *params = ENUM_TO_FLOAT(GL_TRUE);
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_F(EXT_fog_coord, pname);
+        *params = (GLfloat) ctx->Array.FogCoord.Stride;
         break;
-      case GL_NATIVE_GRAPHICS_HANDLE_PGI:
-        *params = 0;
+
+      /* GL_EXT_texture_lod_bias */
+      case GL_MAX_TEXTURE_LOD_BIAS_EXT:
+         *params = ctx->Const.MaxTextureLodBias;
+         break;
+
+      /* GL_EXT_texture_filter_anisotropic */
+      case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+         CHECK_EXTENSION_F(EXT_texture_filter_anisotropic, pname);
+         *params = ctx->Const.MaxTextureMaxAnisotropy;
         break;
 
+      /* GL_ARB_multisample */
+      case GL_MULTISAMPLE_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = (GLfloat) ctx->Multisample.Enabled;
+         break;
+      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = (GLfloat) ctx->Multisample.SampleAlphaToCoverage;
+         break;
+      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = (GLfloat) ctx->Multisample.SampleAlphaToOne;
+         break;
+      case GL_SAMPLE_COVERAGE_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = (GLfloat) ctx->Multisample.SampleCoverage;
+         break;
+      case GL_SAMPLE_COVERAGE_VALUE_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = ctx->Multisample.SampleCoverageValue;
+         break;
+      case GL_SAMPLE_COVERAGE_INVERT_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = (GLfloat) ctx->Multisample.SampleCoverageInvert;
+         break;
+      case GL_SAMPLE_BUFFERS_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = 0.0; /* XXX fix someday */
+         break;
+      case GL_SAMPLES_ARB:
+         CHECK_EXTENSION_F(ARB_multisample, pname);
+         *params = 0.0; /* XXX fix someday */
+         break;
+
+      /* GL_IBM_rasterpos_clip */
+      case GL_RASTER_POSITION_UNCLIPPED_IBM:
+         CHECK_EXTENSION_F(IBM_rasterpos_clip, pname);
+         *params = (GLfloat) ctx->Transform.RasterPositionUnclipped;
+         break;
+
+      /* GL_NV_point_sprite */
+      case GL_POINT_SPRITE_NV:
+         CHECK_EXTENSION_B(NV_point_sprite, pname);
+         *params = (GLfloat) ctx->Point.PointSprite;
+         break;
+      case GL_POINT_SPRITE_R_MODE_NV:
+         CHECK_EXTENSION_B(NV_point_sprite, pname);
+         *params = (GLfloat) ctx->Point.SpriteRMode;
+         break;
+
+      /* GL_SGIS_generate_mipmap */
+      case GL_GENERATE_MIPMAP_HINT_SGIS:
+         CHECK_EXTENSION_F(SGIS_generate_mipmap, pname);
+         *params = (GLfloat) ctx->Hint.GenerateMipmap;
+         break;
+
+      /* GL_NV_vertex_program */
+      case GL_VERTEX_PROGRAM_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) ctx->VertexProgram.Enabled;
+         break;
+      case GL_VERTEX_PROGRAM_POINT_SIZE_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) ctx->VertexProgram.PointSizeEnabled;
+         break;
+      case GL_VERTEX_PROGRAM_TWO_SIDE_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) ctx->VertexProgram.TwoSideEnabled;
+         break;
+      case GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) MAX_PROGRAM_STACK_DEPTH;
+         break;
+      case GL_MAX_TRACK_MATRICES_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) MAX_PROGRAM_MATRICES;
+         break;
+      case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) ctx->CurrentStack->Depth;
+         break;
+      case GL_CURRENT_MATRIX_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) ctx->Transform.MatrixMode;
+         break;
+      case GL_VERTEX_PROGRAM_BINDING_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) ctx->VertexProgram.CurrentID;
+         break;
+      case GL_PROGRAM_ERROR_POSITION_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         *params = (GLfloat) ctx->VertexProgram.ErrorPos;
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY0_NV:
+      case GL_VERTEX_ATTRIB_ARRAY1_NV:
+      case GL_VERTEX_ATTRIB_ARRAY2_NV:
+      case GL_VERTEX_ATTRIB_ARRAY3_NV:
+      case GL_VERTEX_ATTRIB_ARRAY4_NV:
+      case GL_VERTEX_ATTRIB_ARRAY5_NV:
+      case GL_VERTEX_ATTRIB_ARRAY6_NV:
+      case GL_VERTEX_ATTRIB_ARRAY7_NV:
+      case GL_VERTEX_ATTRIB_ARRAY8_NV:
+      case GL_VERTEX_ATTRIB_ARRAY9_NV:
+      case GL_VERTEX_ATTRIB_ARRAY10_NV:
+      case GL_VERTEX_ATTRIB_ARRAY11_NV:
+      case GL_VERTEX_ATTRIB_ARRAY12_NV:
+      case GL_VERTEX_ATTRIB_ARRAY13_NV:
+      case GL_VERTEX_ATTRIB_ARRAY14_NV:
+      case GL_VERTEX_ATTRIB_ARRAY15_NV:
+         CHECK_EXTENSION_F(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_VERTEX_ATTRIB_ARRAY0_NV;
+            *params = (GLfloat) ctx->Array.VertexAttrib[n].Enabled;
+         }
+         break;
+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP1_VERTEX_ATTRIB0_4_NV;
+            *params = (GLfloat) ctx->Eval.Map1Attrib[n];
+         }
+         break;
+      case GL_MAP2_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP2_VERTEX_ATTRIB0_4_NV;
+            *params = (GLfloat) ctx->Eval.Map2Attrib[n];
+         }
+         break;
+
+      /* GL_NV_texture_rectangle */
+      case GL_TEXTURE_RECTANGLE_NV:
+         CHECK_EXTENSION_F(NV_texture_rectangle, pname);
+         *params = (GLfloat) _mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV);
+         break;
+      case GL_TEXTURE_BINDING_RECTANGLE_NV:
+         CHECK_EXTENSION_F(NV_texture_rectangle, pname);
+         *params = (GLfloat) textureUnit->CurrentRect->Name;
+         break;
+      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
+         CHECK_EXTENSION_F(NV_texture_rectangle, pname);
+         *params = (GLfloat) ctx->Const.MaxTextureRectSize;
+         break;
+
       default:
-        printf("invalid enum: %x\n", pname);
-         gl_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
+         {
+            char s[100];
+            sprintf(s, "glGetFloatv(0x%x)", pname);
+            _mesa_error(ctx, GL_INVALID_ENUM, s);
+         }
    }
 }
 
 
-
-
-void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
+void
+_mesa_GetIntegerv( GLenum pname, GLint *params )
 {
+   GET_CURRENT_CONTEXT(ctx);
    GLuint i;
    GLuint texUnit = ctx->Texture.CurrentUnit;
-   GLuint texTransformUnit = ctx->Texture.CurrentTransformUnit;
    const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!params)
+      return;
+
+   /* We need this in order to get correct results for
+    * GL_OCCLUSION_TEST_RESULT_HP.  There might be other important cases.
+    */
+   FLUSH_VERTICES(ctx, 0);
 
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetIntegerv");
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetIntegerv %s\n", _mesa_lookup_enum_by_nr(pname));
 
-   if (MESA_VERBOSE & VERBOSE_API) 
-      fprintf(stderr, "glGetIntegerv %s\n", gl_lookup_enum_by_nr(pname));
+   if (ctx->Driver.GetIntegerv
+       && (*ctx->Driver.GetIntegerv)(ctx, pname, params))
+      return;
 
    switch (pname) {
       case GL_ACCUM_RED_BITS:
+         *params = (GLint) ctx->Visual.accumRedBits;
+         break;
       case GL_ACCUM_GREEN_BITS:
+         *params = (GLint) ctx->Visual.accumGreenBits;
+         break;
       case GL_ACCUM_BLUE_BITS:
+         *params = (GLint) ctx->Visual.accumBlueBits;
+         break;
       case GL_ACCUM_ALPHA_BITS:
-         *params = (GLint) ctx->Visual->AccumBits;
+         *params = (GLint) ctx->Visual.accumAlphaBits;
          break;
       case GL_ACCUM_CLEAR_VALUE:
          params[0] = FLOAT_TO_INT( ctx->Accum.ClearColor[0] );
@@ -2776,7 +4219,7 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
          *params = (GLint) ctx->Pixel.AlphaBias;
          break;
       case GL_ALPHA_BITS:
-         *params = ctx->Visual->AlphaBits;
+         *params = ctx->Visual.alphaBits;
          break;
       case GL_ALPHA_SCALE:
          *params = (GLint) ctx->Pixel.AlphaScale;
@@ -2785,7 +4228,7 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
          *params = (GLint) ctx->Color.AlphaEnabled;
          break;
       case GL_ALPHA_TEST_REF:
-         *params = FLOAT_TO_INT( (GLfloat) ctx->Color.AlphaRef / 255.0 );
+         *params = FLOAT_TO_INT( (GLfloat) ctx->Color.AlphaRef / CHAN_MAXF );
          break;
       case GL_ALPHA_TEST_FUNC:
          *params = (GLint) ctx->Color.AlphaFunc;
@@ -2797,7 +4240,7 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
          *params = (GLint) ctx->Eval.AutoNormal;
          break;
       case GL_AUX_BUFFERS:
-         *params = (GLint) NUM_AUX_BUFFERS;
+         *params = (GLint) ctx->Const.NumAuxBuffers;
          break;
       case GL_BLEND:
          *params = (GLint) ctx->Color.BlendEnabled;
@@ -2808,16 +4251,16 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
       case GL_BLEND_SRC:
          *params = (GLint) ctx->Color.BlendSrcRGB;
          break;
-      case GL_BLEND_SRC_RGB_INGR:
+      case GL_BLEND_SRC_RGB_EXT:
          *params = (GLint) ctx->Color.BlendSrcRGB;
          break;
-      case GL_BLEND_DST_RGB_INGR:
+      case GL_BLEND_DST_RGB_EXT:
          *params = (GLint) ctx->Color.BlendDstRGB;
          break;
-      case GL_BLEND_SRC_ALPHA_INGR:
+      case GL_BLEND_SRC_ALPHA_EXT:
          *params = (GLint) ctx->Color.BlendSrcA;
          break;
-      case GL_BLEND_DST_ALPHA_INGR:
+      case GL_BLEND_DST_ALPHA_EXT:
          *params = (GLint) ctx->Color.BlendDstA;
          break;
       case GL_BLEND_EQUATION_EXT:
@@ -2833,7 +4276,7 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
          *params = (GLint) ctx->Pixel.BlueBias;
          break;
       case GL_BLUE_BITS:
-         *params = (GLint) ctx->Visual->BlueBits;
+         *params = (GLint) ctx->Visual.blueBits;
          break;
       case GL_BLUE_SCALE:
          *params = (GLint) ctx->Pixel.BlueScale;
@@ -2847,14 +4290,16 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
       case GL_CLIP_PLANE3:
       case GL_CLIP_PLANE4:
       case GL_CLIP_PLANE5:
-         i = (GLint) (pname - GL_CLIP_PLANE0);
-         *params = (GLint) ctx->Transform.ClipEnabled[i];
+         if (ctx->Transform.ClipPlanesEnabled & (1 << (pname - GL_CLIP_PLANE0)))
+            *params = 1;
+         else
+            *params = 0;
          break;
       case GL_COLOR_CLEAR_VALUE:
-         params[0] = FLOAT_TO_INT( ctx->Color.ClearColor[0] );
-         params[1] = FLOAT_TO_INT( ctx->Color.ClearColor[1] );
-         params[2] = FLOAT_TO_INT( ctx->Color.ClearColor[2] );
-         params[3] = FLOAT_TO_INT( ctx->Color.ClearColor[3] );
+         params[0] = FLOAT_TO_INT( (ctx->Color.ClearColor[0]) );
+         params[1] = FLOAT_TO_INT( (ctx->Color.ClearColor[1]) );
+         params[2] = FLOAT_TO_INT( (ctx->Color.ClearColor[2]) );
+         params[3] = FLOAT_TO_INT( (ctx->Color.ClearColor[3]) );
          break;
       case GL_COLOR_MATERIAL:
          *params = (GLint) ctx->Light.ColorMaterialEnabled;
@@ -2878,18 +4323,21 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
          *params = (GLint) ctx->Polygon.CullFaceMode;
          break;
       case GL_CURRENT_COLOR:
-         params[0] = FLOAT_TO_INT( UBYTE_COLOR_TO_FLOAT_COLOR( ctx->Current.ByteColor[0] ) );
-         params[1] = FLOAT_TO_INT( UBYTE_COLOR_TO_FLOAT_COLOR( ctx->Current.ByteColor[1] ) );
-         params[2] = FLOAT_TO_INT( UBYTE_COLOR_TO_FLOAT_COLOR( ctx->Current.ByteColor[2] ) );
-         params[3] = FLOAT_TO_INT( UBYTE_COLOR_TO_FLOAT_COLOR( ctx->Current.ByteColor[3] ) );
+        FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][0]);
+         params[1] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][1]);
+         params[2] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][2]);
+         params[3] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_COLOR0][3]);
          break;
       case GL_CURRENT_INDEX:
+        FLUSH_CURRENT(ctx, 0);
          *params = (GLint) ctx->Current.Index;
          break;
       case GL_CURRENT_NORMAL:
-         params[0] = FLOAT_TO_INT( ctx->Current.Normal[0] );
-         params[1] = FLOAT_TO_INT( ctx->Current.Normal[1] );
-         params[2] = FLOAT_TO_INT( ctx->Current.Normal[2] );
+        FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][0]);
+         params[1] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][1]);
+         params[2] = FLOAT_TO_INT(ctx->Current.Attrib[VERT_ATTRIB_NORMAL][2]);
          break;
       case GL_CURRENT_RASTER_COLOR:
         params[0] = FLOAT_TO_INT( ctx->Current.RasterColor[0] );
@@ -2910,25 +4358,26 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
         params[3] = (GLint) ctx->Current.RasterPos[3];
         break;
       case GL_CURRENT_RASTER_TEXTURE_COORDS:
-        params[0] = (GLint) ctx->Current.RasterMultiTexCoord[texTransformUnit][0];
-        params[1] = (GLint) ctx->Current.RasterMultiTexCoord[texTransformUnit][1];
-        params[2] = (GLint) ctx->Current.RasterMultiTexCoord[texTransformUnit][2];
-        params[3] = (GLint) ctx->Current.RasterMultiTexCoord[texTransformUnit][3];
+        params[0] = (GLint) ctx->Current.RasterTexCoords[texUnit][0];
+        params[1] = (GLint) ctx->Current.RasterTexCoords[texUnit][1];
+        params[2] = (GLint) ctx->Current.RasterTexCoords[texUnit][2];
+        params[3] = (GLint) ctx->Current.RasterTexCoords[texUnit][3];
         break;
       case GL_CURRENT_RASTER_POSITION_VALID:
         *params = (GLint) ctx->Current.RasterPosValid;
         break;
       case GL_CURRENT_TEXTURE_COORDS:
-         params[0] = (GLint) ctx->Current.Texcoord[texTransformUnit][0];
-         params[1] = (GLint) ctx->Current.Texcoord[texTransformUnit][1];
-         params[2] = (GLint) ctx->Current.Texcoord[texTransformUnit][2];
-         params[3] = (GLint) ctx->Current.Texcoord[texTransformUnit][3];
+        FLUSH_CURRENT(ctx, 0);
+         params[0] = (GLint) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][0];
+         params[1] = (GLint) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][1];
+         params[2] = (GLint) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][2];
+         params[3] = (GLint) ctx->Current.Attrib[VERT_ATTRIB_TEX0 + texUnit][3];
         break;
       case GL_DEPTH_BIAS:
          *params = (GLint) ctx->Pixel.DepthBias;
         break;
       case GL_DEPTH_BITS:
-        *params = ctx->Visual->DepthBits;
+        *params = ctx->Visual.depthBits;
         break;
       case GL_DEPTH_CLEAR_VALUE:
          *params = (GLint) ctx->Depth.Clear;
@@ -2953,16 +4402,16 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
         *params = (GLint) ctx->Color.DitherFlag;
         break;
       case GL_DOUBLEBUFFER:
-        *params = (GLint) ctx->Visual->DBflag;
+        *params = (GLint) ctx->Visual.doubleBufferMode;
         break;
       case GL_DRAW_BUFFER:
         *params = (GLint) ctx->Color.DrawBuffer;
         break;
       case GL_EDGE_FLAG:
+        FLUSH_CURRENT(ctx, 0);
         *params = (GLint) ctx->Current.EdgeFlag;
         break;
       case GL_FEEDBACK_BUFFER_SIZE:
-         /* TODO: is this right?  Or, return number of entries in buffer? */
          *params = ctx->Feedback.BufferSize;
          break;
       case GL_FEEDBACK_BUFFER_TYPE:
@@ -3002,19 +4451,19 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
          *params = (GLint) ctx->Pixel.GreenBias;
          break;
       case GL_GREEN_BITS:
-         *params = (GLint) ctx->Visual->GreenBits;
+         *params = (GLint) ctx->Visual.greenBits;
          break;
       case GL_GREEN_SCALE:
          *params = (GLint) ctx->Pixel.GreenScale;
          break;
       case GL_INDEX_BITS:
-         *params = (GLint) ctx->Visual->IndexBits;
+         *params = (GLint) ctx->Visual.indexBits;
          break;
       case GL_INDEX_CLEAR_VALUE:
          *params = (GLint) ctx->Color.ClearIndex;
          break;
       case GL_INDEX_MODE:
-        *params = ctx->Visual->RGBAflag ? 0 : 1;
+        *params = ctx->Visual.rgbMode ? 0 : 1;
         break;
       case GL_INDEX_OFFSET:
         *params = ctx->Pixel.IndexOffset;
@@ -3072,11 +4521,15 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
         *params = (GLint) ctx->Line.Width;
         break;
       case GL_LINE_WIDTH_GRANULARITY:
-        *params = (GLint) LINE_WIDTH_GRANULARITY;
+        *params = (GLint) ctx->Const.LineWidthGranularity;
         break;
       case GL_LINE_WIDTH_RANGE:
-        params[0] = (GLint) MIN_LINE_WIDTH;
-        params[1] = (GLint) MAX_LINE_WIDTH;
+        params[0] = (GLint) ctx->Const.MinLineWidthAA;
+        params[1] = (GLint) ctx->Const.MaxLineWidthAA;
+        break;
+      case GL_ALIASED_LINE_WIDTH_RANGE:
+        params[0] = (GLint) ctx->Const.MinLineWidth;
+        params[1] = (GLint) ctx->Const.MaxLineWidth;
         break;
       case GL_LIST_BASE:
         *params = (GLint) ctx->List.ListBase;
@@ -3184,19 +4637,19 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
          *params = (GLint) MAX_CLIENT_ATTRIB_STACK_DEPTH;
          break;
       case GL_MAX_CLIP_PLANES:
-         *params = (GLint) MAX_CLIP_PLANES;
+         *params = (GLint) ctx->Const.MaxClipPlanes;
          break;
       case GL_MAX_ELEMENTS_VERTICES:  /* GL_VERSION_1_2 */
-         *params = VB_MAX;
+         *params = (GLint) ctx->Const.MaxArrayLockSize;
          break;
       case GL_MAX_ELEMENTS_INDICES:   /* GL_VERSION_1_2 */
-         *params = VB_MAX;
+         *params = (GLint) ctx->Const.MaxArrayLockSize;
          break;
       case GL_MAX_EVAL_ORDER:
         *params = (GLint) MAX_EVAL_ORDER;
         break;
       case GL_MAX_LIGHTS:
-         *params = (GLint) MAX_LIGHTS;
+         *params = (GLint) ctx->Const.MaxLights;
          break;
       case GL_MAX_LIST_NESTING:
          *params = (GLint) MAX_LIST_NESTING;
@@ -3214,8 +4667,10 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
          *params = (GLint) MAX_PROJECTION_STACK_DEPTH;
          break;
       case GL_MAX_TEXTURE_SIZE:
+         *params = (1 << (ctx->Const.MaxTextureLevels - 1));
+        break;
       case GL_MAX_3D_TEXTURE_SIZE:
-         *params = ctx->Const.MaxTextureSize;
+         *params = (1 << (ctx->Const.Max3DTextureLevels - 1));
         break;
       case GL_MAX_TEXTURE_STACK_DEPTH:
         *params = (GLint) MAX_TEXTURE_STACK_DEPTH;
@@ -3226,11 +4681,11 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
          break;
       case GL_MODELVIEW_MATRIX:
         for (i=0;i<16;i++) {
-           params[i] = (GLint) ctx->ModelView.m[i];
+           params[i] = (GLint) ctx->ModelviewMatrixStack.Top->m[i];
         }
         break;
       case GL_MODELVIEW_STACK_DEPTH:
-        *params = (GLint) (ctx->ModelViewStackDepth + 1);
+        *params = (GLint) (ctx->ModelviewMatrixStack.Depth + 1);
         break;
       case GL_NAME_STACK_DEPTH:
         *params = (GLint) ctx->Select.NameStackDepth;
@@ -3299,11 +4754,15 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
          *params = (GLint) ctx->Point.Size;
          break;
       case GL_POINT_SIZE_GRANULARITY:
-        *params = (GLint) POINT_SIZE_GRANULARITY;
+        *params = (GLint) ctx->Const.PointSizeGranularity;
         break;
       case GL_POINT_SIZE_RANGE:
-        params[0] = (GLint) MIN_POINT_SIZE;
-        params[1] = (GLint) MAX_POINT_SIZE;
+        params[0] = (GLint) ctx->Const.MinPointSizeAA;
+        params[1] = (GLint) ctx->Const.MaxPointSizeAA;
+        break;
+      case GL_ALIASED_POINT_SIZE_RANGE:
+        params[0] = (GLint) ctx->Const.MinPointSize;
+        params[1] = (GLint) ctx->Const.MaxPointSize;
         break;
       case GL_POINT_SMOOTH:
         *params = (GLint) ctx->Point.SmoothFlag;
@@ -3329,11 +4788,9 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
         params[0] = (GLint) ctx->Polygon.FrontMode;
         params[1] = (GLint) ctx->Polygon.BackMode;
         break;
-#ifdef GL_EXT_polygon_offset
-      case GL_POLYGON_OFFSET_BIAS_EXT:
+      case GL_POLYGON_OFFSET_BIAS_EXT: /* GL_EXT_polygon_offset */
          *params = (GLint) ctx->Polygon.OffsetUnits;
          break;
-#endif
       case GL_POLYGON_OFFSET_FACTOR:
          *params = (GLint) ctx->Polygon.OffsetFactor;
          break;
@@ -3351,11 +4808,11 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
         break;
       case GL_PROJECTION_MATRIX:
         for (i=0;i<16;i++) {
-           params[i] = (GLint) ctx->ProjectionMatrix.m[i];
+           params[i] = (GLint) ctx->ProjectionMatrixStack.Top->m[i];
         }
         break;
       case GL_PROJECTION_STACK_DEPTH:
-        *params = (GLint) (ctx->ProjectionStackDepth + 1);
+        *params = (GLint) (ctx->ProjectionMatrixStack.Depth + 1);
         break;
       case GL_READ_BUFFER:
         *params = (GLint) ctx->Pixel.ReadBuffer;
@@ -3364,7 +4821,7 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
          *params = (GLint) ctx->Pixel.RedBias;
          break;
       case GL_RED_BITS:
-         *params = (GLint) ctx->Visual->RedBits;
+         *params = (GLint) ctx->Visual.redBits;
          break;
       case GL_RED_SCALE:
          *params = (GLint) ctx->Pixel.RedScale;
@@ -3372,8 +4829,11 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
       case GL_RENDER_MODE:
         *params = (GLint) ctx->RenderMode;
         break;
+      case GL_RESCALE_NORMAL:
+         *params = (GLint) ctx->Transform.RescaleNormals;
+         break;
       case GL_RGBA_MODE:
-        *params = (GLint) ctx->Visual->RGBAflag;
+        *params = (GLint) ctx->Visual.rgbMode;
         break;
       case GL_SCISSOR_BOX:
         params[0] = (GLint) ctx->Scissor.X;
@@ -3394,7 +4854,7 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
          *params = (GLint) ctx->Texture.SharedPalette;
          break;
       case GL_STENCIL_BITS:
-         *params = ctx->Visual->StencilBits;
+         *params = ctx->Visual.stencilBits;
          break;
       case GL_STENCIL_CLEAR_VALUE:
         *params = (GLint) ctx->Stencil.Clear;
@@ -3424,28 +4884,28 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
         *params = (GLint) ctx->Stencil.WriteMask;
         break;
       case GL_STEREO:
-        *params = (GLint) ctx->Visual->StereoFlag;
+        *params = (GLint) ctx->Visual.stereoMode;
         break;
       case GL_SUBPIXEL_BITS:
-        *params = 0;  /* TODO */
+        *params = ctx->Const.SubPixelBits;
         break;
       case GL_TEXTURE_1D:
-         *params = gl_IsEnabled(ctx, GL_TEXTURE_1D) ? 1 : 0;
+         *params = _mesa_IsEnabled(GL_TEXTURE_1D) ? 1 : 0;
         break;
       case GL_TEXTURE_2D:
-         *params = gl_IsEnabled(ctx, GL_TEXTURE_2D) ? 1 : 0;
+         *params = _mesa_IsEnabled(GL_TEXTURE_2D) ? 1 : 0;
         break;
       case GL_TEXTURE_3D:
-         *params = gl_IsEnabled(ctx, GL_TEXTURE_3D) ? 1 : 0;
+         *params = _mesa_IsEnabled(GL_TEXTURE_3D) ? 1 : 0;
         break;
       case GL_TEXTURE_BINDING_1D:
-         *params = textureUnit->CurrentD[1]->Name;
+         *params = textureUnit->Current1D->Name;
           break;
       case GL_TEXTURE_BINDING_2D:
-         *params = textureUnit->CurrentD[2]->Name;
+         *params = textureUnit->Current2D->Name;
           break;
       case GL_TEXTURE_BINDING_3D:
-         *params = textureUnit->CurrentD[3]->Name;
+         *params = textureUnit->Current3D->Name;
           break;
       case GL_TEXTURE_ENV_COLOR:
         params[0] = FLOAT_TO_INT( textureUnit->EnvColor[0] );
@@ -3470,11 +4930,11 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
         break;
       case GL_TEXTURE_MATRIX:
          for (i=0;i<16;i++) {
-           params[i] = (GLint) ctx->TextureMatrix[texTransformUnit].m[i];
+           params[i] = (GLint) ctx->TextureMatrixStack[texUnit].Top->m[i];
         }
         break;
       case GL_TEXTURE_STACK_DEPTH:
-        *params = (GLint) (ctx->TextureStackDepth[texTransformUnit] + 1);
+        *params = (GLint) (ctx->TextureMatrixStack[texUnit].Depth + 1);
         break;
       case GL_UNPACK_ALIGNMENT:
         *params = ctx->Unpack.Alignment;
@@ -3512,6 +4972,9 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
       case GL_ZOOM_Y:
         *params = (GLint) ctx->Pixel.ZoomY;
         break;
+      case GL_VERTEX_ARRAY:
+         *params = (GLint) ctx->Array.Vertex.Enabled;
+         break;
       case GL_VERTEX_ARRAY_SIZE:
          *params = ctx->Array.Vertex.Size;
          break;
@@ -3524,6 +4987,9 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
       case GL_VERTEX_ARRAY_COUNT_EXT:
          *params = 0;
          break;
+      case GL_NORMAL_ARRAY:
+         *params = (GLint) ctx->Array.Normal.Enabled;
+         break;
       case GL_NORMAL_ARRAY_TYPE:
          *params = ctx->Array.Normal.Type;
          break;
@@ -3533,6 +4999,9 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
       case GL_NORMAL_ARRAY_COUNT_EXT:
          *params = 0;
          break;
+      case GL_COLOR_ARRAY:
+         *params = (GLint) ctx->Array.Color.Enabled;
+         break;
       case GL_COLOR_ARRAY_SIZE:
          *params = ctx->Array.Color.Size;
          break;
@@ -3545,6 +5014,9 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
       case GL_COLOR_ARRAY_COUNT_EXT:
          *params = 0;
          break;
+      case GL_INDEX_ARRAY:
+         *params = (GLint) ctx->Array.Index.Enabled;
+         break;
       case GL_INDEX_ARRAY_TYPE:
          *params = ctx->Array.Index.Type;
          break;
@@ -3554,6 +5026,9 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
       case GL_INDEX_ARRAY_COUNT_EXT:
          *params = 0;
          break;
+      case GL_TEXTURE_COORD_ARRAY:
+         *params = (GLint) ctx->Array.TexCoord[texUnit].Enabled;
+         break;
       case GL_TEXTURE_COORD_ARRAY_SIZE:
          *params = ctx->Array.TexCoord[texUnit].Size;
          break;
@@ -3566,6 +5041,9 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
       case GL_TEXTURE_COORD_ARRAY_COUNT_EXT:
          *params = 0;
          break;
+      case GL_EDGE_FLAG_ARRAY:
+         *params = (GLint) ctx->Array.EdgeFlag.Enabled;
+         break;
       case GL_EDGE_FLAG_ARRAY_STRIDE:
          *params = ctx->Array.EdgeFlag.Stride;
          break;
@@ -3573,92 +5051,523 @@ void gl_GetIntegerv( GLcontext *ctx, GLenum pname, GLint *params )
          *params = 0;
          break;
 
+      /* GL_ARB_multitexture */
       case GL_MAX_TEXTURE_UNITS_ARB:
+         CHECK_EXTENSION_I(ARB_multitexture, pname);
          *params = ctx->Const.MaxTextureUnits;
          break;
       case GL_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_I(ARB_multitexture, pname);
          *params = GL_TEXTURE0_ARB + ctx->Texture.CurrentUnit;
          break;
       case GL_CLIENT_ACTIVE_TEXTURE_ARB:
+         CHECK_EXTENSION_I(ARB_multitexture, pname);
          *params = GL_TEXTURE0_ARB + ctx->Array.ActiveTexture;
          break;
 
+      /* GL_ARB_texture_cube_map */
+      case GL_TEXTURE_CUBE_MAP_ARB:
+         CHECK_EXTENSION_I(ARB_texture_cube_map, pname);
+         *params = (GLint) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
+         break;
+      case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
+         CHECK_EXTENSION_I(ARB_texture_cube_map, pname);
+         *params = textureUnit->CurrentCubeMap->Name;
+         break;
+      case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
+         CHECK_EXTENSION_I(ARB_texture_cube_map, pname);
+         *params = (1 << (ctx->Const.MaxCubeTextureLevels - 1));
+         break;
 
-      /* GL_PGI_misc_hints */
-      case GL_STRICT_DEPTHFUNC_HINT_PGI:
-        *params = (GL_NICEST);
+      /* GL_ARB_texture_compression */
+      case GL_TEXTURE_COMPRESSION_HINT_ARB:
+         CHECK_EXTENSION_I(ARB_texture_compression, pname);
+         *params = (GLint) ctx->Hint.TextureCompression;
          break;
-      case GL_STRICT_LIGHTING_HINT_PGI:
-        *params = (ctx->Hint.StrictLighting);
-        break;
-      case GL_STRICT_SCISSOR_HINT_PGI:
-      case GL_FULL_STIPPLE_HINT_PGI:
-        *params = (GL_TRUE);
-        break;
-      case GL_CONSERVE_MEMORY_HINT_PGI:
-        *params = (GL_FALSE);
-        break;
-      case GL_ALWAYS_FAST_HINT_PGI:
-        *params = (ctx->Hint.AllowDrawWin == GL_TRUE &&
-                   ctx->Hint.AllowDrawSpn == GL_FALSE && 
-                   ctx->Hint.AllowDrawMem == GL_FALSE);
-        break;
-      case GL_ALWAYS_SOFT_HINT_PGI:
-        *params =  (ctx->Hint.AllowDrawWin == GL_TRUE &&
-                    ctx->Hint.AllowDrawSpn == GL_TRUE && 
-                    ctx->Hint.AllowDrawMem == GL_TRUE);
-        break;
-      case GL_ALLOW_DRAW_OBJ_HINT_PGI:
-        *params = GL_TRUE;
+      case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_I(ARB_texture_compression, pname);
+         *params = (GLint) ctx->Const.NumCompressedTextureFormats;
+         break;
+      case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
+         CHECK_EXTENSION_I(ARB_texture_compression, pname);
+         {
+            GLuint i;
+            for (i = 0; i < ctx->Const.NumCompressedTextureFormats; i++)
+               params[i] = (GLint) ctx->Const.CompressedTextureFormats[i];
+         }
+         break;
+
+      /* GL_EXT_compiled_vertex_array */
+      case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT:
+         CHECK_EXTENSION_I(EXT_compiled_vertex_array, pname);
+        *params = ctx->Array.LockFirst;
         break;
-      case GL_ALLOW_DRAW_WIN_HINT_PGI:
-        *params = ctx->Hint.AllowDrawWin;
+      case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
+         CHECK_EXTENSION_I(EXT_compiled_vertex_array, pname);
+        *params = ctx->Array.LockCount;
         break;
-      case GL_ALLOW_DRAW_SPN_HINT_PGI:
-        *params = ctx->Hint.AllowDrawSpn;
+
+      /* GL_ARB_transpose_matrix */
+      case GL_TRANSPOSE_COLOR_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ColorMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLint) tm[i];
+            }
+         }
+         break;
+      case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ModelviewMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLint) tm[i];
+            }
+         }
+         break;
+      case GL_TRANSPOSE_PROJECTION_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->ProjectionMatrixStack.Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLint) tm[i];
+            }
+         }
+         break;
+      case GL_TRANSPOSE_TEXTURE_MATRIX_ARB:
+         {
+            GLfloat tm[16];
+            GLuint i;
+            _math_transposef(tm, ctx->TextureMatrixStack[texUnit].Top->m);
+            for (i=0;i<16;i++) {
+               params[i] = (GLint) tm[i];
+            }
+         }
+         break;
+
+      /* GL_HP_occlusion_test */
+      case GL_OCCLUSION_TEST_HP:
+         CHECK_EXTENSION_I(HP_occlusion_test, pname);
+         *params = (GLint) ctx->Depth.OcclusionTest;
+         break;
+      case GL_OCCLUSION_TEST_RESULT_HP:
+         CHECK_EXTENSION_I(HP_occlusion_test, pname);
+         if (ctx->Depth.OcclusionTest)
+            *params = (GLint) ctx->OcclusionResult;
+         else
+            *params = (GLint) ctx->OcclusionResultSaved;
+         /* reset flag now */
+         ctx->OcclusionResult = GL_FALSE;
+         ctx->OcclusionResultSaved = GL_FALSE;
+         break;
+
+      /* GL_SGIS_pixel_texture */
+      case GL_PIXEL_TEXTURE_SGIS:
+         CHECK_EXTENSION_I(SGIS_pixel_texture, pname);
+         *params = (GLint) ctx->Pixel.PixelTextureEnabled;
+         break;
+
+      /* GL_SGIX_pixel_texture */
+      case GL_PIXEL_TEX_GEN_SGIX:
+         CHECK_EXTENSION_I(SGIX_pixel_texture, pname);
+         *params = (GLint) ctx->Pixel.PixelTextureEnabled;
+         break;
+      case GL_PIXEL_TEX_GEN_MODE_SGIX:
+         CHECK_EXTENSION_I(SGIX_pixel_texture, pname);
+         *params = (GLint) pixel_texgen_mode(ctx);
+         break;
+
+      /* GL_SGI_color_matrix (also in 1.2 imaging) */
+      case GL_COLOR_MATRIX_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         for (i=0;i<16;i++) {
+           params[i] = (GLint) ctx->ColorMatrixStack.Top->m[i];
+        }
         break;
-      case GL_ALLOW_DRAW_MEM_HINT_PGI:
-        *params = ctx->Hint.AllowDrawMem;
+      case GL_COLOR_MATRIX_STACK_DEPTH_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = ctx->ColorMatrixStack.Depth + 1;
+         break;
+      case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = MAX_COLOR_STACK_DEPTH;
+         break;
+      case GL_POST_COLOR_MATRIX_RED_SCALE_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixScale[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixScale[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixScale[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixScale[3];
+         break;
+      case GL_POST_COLOR_MATRIX_RED_BIAS_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixBias[0];
+         break;
+      case GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixBias[1];
+         break;
+      case GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixBias[2];
+         break;
+      case GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI:
+         CHECK_EXTENSION_I(SGI_color_matrix, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixBias[3];
+         break;
+
+      /* GL_EXT_convolution (also in 1.2 imaging) */
+      case GL_CONVOLUTION_1D_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.Convolution1DEnabled;
+         break;
+      case GL_CONVOLUTION_2D:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.Convolution2DEnabled;
+         break;
+      case GL_SEPARABLE_2D:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.Separable2DEnabled;
+         break;
+      case GL_MAX_CONVOLUTION_WIDTH:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = ctx->Const.MaxConvolutionWidth;
+         break;
+      case GL_MAX_CONVOLUTION_HEIGHT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = ctx->Const.MaxConvolutionHeight;
+         break;
+      case GL_POST_CONVOLUTION_RED_SCALE_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionScale[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_SCALE_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionScale[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_SCALE_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionScale[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_SCALE_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionScale[3];
+         break;
+      case GL_POST_CONVOLUTION_RED_BIAS_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionBias[0];
+         break;
+      case GL_POST_CONVOLUTION_GREEN_BIAS_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionBias[1];
+         break;
+      case GL_POST_CONVOLUTION_BLUE_BIAS_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionBias[2];
+         break;
+      case GL_POST_CONVOLUTION_ALPHA_BIAS_EXT:
+         CHECK_EXTENSION_I(EXT_convolution, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionBias[2];
+         break;
+
+      /* GL_EXT_histogram (also in 1.2 imaging) */
+      case GL_HISTOGRAM:
+         CHECK_EXTENSION_I(EXT_histogram, pname);
+         *params = (GLint) ctx->Pixel.HistogramEnabled;
         break;
-      case GL_CLIP_NEAR_HINT_PGI:
-      case GL_CLIP_FAR_HINT_PGI:
-        *params = GL_TRUE;
+      case GL_MINMAX:
+         CHECK_EXTENSION_I(EXT_histogram, pname);
+         *params = (GLint) ctx->Pixel.MinMaxEnabled;
+         break;
+
+      /* GL_SGI_color_table (also in 1.2 imaging */
+      case GL_COLOR_TABLE_SGI:
+         CHECK_EXTENSION_I(SGI_color_table, pname);
+         *params = (GLint) ctx->Pixel.ColorTableEnabled;
+         break;
+      case GL_POST_CONVOLUTION_COLOR_TABLE_SGI:
+         CHECK_EXTENSION_I(SGI_color_table, pname);
+         *params = (GLint) ctx->Pixel.PostConvolutionColorTableEnabled;
+         break;
+      case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
+         CHECK_EXTENSION_I(SGI_color_table, pname);
+         *params = (GLint) ctx->Pixel.PostColorMatrixColorTableEnabled;
+         break;
+
+
+      /* GL_EXT_secondary_color */
+      case GL_COLOR_SUM_EXT:
+         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+        *params = (GLint) ctx->Fog.ColorSumEnabled;
+        break;
+      case GL_CURRENT_SECONDARY_COLOR_EXT:
+         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+        FLUSH_CURRENT(ctx, 0);
+         params[0] = FLOAT_TO_INT( (ctx->Current.Attrib[VERT_ATTRIB_COLOR1][0]) );
+         params[1] = FLOAT_TO_INT( (ctx->Current.Attrib[VERT_ATTRIB_COLOR1][1]) );
+         params[2] = FLOAT_TO_INT( (ctx->Current.Attrib[VERT_ATTRIB_COLOR1][2]) );
+        break;
+      case GL_SECONDARY_COLOR_ARRAY_EXT:
+         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+         *params = (GLint) ctx->Array.SecondaryColor.Enabled;
+         break;
+      case GL_SECONDARY_COLOR_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+        *params = (GLint) ctx->Array.SecondaryColor.Type;
+        break;
+      case GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+        *params = (GLint) ctx->Array.SecondaryColor.Stride;
+        break;
+      case GL_SECONDARY_COLOR_ARRAY_SIZE_EXT:
+         CHECK_EXTENSION_I(EXT_secondary_color, pname);
+        *params = (GLint) ctx->Array.SecondaryColor.Stride;
         break;
-      case GL_WIDE_LINE_HINT_PGI:
-        *params = GL_DONT_CARE;
+
+      /* GL_EXT_fog_coord */
+      case GL_CURRENT_FOG_COORDINATE_EXT:
+         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+         FLUSH_CURRENT(ctx, 0);
+         *params = (GLint) ctx->Current.Attrib[VERT_ATTRIB_FOG][0];
         break;
-      case GL_BACK_NORMALS_HINT_PGI:
-        *params = (GL_TRUE);
+      case GL_FOG_COORDINATE_ARRAY_EXT:
+         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+         *params = (GLint) ctx->Array.FogCoord.Enabled;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
+         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+         *params = (GLint) ctx->Array.FogCoord.Type;
         break;
-      case GL_NATIVE_GRAPHICS_HANDLE_PGI:
-        *params = 0;
+      case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
+         CHECK_EXTENSION_I(EXT_fog_coord, pname);
+         *params = (GLint) ctx->Array.FogCoord.Stride;
         break;
 
-      /* GL_EXT_compiled_vertex_array
-       */
-      case GL_ARRAY_ELEMENT_LOCK_FIRST_SGI:
-        *params = ctx->Array.LockFirst;
-        break;
+      /* GL_EXT_texture_lod_bias */
+      case GL_MAX_TEXTURE_LOD_BIAS_EXT:
+         *params = (GLint) ctx->Const.MaxTextureLodBias;
+         break;
 
-      case GL_ARRAY_ELEMENT_LOCK_COUNT_SGI:
-        *params = ctx->Array.LockCount;
+      /* GL_EXT_texture_filter_anisotropic */
+      case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+         CHECK_EXTENSION_I(EXT_texture_filter_anisotropic, pname);
+         *params = (GLint) ctx->Const.MaxTextureMaxAnisotropy;
         break;
-        
+
+      /* GL_ARB_multisample */
+      case GL_MULTISAMPLE_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = (GLint) ctx->Multisample.Enabled;
+         break;
+      case GL_SAMPLE_ALPHA_TO_COVERAGE_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = (GLint) ctx->Multisample.SampleAlphaToCoverage;
+         break;
+      case GL_SAMPLE_ALPHA_TO_ONE_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = (GLint) ctx->Multisample.SampleAlphaToOne;
+         break;
+      case GL_SAMPLE_COVERAGE_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = (GLint) ctx->Multisample.SampleCoverage;
+         break;
+      case GL_SAMPLE_COVERAGE_VALUE_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = (GLint) ctx->Multisample.SampleCoverageValue;
+         break;
+      case GL_SAMPLE_COVERAGE_INVERT_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = (GLint) ctx->Multisample.SampleCoverageInvert;
+         break;
+      case GL_SAMPLE_BUFFERS_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = 0; /* XXX fix someday */
+         break;
+      case GL_SAMPLES_ARB:
+         CHECK_EXTENSION_I(ARB_multisample, pname);
+         *params = 0; /* XXX fix someday */
+         break;
+
+      /* GL_IBM_rasterpos_clip */
+      case GL_RASTER_POSITION_UNCLIPPED_IBM:
+         CHECK_EXTENSION_I(IBM_rasterpos_clip, pname);
+         *params = (GLint) ctx->Transform.RasterPositionUnclipped;
+         break;
+
+      /* GL_NV_point_sprite */
+      case GL_POINT_SPRITE_NV:
+         CHECK_EXTENSION_B(NV_point_sprite, pname);
+         *params = (GLint) ctx->Point.PointSprite;
+         break;
+      case GL_POINT_SPRITE_R_MODE_NV:
+         CHECK_EXTENSION_B(NV_point_sprite, pname);
+         *params = (GLint) ctx->Point.SpriteRMode;
+         break;
+
+      /* GL_SGIS_generate_mipmap */
+      case GL_GENERATE_MIPMAP_HINT_SGIS:
+         CHECK_EXTENSION_I(SGIS_generate_mipmap, pname);
+         *params = (GLint) ctx->Hint.GenerateMipmap;
+         break;
+
+      /* GL_NV_vertex_program */
+      case GL_VERTEX_PROGRAM_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = (GLint) ctx->VertexProgram.Enabled;
+         break;
+      case GL_VERTEX_PROGRAM_POINT_SIZE_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = (GLint) ctx->VertexProgram.PointSizeEnabled;
+         break;
+      case GL_VERTEX_PROGRAM_TWO_SIDE_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = (GLint) ctx->VertexProgram.TwoSideEnabled;
+         break;
+      case GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = MAX_PROGRAM_STACK_DEPTH;
+         break;
+      case GL_MAX_TRACK_MATRICES_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = MAX_PROGRAM_MATRICES;
+         break;
+      case GL_CURRENT_MATRIX_STACK_DEPTH_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = ctx->CurrentStack->Depth;
+         break;
+      case GL_CURRENT_MATRIX_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = (GLint) ctx->Transform.MatrixMode;
+         break;
+      case GL_VERTEX_PROGRAM_BINDING_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = (GLint) ctx->VertexProgram.CurrentID;
+         break;
+      case GL_PROGRAM_ERROR_POSITION_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         *params = (GLint) ctx->VertexProgram.ErrorPos;
+         break;
+      case GL_VERTEX_ATTRIB_ARRAY0_NV:
+      case GL_VERTEX_ATTRIB_ARRAY1_NV:
+      case GL_VERTEX_ATTRIB_ARRAY2_NV:
+      case GL_VERTEX_ATTRIB_ARRAY3_NV:
+      case GL_VERTEX_ATTRIB_ARRAY4_NV:
+      case GL_VERTEX_ATTRIB_ARRAY5_NV:
+      case GL_VERTEX_ATTRIB_ARRAY6_NV:
+      case GL_VERTEX_ATTRIB_ARRAY7_NV:
+      case GL_VERTEX_ATTRIB_ARRAY8_NV:
+      case GL_VERTEX_ATTRIB_ARRAY9_NV:
+      case GL_VERTEX_ATTRIB_ARRAY10_NV:
+      case GL_VERTEX_ATTRIB_ARRAY11_NV:
+      case GL_VERTEX_ATTRIB_ARRAY12_NV:
+      case GL_VERTEX_ATTRIB_ARRAY13_NV:
+      case GL_VERTEX_ATTRIB_ARRAY14_NV:
+      case GL_VERTEX_ATTRIB_ARRAY15_NV:
+         CHECK_EXTENSION_I(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_VERTEX_ATTRIB_ARRAY0_NV;
+            *params = (GLint) ctx->Array.VertexAttrib[n].Enabled;
+         }
+         break;
+      case GL_MAP1_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP1_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP1_VERTEX_ATTRIB0_4_NV;
+            *params = (GLint) ctx->Eval.Map1Attrib[n];
+         }
+         break;
+      case GL_MAP2_VERTEX_ATTRIB0_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB1_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB2_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB3_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB4_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB5_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB6_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB7_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB8_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB9_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB10_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB11_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB12_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB13_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB14_4_NV:
+      case GL_MAP2_VERTEX_ATTRIB15_4_NV:
+         CHECK_EXTENSION_B(NV_vertex_program, pname);
+         {
+            GLuint n = (GLuint) pname - GL_MAP2_VERTEX_ATTRIB0_4_NV;
+            *params = (GLint) ctx->Eval.Map2Attrib[n];
+         }
+         break;
+
+      /* GL_NV_texture_rectangle */
+      case GL_TEXTURE_RECTANGLE_NV:
+         CHECK_EXTENSION_I(NV_texture_rectangle, pname);
+         *params = (GLint) _mesa_IsEnabled(GL_TEXTURE_RECTANGLE_NV);
+         break;
+      case GL_TEXTURE_BINDING_RECTANGLE_NV:
+         CHECK_EXTENSION_I(NV_texture_rectangle, pname);
+         *params = (GLint) textureUnit->CurrentRect->Name;
+         break;
+      case GL_MAX_RECTANGLE_TEXTURE_SIZE_NV:
+         CHECK_EXTENSION_I(NV_texture_rectangle, pname);
+         *params = (GLint) ctx->Const.MaxTextureRectSize;
+         break;
+
       default:
-        printf("invalid enum: %x\n", pname);
-         gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+         {
+            char s[100];
+            sprintf(s, "glGetIntegerv(pname=0x%x)", pname);
+            _mesa_error( ctx, GL_INVALID_ENUM, s );
+         }
    }
 }
 
 
 
-void gl_GetPointerv( GLcontext *ctx, GLenum pname, GLvoid **params )
+void
+_mesa_GetPointerv( GLenum pname, GLvoid **params )
 {
+   GET_CURRENT_CONTEXT(ctx);
    GLuint texUnit = ctx->Texture.CurrentUnit;
-   /*GLuint texTransformUnit = ctx->Texture.CurrentTransformUnit;*/
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (!params)
+      return;
 
-   if (MESA_VERBOSE & VERBOSE_API) 
-      fprintf(stderr, "glGetPointerv %s\n", gl_lookup_enum_by_nr(pname));
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetPointerv %s\n", _mesa_lookup_enum_by_nr(pname));
+
+   if (ctx->Driver.GetPointerv
+       && (*ctx->Driver.GetPointerv)(ctx, pname, params))
+      return;
 
    switch (pname) {
       case GL_VERTEX_ARRAY_POINTER:
@@ -3670,6 +5579,12 @@ void gl_GetPointerv( GLcontext *ctx, GLenum pname, GLvoid **params )
       case GL_COLOR_ARRAY_POINTER:
          *params = ctx->Array.Color.Ptr;
          break;
+      case GL_SECONDARY_COLOR_ARRAY_POINTER_EXT:
+         *params = ctx->Array.SecondaryColor.Ptr;
+         break;
+      case GL_FOG_COORDINATE_ARRAY_POINTER_EXT:
+         *params = ctx->Array.FogCoord.Ptr;
+         break;
       case GL_INDEX_ARRAY_POINTER:
          *params = ctx->Array.Index.Ptr;
          break;
@@ -3686,7 +5601,70 @@ void gl_GetPointerv( GLcontext *ctx, GLenum pname, GLvoid **params )
          *params = ctx->Select.Buffer;
          break;
       default:
-         gl_error( ctx, GL_INVALID_ENUM, "glGetPointerv" );
+         _mesa_error( ctx, GL_INVALID_ENUM, "glGetPointerv" );
          return;
    }
 }
+
+
+
+const GLubyte *
+_mesa_GetString( GLenum name )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   static const char *vendor = "Brian Paul";
+   static const char *renderer = "Mesa";
+   static const char *version_1_2 = "1.2 Mesa 4.1 beta";
+   static const char *version_1_3 = "1.3 Mesa 4.1 beta";
+
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+
+   /* this is a required driver function */
+   assert(ctx->Driver.GetString);
+   {
+      const GLubyte *str = (*ctx->Driver.GetString)(ctx, name);
+      if (str)
+         return str;
+
+       switch (name) {
+          case GL_VENDOR:
+             return (const GLubyte *) vendor;
+          case GL_RENDERER:
+             return (const GLubyte *) renderer;
+          case GL_VERSION:
+             if (ctx->Extensions.ARB_multitexture &&
+                 ctx->Extensions.ARB_multisample &&
+                 ctx->Extensions.ARB_texture_border_clamp &&
+                 ctx->Extensions.ARB_texture_compression &&
+                 ctx->Extensions.EXT_texture_env_add &&
+                 ctx->Extensions.ARB_texture_env_combine &&
+                 ctx->Extensions.ARB_texture_env_dot3)
+                return (const GLubyte *) version_1_3;
+             else
+                return (const GLubyte *) version_1_2;
+          case GL_EXTENSIONS:
+             return (const GLubyte *) _mesa_extensions_get_string(ctx);
+          default:
+             _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" );
+             return (const GLubyte *) 0;
+       }
+   }
+}
+
+
+/*
+ * Execute a glGetError command
+ */
+GLenum
+_mesa_GetError( void )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   GLenum e = ctx->ErrorValue;
+   ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glGetError <-- %s\n", _mesa_lookup_enum_by_nr(e));
+
+   ctx->ErrorValue = (GLenum) GL_NO_ERROR;
+   return e;
+}