X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fmain%2Fget.c;h=73e924e6b395c5a245f742cca0e6f9175bc6a084;hb=02c03ef6b4762adf33b73528c9fd672ef4697763;hp=2c349c77191293b82420c5745e0447bc0415459b;hpb=1207bf057aeea3376e5e0f03f789a5d67ed4d29d;p=mesa.git diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 2c349c77191..73e924e6b39 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -1,21 +1,21 @@ -/* $Id: get.c,v 1.29 2000/05/23 20:10:49 brianp Exp $ */ +/* $Id: get.c,v 1.83 2002/06/18 16:53:46 brianp Exp $ */ /* * Mesa 3-D graphics library - * Version: 3.3 - * - * Copyright (C) 1999-2000 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 @@ -29,16 +29,17 @@ #include "all.h" #else #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 "matrix.h" #include "mmath.h" -#include "types.h" -#include "vb.h" +#include "mtypes.h" + +#include "math/m_matrix.h" #endif @@ -58,6 +59,43 @@ #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; \ + } + + + + static GLenum pixel_texgen_mode(const GLcontext *ctx) { @@ -80,33 +118,42 @@ pixel_texgen_mode(const GLcontext *ctx) } - 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); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetBooleanv"); + if (!params) + return; - if (MESA_VERBOSE & VERBOSE_API) - fprintf(stderr, "glGetBooleanv %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, "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); + *params = INT_TO_BOOL(ctx->Visual.accumRedBits); break; case GL_ACCUM_GREEN_BITS: - *params = INT_TO_BOOL(ctx->Visual->AccumGreenBits); + *params = INT_TO_BOOL(ctx->Visual.accumGreenBits); break; case GL_ACCUM_BLUE_BITS: - *params = INT_TO_BOOL(ctx->Visual->AccumBlueBits); + *params = INT_TO_BOOL(ctx->Visual.accumBlueBits); break; case GL_ACCUM_ALPHA_BITS: - *params = INT_TO_BOOL(ctx->Visual->AccumAlphaBits); + *params = INT_TO_BOOL(ctx->Visual.accumAlphaBits); break; case GL_ACCUM_CLEAR_VALUE: params[0] = FLOAT_TO_BOOL(ctx->Accum.ClearColor[0]); @@ -118,7 +165,7 @@ _mesa_GetBooleanv( 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); @@ -130,7 +177,7 @@ _mesa_GetBooleanv( 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); @@ -175,7 +222,7 @@ _mesa_GetBooleanv( 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); @@ -189,13 +236,16 @@ _mesa_GetBooleanv( 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; @@ -219,18 +269,21 @@ _mesa_GetBooleanv( 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]); @@ -251,25 +304,26 @@ _mesa_GetBooleanv( 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); @@ -294,12 +348,13 @@ _mesa_GetBooleanv( 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: @@ -342,22 +397,19 @@ _mesa_GetBooleanv( 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_HISTOGRAM: - *params = ctx->Pixel.HistogramEnabled; - 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); @@ -531,19 +583,19 @@ _mesa_GetBooleanv( 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); @@ -561,8 +613,10 @@ _mesa_GetBooleanv( 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); @@ -571,16 +625,13 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) params[0] = INT_TO_BOOL(MAX_WIDTH); params[1] = INT_TO_BOOL(MAX_HEIGHT); break; - case GL_MINMAX: - *params = ctx->Pixel.MinMaxEnabled; - 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); @@ -646,7 +697,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) *params = INT_TO_BOOL(ctx->Pixel.MapStoSsize); break; case GL_POINT_SIZE: - *params = FLOAT_TO_BOOL(ctx->Point.UserSize); + *params = FLOAT_TO_BOOL(ctx->Point.Size); break; case GL_POINT_SIZE_GRANULARITY: *params = FLOAT_TO_BOOL(ctx->Const.PointSizeGranularity ); @@ -703,11 +754,11 @@ _mesa_GetBooleanv( 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); @@ -716,7 +767,7 @@ _mesa_GetBooleanv( 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); @@ -724,8 +775,11 @@ _mesa_GetBooleanv( 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); @@ -746,7 +800,7 @@ _mesa_GetBooleanv( 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); @@ -776,7 +830,7 @@ _mesa_GetBooleanv( 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(ctx->Const.SubPixelBits); @@ -791,13 +845,13 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) *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); + *params = INT_TO_BOOL(textureUnit->Current3D->Name); break; case GL_TEXTURE_ENV_COLOR: { @@ -824,12 +878,12 @@ _mesa_GetBooleanv( 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); @@ -942,113 +996,56 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) case GL_EDGE_FLAG_ARRAY_STRIDE: *params = INT_TO_BOOL(ctx->Array.EdgeFlag.Stride); break; + 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: - if (ctx->Extensions.HaveTextureCubeMap) - *params = _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB); - else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); - return; + CHECK_EXTENSION_B(ARB_texture_cube_map, pname); + *params = _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB); + break; case GL_TEXTURE_BINDING_CUBE_MAP_ARB: - if (ctx->Extensions.HaveTextureCubeMap) - *params = INT_TO_BOOL(textureUnit->CurrentCubeMap->Name); - else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); - return; + CHECK_EXTENSION_B(ARB_texture_cube_map, pname); + *params = INT_TO_BOOL(textureUnit->CurrentCubeMap->Name); + break; case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB: - if (ctx->Extensions.HaveTextureCubeMap) - *params = INT_TO_BOOL(ctx->Const.MaxCubeTextureSize); - else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); + CHECK_EXTENSION_B(ARB_texture_cube_map, pname); + *params = INT_TO_BOOL(1 << (ctx->Const.MaxCubeTextureLevels - 1)); break; /* GL_ARB_texture_compression */ case GL_TEXTURE_COMPRESSION_HINT_ARB: - if (ctx->Extensions.HaveTextureCompression) { - *params = INT_TO_BOOL(ctx->Hint.TextureCompression); - } - else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); + CHECK_EXTENSION_B(ARB_texture_compression, pname); + *params = INT_TO_BOOL(ctx->Hint.TextureCompression); break; case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB: - if (ctx->Extensions.HaveTextureCompression) { - *params = INT_TO_BOOL(ctx->Const.NumCompressedTextureFormats); - } - else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); + CHECK_EXTENSION_B(ARB_texture_compression, pname); + *params = INT_TO_BOOL(ctx->Const.NumCompressedTextureFormats); break; case GL_COMPRESSED_TEXTURE_FORMATS_ARB: - if (ctx->Extensions.HaveTextureCompression) { + 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]); } - else - gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv"); break; - /* GL_PGI_misc_hints */ - case GL_STRICT_DEPTHFUNC_HINT_PGI: - *params = ENUM_TO_BOOL(GL_NICEST); - 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.AllowDrawFrg == GL_FALSE && - ctx->Hint.AllowDrawMem == GL_FALSE); - break; - case GL_ALWAYS_SOFT_HINT_PGI: - *params = (GLboolean) (ctx->Hint.AllowDrawWin == GL_TRUE && - ctx->Hint.AllowDrawFrg == GL_TRUE && - ctx->Hint.AllowDrawMem == GL_TRUE); - break; - case GL_ALLOW_DRAW_OBJ_HINT_PGI: - *params = (GLboolean) GL_TRUE; - break; - case GL_ALLOW_DRAW_WIN_HINT_PGI: - *params = (GLboolean) ctx->Hint.AllowDrawWin; - break; - case GL_ALLOW_DRAW_FRG_HINT_PGI: - *params = (GLboolean) ctx->Hint.AllowDrawFrg; - break; - case GL_ALLOW_DRAW_MEM_HINT_PGI: - *params = (GLboolean) ctx->Hint.AllowDrawMem; - break; - case GL_CLIP_NEAR_HINT_PGI: - case GL_CLIP_FAR_HINT_PGI: - *params = ENUM_TO_BOOL(GL_TRUE); - break; - case GL_WIDE_LINE_HINT_PGI: - *params = ENUM_TO_BOOL(GL_DONT_CARE); - break; - case GL_BACK_NORMALS_HINT_PGI: - *params = ENUM_TO_BOOL(GL_TRUE); - break; - case GL_NATIVE_GRAPHICS_HANDLE_PGI: - *params = 0; - break; - /* GL_EXT_compiled_vertex_array */ case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT: *params = ctx->Array.LockFirst ? GL_TRUE : GL_FALSE; @@ -1062,7 +1059,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) { GLfloat tm[16]; GLuint i; - gl_matrix_transposef(tm, ctx->ColorMatrix.m); + _math_transposef(tm, ctx->ColorMatrixStack.Top->m); for (i=0;i<16;i++) { params[i] = FLOAT_TO_BOOL(tm[i]); } @@ -1072,7 +1069,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) { GLfloat tm[16]; GLuint i; - gl_matrix_transposef(tm, ctx->ModelView.m); + _math_transposef(tm, ctx->ModelviewMatrixStack.Top->m); for (i=0;i<16;i++) { params[i] = FLOAT_TO_BOOL(tm[i]); } @@ -1082,7 +1079,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) { GLfloat tm[16]; GLuint i; - gl_matrix_transposef(tm, ctx->ProjectionMatrix.m); + _math_transposef(tm, ctx->ProjectionMatrixStack.Top->m); for (i=0;i<16;i++) { params[i] = FLOAT_TO_BOOL(tm[i]); } @@ -1092,7 +1089,7 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) { GLfloat tm[16]; GLuint i; - gl_matrix_transposef(tm, ctx->TextureMatrix[texTransformUnit].m); + _math_transposef(tm, ctx->TextureMatrixStack[texUnit].Top->m); for (i=0;i<16;i++) { params[i] = FLOAT_TO_BOOL(tm[i]); } @@ -1101,26 +1098,18 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) /* GL_HP_occlusion_test */ case GL_OCCLUSION_TEST_HP: - if (ctx->Extensions.HaveHpOcclusionTest) { - *params = ctx->Depth.OcclusionTest; - } - else { - gl_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" ); - } + CHECK_EXTENSION_B(HP_occlusion_test, pname); + *params = ctx->Depth.OcclusionTest; return; case GL_OCCLUSION_TEST_RESULT_HP: - if (ctx->Extensions.HaveHpOcclusionTest) { - if (ctx->Depth.OcclusionTest) - *params = ctx->OcclusionResult; - else - *params = ctx->OcclusionResultSaved; - /* reset flag now */ - ctx->OcclusionResult = GL_FALSE; - ctx->OcclusionResultSaved = GL_FALSE; - } - else { - gl_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" ); - } + 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 */ @@ -1139,11 +1128,11 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) /* 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->ColorMatrix.m[i]); + params[i] = FLOAT_TO_BOOL(ctx->ColorMatrixStack.Top->m[i]); } break; case GL_COLOR_MATRIX_STACK_DEPTH_SGI: - *params = INT_TO_BOOL(ctx->ColorStackDepth + 1); + *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); @@ -1174,37 +1163,69 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) 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_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; @@ -1216,40 +1237,284 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) *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; + + /* 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_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_FOG_COORDINATE_ARRAY_STRIDE_EXT: + CHECK_EXTENSION_B(EXT_fog_coord, pname); + *params = INT_TO_BOOL(ctx->Array.FogCoord.Stride); + break; + + /* 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: - 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 _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; + *params = (GLdouble) ctx->Visual.accumRedBits; break; case GL_ACCUM_GREEN_BITS: - *params = (GLdouble) ctx->Visual->AccumGreenBits; + *params = (GLdouble) ctx->Visual.accumGreenBits; break; case GL_ACCUM_BLUE_BITS: - *params = (GLdouble) ctx->Visual->AccumBlueBits; + *params = (GLdouble) ctx->Visual.accumBlueBits; break; case GL_ACCUM_ALPHA_BITS: - *params = (GLdouble) ctx->Visual->AccumAlphaBits; + *params = (GLdouble) ctx->Visual.accumAlphaBits; break; case GL_ACCUM_CLEAR_VALUE: params[0] = (GLdouble) ctx->Accum.ClearColor[0]; @@ -1261,7 +1526,7 @@ _mesa_GetDoublev( 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; @@ -1273,7 +1538,7 @@ _mesa_GetDoublev( 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); @@ -1318,7 +1583,7 @@ _mesa_GetDoublev( 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; @@ -1332,13 +1597,16 @@ _mesa_GetDoublev( 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; @@ -1362,18 +1630,21 @@ _mesa_GetDoublev( 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]; @@ -1394,25 +1665,26 @@ _mesa_GetDoublev( 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; @@ -1437,12 +1709,13 @@ _mesa_GetDoublev( 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: @@ -1485,22 +1758,19 @@ _mesa_GetDoublev( 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_HISTOGRAM: - *params = (GLdouble) ctx->Pixel.HistogramEnabled; - 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; @@ -1674,19 +1944,19 @@ _mesa_GetDoublev( 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; @@ -1704,8 +1974,10 @@ _mesa_GetDoublev( 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; @@ -1714,16 +1986,13 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) params[0] = (GLdouble) MAX_WIDTH; params[1] = (GLdouble) MAX_HEIGHT; break; - case GL_MINMAX: - *params = (GLdouble) ctx->Pixel.MinMaxEnabled; - 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; @@ -1789,7 +2058,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) *params = (GLdouble) ctx->Pixel.MapStoSsize; break; case GL_POINT_SIZE: - *params = (GLdouble) ctx->Point.UserSize; + *params = (GLdouble) ctx->Point.Size; break; case GL_POINT_SIZE_GRANULARITY: *params = (GLdouble) ctx->Const.PointSizeGranularity; @@ -1846,11 +2115,11 @@ _mesa_GetDoublev( 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); @@ -1859,7 +2128,7 @@ _mesa_GetDoublev( 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; @@ -1867,8 +2136,11 @@ _mesa_GetDoublev( 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; @@ -1889,7 +2161,7 @@ _mesa_GetDoublev( 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; @@ -1919,7 +2191,7 @@ _mesa_GetDoublev( 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 = (GLdouble) ctx->Const.SubPixelBits; @@ -1934,13 +2206,13 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) *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]; @@ -1965,11 +2237,11 @@ _mesa_GetDoublev( 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; @@ -2088,109 +2360,49 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) /* 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: - if (ctx->Extensions.HaveTextureCubeMap) - *params = (GLdouble) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB); - else - gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev"); - return; + 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: - if (ctx->Extensions.HaveTextureCubeMap) - *params = (GLdouble) textureUnit->CurrentCubeMap->Name; - else - gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev"); - return; + CHECK_EXTENSION_D(ARB_texture_cube_map, pname); + *params = (GLdouble) textureUnit->CurrentCubeMap->Name; + break; case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB: - if (ctx->Extensions.HaveTextureCubeMap) - *params = (GLdouble) ctx->Const.MaxCubeTextureSize; - else - gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev"); - return; + CHECK_EXTENSION_D(ARB_texture_cube_map, pname); + *params = (GLdouble) (1 << (ctx->Const.MaxCubeTextureLevels - 1)); + break; /* GL_ARB_texture_compression */ case GL_TEXTURE_COMPRESSION_HINT_ARB: - if (ctx->Extensions.HaveTextureCompression) { - *params = (GLdouble) ctx->Hint.TextureCompression; - } - else - gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev"); + CHECK_EXTENSION_D(ARB_texture_compression, pname); + *params = (GLdouble) ctx->Hint.TextureCompression; break; case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB: - if (ctx->Extensions.HaveTextureCompression) { - *params = (GLdouble) ctx->Const.NumCompressedTextureFormats; - } - else - gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev"); + CHECK_EXTENSION_D(ARB_texture_compression, pname); + *params = (GLdouble) ctx->Const.NumCompressedTextureFormats; break; case GL_COMPRESSED_TEXTURE_FORMATS_ARB: - if (ctx->Extensions.HaveTextureCompression) { + CHECK_EXTENSION_D(ARB_texture_compression, pname); + { GLuint i; for (i = 0; i < ctx->Const.NumCompressedTextureFormats; i++) params[i] = (GLdouble) ctx->Const.CompressedTextureFormats[i]; } - else - gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev"); - break; - - /* GL_PGI_misc_hints */ - case GL_STRICT_DEPTHFUNC_HINT_PGI: - *params = ENUM_TO_DOUBLE(GL_NICEST); 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.AllowDrawFrg == GL_FALSE && - ctx->Hint.AllowDrawMem == GL_FALSE); - break; - case GL_ALWAYS_SOFT_HINT_PGI: - *params = (GLdouble) (ctx->Hint.AllowDrawWin == GL_TRUE && - ctx->Hint.AllowDrawFrg == 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_FRG_HINT_PGI: - *params = (GLdouble) ctx->Hint.AllowDrawFrg; - 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); - break; - case GL_NATIVE_GRAPHICS_HANDLE_PGI: - *params = 0; - break; /* GL_EXT_compiled_vertex_array */ case GL_ARRAY_ELEMENT_LOCK_FIRST_EXT: @@ -2205,7 +2417,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) { GLfloat tm[16]; GLuint i; - gl_matrix_transposef(tm, ctx->ColorMatrix.m); + _math_transposef(tm, ctx->ColorMatrixStack.Top->m); for (i=0;i<16;i++) { params[i] = (GLdouble) tm[i]; } @@ -2215,7 +2427,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) { GLfloat tm[16]; GLuint i; - gl_matrix_transposef(tm, ctx->ModelView.m); + _math_transposef(tm, ctx->ModelviewMatrixStack.Top->m); for (i=0;i<16;i++) { params[i] = (GLdouble) tm[i]; } @@ -2225,7 +2437,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) { GLfloat tm[16]; GLuint i; - gl_matrix_transposef(tm, ctx->ProjectionMatrix.m); + _math_transposef(tm, ctx->ProjectionMatrixStack.Top->m); for (i=0;i<16;i++) { params[i] = (GLdouble) tm[i]; } @@ -2235,7 +2447,7 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) { GLfloat tm[16]; GLuint i; - gl_matrix_transposef(tm, ctx->TextureMatrix[texTransformUnit].m); + _math_transposef(tm, ctx->TextureMatrixStack[texUnit].Top->m); for (i=0;i<16;i++) { params[i] = (GLdouble) tm[i]; } @@ -2244,27 +2456,19 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) /* GL_HP_occlusion_test */ case GL_OCCLUSION_TEST_HP: - if (ctx->Extensions.HaveHpOcclusionTest) { - *params = (GLdouble) ctx->Depth.OcclusionTest; - } - else { - gl_error( ctx, GL_INVALID_ENUM, "glGetDoublev" ); - } - return; + CHECK_EXTENSION_D(HP_occlusion_test, pname); + *params = (GLdouble) ctx->Depth.OcclusionTest; + break; case GL_OCCLUSION_TEST_RESULT_HP: - if (ctx->Extensions.HaveHpOcclusionTest) { - if (ctx->Depth.OcclusionTest) - *params = (GLdouble) ctx->OcclusionResult; - else - *params = (GLdouble) ctx->OcclusionResultSaved; - /* reset flag now */ - ctx->OcclusionResult = GL_FALSE; - ctx->OcclusionResultSaved = GL_FALSE; - } - else { - gl_error( ctx, GL_INVALID_ENUM, "glGetDoublev" ); - } - return; + 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; /* GL_SGIS_pixel_texture */ case GL_PIXEL_TEXTURE_SGIS: @@ -2282,11 +2486,11 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) /* GL_SGI_color_matrix (also in 1.2 imaging) */ case GL_COLOR_MATRIX_SGI: for (i=0;i<16;i++) { - params[i] = (GLdouble) ctx->ColorMatrix.m[i]; + params[i] = (GLdouble) ctx->ColorMatrixStack.Top->m[i]; } break; case GL_COLOR_MATRIX_STACK_DEPTH_SGI: - *params = (GLdouble) (ctx->ColorStackDepth + 1); + *params = (GLdouble) (ctx->ColorMatrixStack.Depth + 1); break; case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI: *params = (GLdouble) MAX_COLOR_STACK_DEPTH; @@ -2317,37 +2521,69 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) break; /* 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_CONVOLUTION_2D: + CHECK_EXTENSION_D(EXT_convolution, pname); + *params = (GLdouble) ctx->Pixel.Convolution2DEnabled; + break; + case GL_SEPARABLE_2D: + CHECK_EXTENSION_D(EXT_convolution, pname); + *params = (GLdouble) ctx->Pixel.Separable2DEnabled; + break; case GL_MAX_CONVOLUTION_WIDTH: + CHECK_EXTENSION_D(EXT_convolution, pname); *params = (GLdouble) ctx->Const.MaxConvolutionWidth; break; case GL_MAX_CONVOLUTION_HEIGHT: + CHECK_EXTENSION_D(EXT_convolution, pname); *params = (GLdouble) ctx->Const.MaxConvolutionHeight; break; case GL_POST_CONVOLUTION_RED_SCALE_EXT: + CHECK_EXTENSION_D(EXT_convolution, pname); *params = (GLdouble) ctx->Pixel.PostConvolutionScale[0]; break; case GL_POST_CONVOLUTION_GREEN_SCALE_EXT: + CHECK_EXTENSION_D(EXT_convolution, pname); *params = (GLdouble) ctx->Pixel.PostConvolutionScale[1]; break; case GL_POST_CONVOLUTION_BLUE_SCALE_EXT: + CHECK_EXTENSION_D(EXT_convolution, pname); *params = (GLdouble) ctx->Pixel.PostConvolutionScale[2]; break; 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; @@ -2359,40 +2595,284 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) *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: - gl_error( ctx, GL_INVALID_ENUM, "glGetDoublev" ); + { + 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; - 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, "glGetFloatv"); + if (!params) + return; - if (MESA_VERBOSE & VERBOSE_API) - fprintf(stderr, "glGetFloatv %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, "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; + *params = (GLfloat) ctx->Visual.accumRedBits; break; case GL_ACCUM_GREEN_BITS: - *params = (GLfloat) ctx->Visual->AccumGreenBits; + *params = (GLfloat) ctx->Visual.accumGreenBits; break; case GL_ACCUM_BLUE_BITS: - *params = (GLfloat) ctx->Visual->AccumBlueBits; + *params = (GLfloat) ctx->Visual.accumBlueBits; break; case GL_ACCUM_ALPHA_BITS: - *params = (GLfloat) ctx->Visual->AccumAlphaBits; + *params = (GLfloat) ctx->Visual.accumAlphaBits; break; case GL_ACCUM_CLEAR_VALUE: params[0] = ctx->Accum.ClearColor[0]; @@ -2404,7 +2884,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params ) *params = ctx->Pixel.AlphaBias; break; case GL_ALPHA_BITS: - *params = (GLfloat) ctx->Visual->AlphaBits; + *params = (GLfloat) ctx->Visual.alphaBits; break; case GL_ALPHA_SCALE: *params = ctx->Pixel.AlphaScale; @@ -2416,7 +2896,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params ) *params = ENUM_TO_FLOAT(ctx->Color.AlphaFunc); break; case GL_ALPHA_TEST_REF: - *params = (GLfloat) ctx->Color.AlphaRef / 255.0; + *params = (GLfloat) ctx->Color.AlphaRef / CHAN_MAXF; break; case GL_ATTRIB_STACK_DEPTH: *params = (GLfloat) (ctx->AttribStackDepth); @@ -2461,7 +2941,7 @@ _mesa_GetFloatv( 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; @@ -2475,13 +2955,16 @@ _mesa_GetFloatv( 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; @@ -2505,15 +2988,21 @@ _mesa_GetFloatv( 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]; @@ -2534,25 +3023,26 @@ _mesa_GetFloatv( 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; @@ -2577,12 +3067,13 @@ _mesa_GetFloatv( 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: @@ -2625,22 +3116,19 @@ _mesa_GetFloatv( 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_HISTOGRAM: - *params = (GLfloat) ctx->Pixel.HistogramEnabled; - 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; @@ -2814,19 +3302,19 @@ _mesa_GetFloatv( 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; @@ -2844,8 +3332,10 @@ _mesa_GetFloatv( 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; @@ -2854,16 +3344,13 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params ) params[0] = (GLfloat) MAX_WIDTH; params[1] = (GLfloat) MAX_HEIGHT; break; - case GL_MINMAX: - *params = (GLfloat) ctx->Pixel.MinMaxEnabled; - 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; @@ -2929,7 +3416,7 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params ) *params = (GLfloat) ctx->Pixel.MapStoSsize; break; case GL_POINT_SIZE: - *params = (GLfloat) ctx->Point.UserSize; + *params = (GLfloat) ctx->Point.Size; break; case GL_POINT_SIZE_GRANULARITY: *params = (GLfloat) ctx->Const.PointSizeGranularity; @@ -2988,11 +3475,11 @@ _mesa_GetFloatv( 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); @@ -3001,7 +3488,7 @@ _mesa_GetFloatv( 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; @@ -3009,8 +3496,11 @@ _mesa_GetFloatv( 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; @@ -3031,7 +3521,7 @@ _mesa_GetFloatv( 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; @@ -3061,28 +3551,28 @@ _mesa_GetFloatv( 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 = (GLfloat) ctx->Const.SubPixelBits; break; case GL_TEXTURE_1D: - *params = _mesa_IsEnabled(GL_TEXTURE_1D) ? 1.0 : 0.0; + *params = _mesa_IsEnabled(GL_TEXTURE_1D) ? 1.0F : 0.0F; break; case GL_TEXTURE_2D: - *params = _mesa_IsEnabled(GL_TEXTURE_2D) ? 1.0 : 0.0; + *params = _mesa_IsEnabled(GL_TEXTURE_2D) ? 1.0F : 0.0F; break; case GL_TEXTURE_3D: - *params = _mesa_IsEnabled(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]; @@ -3094,24 +3584,24 @@ _mesa_GetFloatv( 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; @@ -3230,155 +3720,89 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params ) /* 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_ARB_texture_cube_map */ case GL_TEXTURE_CUBE_MAP_ARB: - if (ctx->Extensions.HaveTextureCubeMap) - *params = (GLfloat) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB); - else - gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv"); - return; + CHECK_EXTENSION_F(ARB_texture_cube_map, pname); + *params = (GLfloat) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB); + break; case GL_TEXTURE_BINDING_CUBE_MAP_ARB: - if (ctx->Extensions.HaveTextureCubeMap) - *params = (GLfloat) textureUnit->CurrentCubeMap->Name; - else - gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv"); - return; + CHECK_EXTENSION_F(ARB_texture_cube_map, pname); + *params = (GLfloat) textureUnit->CurrentCubeMap->Name; + break; case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB: - if (ctx->Extensions.HaveTextureCubeMap) - *params = (GLfloat) ctx->Const.MaxCubeTextureSize; - else - gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv"); - return; + 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: - if (ctx->Extensions.HaveTextureCompression) { - *params = (GLfloat) ctx->Hint.TextureCompression; - } - else - gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv"); + CHECK_EXTENSION_F(ARB_texture_compression, pname); + *params = (GLfloat) ctx->Hint.TextureCompression; break; case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB: - if (ctx->Extensions.HaveTextureCompression) { - *params = (GLfloat) ctx->Const.NumCompressedTextureFormats; - } - else - gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv"); + CHECK_EXTENSION_F(ARB_texture_compression, pname); + *params = (GLfloat) ctx->Const.NumCompressedTextureFormats; break; case GL_COMPRESSED_TEXTURE_FORMATS_ARB: - if (ctx->Extensions.HaveTextureCompression) { + CHECK_EXTENSION_F(ARB_texture_compression, pname); + { GLuint i; for (i = 0; i < ctx->Const.NumCompressedTextureFormats; i++) params[i] = (GLfloat) ctx->Const.CompressedTextureFormats[i]; } - else - gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv"); - break; - - /* GL_PGI_misc_hints */ - case GL_STRICT_DEPTHFUNC_HINT_PGI: - *params = ENUM_TO_FLOAT(GL_NICEST); 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.AllowDrawFrg == GL_FALSE && - ctx->Hint.AllowDrawMem == GL_FALSE); - break; - case GL_ALWAYS_SOFT_HINT_PGI: - *params = (GLfloat) (ctx->Hint.AllowDrawWin == GL_TRUE && - ctx->Hint.AllowDrawFrg == GL_TRUE && - ctx->Hint.AllowDrawMem == GL_TRUE); - break; - case GL_ALLOW_DRAW_OBJ_HINT_PGI: - *params = (GLfloat) GL_TRUE; - break; - case GL_ALLOW_DRAW_WIN_HINT_PGI: - *params = (GLfloat) ctx->Hint.AllowDrawWin; - break; - case GL_ALLOW_DRAW_FRG_HINT_PGI: - *params = (GLfloat) ctx->Hint.AllowDrawFrg; - break; - case GL_ALLOW_DRAW_MEM_HINT_PGI: - *params = (GLfloat) ctx->Hint.AllowDrawMem; - break; - case GL_CLIP_NEAR_HINT_PGI: - case GL_CLIP_FAR_HINT_PGI: - *params = ENUM_TO_FLOAT(GL_TRUE); - break; - case GL_WIDE_LINE_HINT_PGI: - *params = ENUM_TO_FLOAT(GL_DONT_CARE); - break; - case GL_BACK_NORMALS_HINT_PGI: - *params = ENUM_TO_FLOAT(GL_TRUE); - break; - case GL_NATIVE_GRAPHICS_HANDLE_PGI: - *params = 0; - 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_ARRAY_ELEMENT_LOCK_COUNT_EXT: + CHECK_EXTENSION_F(EXT_compiled_vertex_array, pname); *params = (GLfloat) ctx->Array.LockCount; break; /* GL_ARB_transpose_matrix */ case GL_TRANSPOSE_COLOR_MATRIX_ARB: - gl_matrix_transposef(params, ctx->ColorMatrix.m); + _math_transposef(params, ctx->ColorMatrixStack.Top->m); break; case GL_TRANSPOSE_MODELVIEW_MATRIX_ARB: - gl_matrix_transposef(params, ctx->ModelView.m); + _math_transposef(params, ctx->ModelviewMatrixStack.Top->m); break; case GL_TRANSPOSE_PROJECTION_MATRIX_ARB: - gl_matrix_transposef(params, ctx->ProjectionMatrix.m); + _math_transposef(params, ctx->ProjectionMatrixStack.Top->m); break; case GL_TRANSPOSE_TEXTURE_MATRIX_ARB: - gl_matrix_transposef(params, ctx->TextureMatrix[texTransformUnit].m); + _math_transposef(params, ctx->TextureMatrixStack[texUnit].Top->m); break; /* GL_HP_occlusion_test */ case GL_OCCLUSION_TEST_HP: - if (ctx->Extensions.HaveHpOcclusionTest) { - *params = (GLfloat) ctx->Depth.OcclusionTest; - } - else { - gl_error( ctx, GL_INVALID_ENUM, "glGetFloatv" ); - } - return; + CHECK_EXTENSION_F(HP_occlusion_test, pname); + *params = (GLfloat) ctx->Depth.OcclusionTest; + break; case GL_OCCLUSION_TEST_RESULT_HP: - if (ctx->Extensions.HaveHpOcclusionTest) { - if (ctx->Depth.OcclusionTest) - *params = (GLfloat) ctx->OcclusionResult; - else - *params = (GLfloat) ctx->OcclusionResultSaved; - /* reset flag now */ - ctx->OcclusionResult = GL_FALSE; - ctx->OcclusionResultSaved = GL_FALSE; - } - else { - gl_error( ctx, GL_INVALID_ENUM, "glGetFloatv" ); - } - return; + 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: @@ -3396,11 +3820,11 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params ) /* GL_SGI_color_matrix (also in 1.2 imaging) */ case GL_COLOR_MATRIX_SGI: for (i=0;i<16;i++) { - params[i] = ctx->ColorMatrix.m[i]; + params[i] = ctx->ColorMatrixStack.Top->m[i]; } break; case GL_COLOR_MATRIX_STACK_DEPTH_SGI: - *params = (GLfloat) (ctx->ColorStackDepth + 1); + *params = (GLfloat) (ctx->ColorMatrixStack.Depth + 1); break; case GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI: *params = (GLfloat) MAX_COLOR_STACK_DEPTH; @@ -3431,37 +3855,69 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params ) 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_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; @@ -3473,40 +3929,285 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params ) *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; + + /* 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_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_FOG_COORDINATE_ARRAY_STRIDE_EXT: + CHECK_EXTENSION_F(EXT_fog_coord, pname); + *params = (GLfloat) ctx->Array.FogCoord.Stride; + break; + + /* 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: - gl_error( ctx, GL_INVALID_ENUM, "glGetFloatv" ); + { + char s[100]; + sprintf(s, "glGetFloatv(0x%x)", pname); + _mesa_error(ctx, GL_INVALID_ENUM, s); + } } } - - 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); - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetIntegerv"); + 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, "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; + *params = (GLint) ctx->Visual.accumRedBits; break; case GL_ACCUM_GREEN_BITS: - *params = (GLint) ctx->Visual->AccumGreenBits; + *params = (GLint) ctx->Visual.accumGreenBits; break; case GL_ACCUM_BLUE_BITS: - *params = (GLint) ctx->Visual->AccumBlueBits; + *params = (GLint) ctx->Visual.accumBlueBits; break; case GL_ACCUM_ALPHA_BITS: - *params = (GLint) ctx->Visual->AccumAlphaBits; + *params = (GLint) ctx->Visual.accumAlphaBits; break; case GL_ACCUM_CLEAR_VALUE: params[0] = FLOAT_TO_INT( ctx->Accum.ClearColor[0] ); @@ -3518,7 +4219,7 @@ _mesa_GetIntegerv( 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; @@ -3527,7 +4228,7 @@ _mesa_GetIntegerv( 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; @@ -3575,7 +4276,7 @@ _mesa_GetIntegerv( 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; @@ -3589,14 +4290,16 @@ _mesa_GetIntegerv( 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; @@ -3620,18 +4323,21 @@ _mesa_GetIntegerv( 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] ); @@ -3652,25 +4358,26 @@ _mesa_GetIntegerv( 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; @@ -3695,12 +4402,13 @@ _mesa_GetIntegerv( 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: @@ -3743,22 +4451,19 @@ _mesa_GetIntegerv( 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_HISTOGRAM: - *params = (GLint) ctx->Pixel.HistogramEnabled; - 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; @@ -3932,19 +4637,19 @@ _mesa_GetIntegerv( 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; @@ -3962,8 +4667,10 @@ _mesa_GetIntegerv( 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; @@ -3972,16 +4679,13 @@ _mesa_GetIntegerv( GLenum pname, GLint *params ) params[0] = (GLint) MAX_WIDTH; params[1] = (GLint) MAX_HEIGHT; break; - case GL_MINMAX: - *params = (GLint) ctx->Pixel.MinMaxEnabled; - 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; @@ -4047,7 +4751,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params ) *params = ctx->Pixel.MapStoSsize; break; case GL_POINT_SIZE: - *params = (GLint) ctx->Point.UserSize; + *params = (GLint) ctx->Point.Size; break; case GL_POINT_SIZE_GRANULARITY: *params = (GLint) ctx->Const.PointSizeGranularity; @@ -4104,11 +4808,11 @@ _mesa_GetIntegerv( 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; @@ -4117,7 +4821,7 @@ _mesa_GetIntegerv( 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; @@ -4125,8 +4829,11 @@ _mesa_GetIntegerv( 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; @@ -4147,7 +4854,7 @@ _mesa_GetIntegerv( 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; @@ -4177,7 +4884,7 @@ _mesa_GetIntegerv( 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 = ctx->Const.SubPixelBits; @@ -4192,13 +4899,13 @@ _mesa_GetIntegerv( GLenum pname, GLint *params ) *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] ); @@ -4223,11 +4930,11 @@ _mesa_GetIntegerv( 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; @@ -4346,124 +5053,66 @@ _mesa_GetIntegerv( GLenum pname, GLint *params ) /* 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: - if (ctx->Extensions.HaveTextureCubeMap) - *params = (GLint) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB); - else - gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv"); - return; + 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: - if (ctx->Extensions.HaveTextureCubeMap) - *params = textureUnit->CurrentCubeMap->Name; - else - gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv"); - return; + CHECK_EXTENSION_I(ARB_texture_cube_map, pname); + *params = textureUnit->CurrentCubeMap->Name; + break; case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB: - if (ctx->Extensions.HaveTextureCubeMap) - *params = ctx->Const.MaxCubeTextureSize; - else - gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv"); - return; + CHECK_EXTENSION_I(ARB_texture_cube_map, pname); + *params = (1 << (ctx->Const.MaxCubeTextureLevels - 1)); + break; /* GL_ARB_texture_compression */ case GL_TEXTURE_COMPRESSION_HINT_ARB: - if (ctx->Extensions.HaveTextureCompression) { - *params = (GLint) ctx->Hint.TextureCompression; - } - else - gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv"); + CHECK_EXTENSION_I(ARB_texture_compression, pname); + *params = (GLint) ctx->Hint.TextureCompression; break; case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB: - if (ctx->Extensions.HaveTextureCompression) { - *params = (GLint) ctx->Const.NumCompressedTextureFormats; - } - else - gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv"); + CHECK_EXTENSION_I(ARB_texture_compression, pname); + *params = (GLint) ctx->Const.NumCompressedTextureFormats; break; case GL_COMPRESSED_TEXTURE_FORMATS_ARB: - if (ctx->Extensions.HaveTextureCompression) { + CHECK_EXTENSION_I(ARB_texture_compression, pname); + { GLuint i; for (i = 0; i < ctx->Const.NumCompressedTextureFormats; i++) params[i] = (GLint) ctx->Const.CompressedTextureFormats[i]; } - else - gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv"); break; - /* GL_PGI_misc_hints */ - case GL_STRICT_DEPTHFUNC_HINT_PGI: - *params = (GL_NICEST); - 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.AllowDrawFrg == GL_FALSE && - ctx->Hint.AllowDrawMem == GL_FALSE); - break; - case GL_ALWAYS_SOFT_HINT_PGI: - *params = (ctx->Hint.AllowDrawWin == GL_TRUE && - ctx->Hint.AllowDrawFrg == GL_TRUE && - ctx->Hint.AllowDrawMem == GL_TRUE); - break; - case GL_ALLOW_DRAW_OBJ_HINT_PGI: - *params = GL_TRUE; - break; - case GL_ALLOW_DRAW_WIN_HINT_PGI: - *params = ctx->Hint.AllowDrawWin; - break; - case GL_ALLOW_DRAW_FRG_HINT_PGI: - *params = ctx->Hint.AllowDrawFrg; - break; - case GL_ALLOW_DRAW_MEM_HINT_PGI: - *params = ctx->Hint.AllowDrawMem; - break; - case GL_CLIP_NEAR_HINT_PGI: - case GL_CLIP_FAR_HINT_PGI: - *params = GL_TRUE; - break; - case GL_WIDE_LINE_HINT_PGI: - *params = GL_DONT_CARE; - break; - case GL_BACK_NORMALS_HINT_PGI: - *params = GL_TRUE; - break; - case GL_NATIVE_GRAPHICS_HANDLE_PGI: - *params = 0; - 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_ARRAY_ELEMENT_LOCK_COUNT_EXT: + CHECK_EXTENSION_I(EXT_compiled_vertex_array, pname); *params = ctx->Array.LockCount; break; - + /* GL_ARB_transpose_matrix */ case GL_TRANSPOSE_COLOR_MATRIX_ARB: { GLfloat tm[16]; GLuint i; - gl_matrix_transposef(tm, ctx->ColorMatrix.m); + _math_transposef(tm, ctx->ColorMatrixStack.Top->m); for (i=0;i<16;i++) { params[i] = (GLint) tm[i]; } @@ -4473,7 +5122,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params ) { GLfloat tm[16]; GLuint i; - gl_matrix_transposef(tm, ctx->ModelView.m); + _math_transposef(tm, ctx->ModelviewMatrixStack.Top->m); for (i=0;i<16;i++) { params[i] = (GLint) tm[i]; } @@ -4483,7 +5132,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params ) { GLfloat tm[16]; GLuint i; - gl_matrix_transposef(tm, ctx->ProjectionMatrix.m); + _math_transposef(tm, ctx->ProjectionMatrixStack.Top->m); for (i=0;i<16;i++) { params[i] = (GLint) tm[i]; } @@ -4493,7 +5142,7 @@ _mesa_GetIntegerv( GLenum pname, GLint *params ) { GLfloat tm[16]; GLuint i; - gl_matrix_transposef(tm, ctx->TextureMatrix[texTransformUnit].m); + _math_transposef(tm, ctx->TextureMatrixStack[texUnit].Top->m); for (i=0;i<16;i++) { params[i] = (GLint) tm[i]; } @@ -4502,123 +5151,402 @@ _mesa_GetIntegerv( GLenum pname, GLint *params ) /* GL_HP_occlusion_test */ case GL_OCCLUSION_TEST_HP: - if (ctx->Extensions.HaveHpOcclusionTest) { - *params = (GLint) ctx->Depth.OcclusionTest; - } - else { - gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" ); - } - return; + CHECK_EXTENSION_I(HP_occlusion_test, pname); + *params = (GLint) ctx->Depth.OcclusionTest; + break; case GL_OCCLUSION_TEST_RESULT_HP: - if (ctx->Extensions.HaveHpOcclusionTest) { - if (ctx->Depth.OcclusionTest) - *params = (GLint) ctx->OcclusionResult; - else - *params = (GLint) ctx->OcclusionResultSaved; - /* reset flag now */ - ctx->OcclusionResult = GL_FALSE; - ctx->OcclusionResultSaved = GL_FALSE; - } - else { - gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" ); - } - return; + 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->ColorMatrix.m[i]; + params[i] = (GLint) ctx->ColorMatrixStack.Top->m[i]; } break; case GL_COLOR_MATRIX_STACK_DEPTH_SGI: - *params = ctx->ColorStackDepth + 1; + 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_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; + + /* 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_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_FOG_COORDINATE_ARRAY_STRIDE_EXT: + CHECK_EXTENSION_I(EXT_fog_coord, pname); + *params = (GLint) ctx->Array.FogCoord.Stride; + break; + + /* GL_EXT_texture_lod_bias */ + case GL_MAX_TEXTURE_LOD_BIAS_EXT: + *params = (GLint) ctx->Const.MaxTextureLodBias; + break; + + /* 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: - gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" ); + { + char s[100]; + sprintf(s, "glGetIntegerv(pname=0x%x)", pname); + _mesa_error( ctx, GL_INVALID_ENUM, s ); + } } } @@ -4629,10 +5557,17 @@ _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: @@ -4644,6 +5579,12 @@ _mesa_GetPointerv( 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; @@ -4660,7 +5601,7 @@ _mesa_GetPointerv( 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; } } @@ -4671,11 +5612,12 @@ const GLubyte * _mesa_GetString( GLenum name ) { GET_CURRENT_CONTEXT(ctx); - static char *vendor = "Brian Paul"; - static char *renderer = "Mesa"; - static char *version = "1.2 Mesa 3.3 beta"; + 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_AND_FLUSH_WITH_RETVAL(ctx, "glGetString", 0); + ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0); /* this is a required driver function */ assert(ctx->Driver.GetString); @@ -4690,12 +5632,21 @@ _mesa_GetString( GLenum name ) case GL_RENDERER: return (const GLubyte *) renderer; case GL_VERSION: - return (const GLubyte *) 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 (GLubyte *) gl_extensions_get_string( ctx ); + return (const GLubyte *) _mesa_extensions_get_string(ctx); default: - gl_error( ctx, GL_INVALID_ENUM, "glGetString" ); - return (GLubyte *) 0; + _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" ); + return (const GLubyte *) 0; } } } @@ -4708,15 +5659,12 @@ GLenum _mesa_GetError( void ) { GET_CURRENT_CONTEXT(ctx); - GLenum e = ctx->ErrorValue; - - ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL( ctx, "glGetError", (GLenum) 0); + ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0); if (MESA_VERBOSE & VERBOSE_API) - fprintf(stderr, "glGetError <-- %s\n", gl_lookup_enum_by_nr(e)); + _mesa_debug(ctx, "glGetError <-- %s\n", _mesa_lookup_enum_by_nr(e)); ctx->ErrorValue = (GLenum) GL_NO_ERROR; return e; } -