-/* $Id: get.c,v 1.46 2000/12/09 19:55:18 brianp Exp $ */
+/* $Id: get.c,v 1.59 2001/05/03 23:55:38 brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 3.5
*
- * Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-2001 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"),
GLuint texUnit = ctx->Texture.CurrentUnit;
GLuint texTransformUnit = ctx->Texture.CurrentTransformUnit;
const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
-
- ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetBooleanv");
+ ASSERT_OUTSIDE_BEGIN_END(ctx);
if (!params)
return;
+ /* We need this in order to get correct results for
+ * GL_OCCLUSION_TEST_RESULT_HP. There might be other important cases.
+ */
+ FLUSH_VERTICES(ctx, 0);
+
if (MESA_VERBOSE & VERBOSE_API)
- fprintf(stderr, "glGetBooleanv %s\n", gl_lookup_enum_by_nr(pname));
+ fprintf(stderr, "glGetBooleanv %s\n", _mesa_lookup_enum_by_nr(pname));
if (ctx->Driver.GetBooleanv
&& (*ctx->Driver.GetBooleanv)(ctx, pname, params))
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]);
*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);
*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);
*params = ctx->Transform.ClipEnabled[pname-GL_CLIP_PLANE0];
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;
*params = ENUM_TO_BOOL(ctx->Polygon.CullFaceMode);
break;
case GL_CURRENT_COLOR:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
- params[0] = INT_TO_BOOL(ctx->Current.Color[0]);
- params[1] = INT_TO_BOOL(ctx->Current.Color[1]);
- params[2] = INT_TO_BOOL(ctx->Current.Color[2]);
- params[3] = INT_TO_BOOL(ctx->Current.Color[3]);
+ FLUSH_CURRENT(ctx, 0);
+ params[0] = FLOAT_TO_BOOL(ctx->Current.Color[0]);
+ params[1] = FLOAT_TO_BOOL(ctx->Current.Color[1]);
+ params[2] = FLOAT_TO_BOOL(ctx->Current.Color[2]);
+ params[3] = FLOAT_TO_BOOL(ctx->Current.Color[3]);
break;
case GL_CURRENT_INDEX:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
*params = INT_TO_BOOL(ctx->Current.Index);
break;
case GL_CURRENT_NORMAL:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
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]);
*params = ctx->Current.RasterPosValid;
break;
case GL_CURRENT_TEXTURE_COORDS:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
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 = 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);
*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_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
*params = ctx->Current.EdgeFlag;
break;
case GL_FEEDBACK_BUFFER_SIZE:
*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);
*params = ctx->Pixel.HistogramEnabled;
}
else {
- gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
return;
}
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);
*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);
*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);
*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);
*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);
*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);
if (ctx->Extensions.ARB_texture_cube_map)
*params = _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
return;
case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
if (ctx->Extensions.ARB_texture_cube_map)
*params = INT_TO_BOOL(textureUnit->CurrentCubeMap->Name);
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
return;
case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
if (ctx->Extensions.ARB_texture_cube_map)
*params = INT_TO_BOOL(ctx->Const.MaxCubeTextureSize);
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
break;
/* GL_ARB_texture_compression */
*params = INT_TO_BOOL(ctx->Hint.TextureCompression);
}
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
break;
case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
if (ctx->Extensions.ARB_texture_compression) {
*params = INT_TO_BOOL(ctx->Const.NumCompressedTextureFormats);
}
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
break;
case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
if (ctx->Extensions.ARB_texture_compression) {
params[i] = INT_TO_BOOL(ctx->Const.CompressedTextureFormats[i]);
}
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+ _mesa_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;
*params = ctx->Depth.OcclusionTest;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
}
return;
case GL_OCCLUSION_TEST_RESULT_HP:
ctx->OcclusionResultSaved = GL_FALSE;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
}
return;
break;
/* GL_EXT_convolution (also in 1.2 imaging) */
+ case GL_CONVOLUTION_1D_EXT:
+ if (ctx->Extensions.EXT_convolution || ctx->Extensions.ARB_imaging) {
+ *params = ctx->Pixel.Convolution1DEnabled;
+ }
+ else {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+ return;
+ }
+ break;
+ case GL_CONVOLUTION_2D:
+ if (ctx->Extensions.EXT_convolution || ctx->Extensions.ARB_imaging) {
+ *params = ctx->Pixel.Convolution2DEnabled;
+ }
+ else {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+ return;
+ }
+ break;
+ case GL_SEPARABLE_2D:
+ if (ctx->Extensions.EXT_convolution || ctx->Extensions.ARB_imaging) {
+ *params = ctx->Pixel.Separable2DEnabled;
+ }
+ else {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetBooleanv");
+ return;
+ }
+ break;
case GL_MAX_CONVOLUTION_WIDTH:
*params = INT_TO_BOOL(ctx->Const.MaxConvolutionWidth);
break;
case GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI:
*params = ctx->Pixel.PostColorMatrixColorTableEnabled;
break;
-
+
/* GL_EXT_secondary_color */
case GL_COLOR_SUM_EXT:
*params = ctx->Fog.ColorSumEnabled;
break;
case GL_CURRENT_SECONDARY_COLOR_EXT:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
params[0] = INT_TO_BOOL(ctx->Current.SecondaryColor[0]);
params[1] = INT_TO_BOOL(ctx->Current.SecondaryColor[1]);
params[2] = INT_TO_BOOL(ctx->Current.SecondaryColor[2]);
/* GL_EXT_fog_coord */
case GL_CURRENT_FOG_COORDINATE_EXT:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
*params = FLOAT_TO_BOOL(ctx->Current.FogCoord);
break;
case GL_FOG_COORDINATE_ARRAY_EXT:
*params = INT_TO_BOOL(ctx->Array.FogCoord.Stride);
break;
+ /* GL_EXT_texture_filter_anisotropic */
+ case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+ if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+ *params = FLOAT_TO_BOOL(ctx->Const.MaxTextureMaxAnisotropy);
+ }
+ else {
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
+ return;
+ }
+ break;
+
/* GL_MESA_sprite_point */
case GL_SPRITE_POINT_MESA:
if (ctx->Extensions.MESA_sprite_point) {
*params = ctx->Point.SpriteMode;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
return;
}
break;
default:
- gl_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetBooleanv" );
}
}
GLuint texUnit = ctx->Texture.CurrentUnit;
GLuint texTransformUnit = ctx->Texture.CurrentTransformUnit;
const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
-
- ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetDoublev");
+ ASSERT_OUTSIDE_BEGIN_END(ctx);
if (!params)
return;
+ /* We need this in order to get correct results for
+ * GL_OCCLUSION_TEST_RESULT_HP. There might be other important cases.
+ */
+ FLUSH_VERTICES(ctx, 0);
+
if (MESA_VERBOSE & VERBOSE_API)
- fprintf(stderr, "glGetDoublev %s\n", gl_lookup_enum_by_nr(pname));
+ fprintf(stderr, "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];
*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;
*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;
*params = (GLdouble) ctx->Transform.ClipEnabled[pname-GL_CLIP_PLANE0];
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;
*params = ENUM_TO_DOUBLE(ctx->Polygon.CullFaceMode);
break;
case GL_CURRENT_COLOR:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
- params[0] = CHAN_TO_FLOAT(ctx->Current.Color[0]);
- params[1] = CHAN_TO_FLOAT(ctx->Current.Color[1]);
- params[2] = CHAN_TO_FLOAT(ctx->Current.Color[2]);
- params[3] = CHAN_TO_FLOAT(ctx->Current.Color[3]);
+ FLUSH_CURRENT(ctx, 0);
+ params[0] = (ctx->Current.Color[0]);
+ params[1] = (ctx->Current.Color[1]);
+ params[2] = (ctx->Current.Color[2]);
+ params[3] = (ctx->Current.Color[3]);
break;
case GL_CURRENT_INDEX:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
*params = (GLdouble) ctx->Current.Index;
break;
case GL_CURRENT_NORMAL:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
params[0] = (GLdouble) ctx->Current.Normal[0];
params[1] = (GLdouble) ctx->Current.Normal[1];
params[2] = (GLdouble) ctx->Current.Normal[2];
*params = (GLdouble) ctx->Current.RasterPosValid;
break;
case GL_CURRENT_TEXTURE_COORDS:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
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 = (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;
*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_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
*params = (GLdouble) ctx->Current.EdgeFlag;
break;
case GL_FEEDBACK_BUFFER_SIZE:
*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:
- if (ctx->Extensions.EXT_histogram) {
+ if (ctx->Extensions.EXT_histogram || ctx->Extensions.ARB_imaging) {
*params = (GLdouble) ctx->Pixel.HistogramEnabled;
}
else {
- gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
return;
}
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;
*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;
*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;
*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;
*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;
*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;
if (ctx->Extensions.ARB_texture_cube_map)
*params = (GLdouble) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
return;
case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
if (ctx->Extensions.ARB_texture_cube_map)
*params = (GLdouble) textureUnit->CurrentCubeMap->Name;
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
return;
case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
if (ctx->Extensions.ARB_texture_cube_map)
*params = (GLdouble) ctx->Const.MaxCubeTextureSize;
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
return;
/* GL_ARB_texture_compression */
*params = (GLdouble) ctx->Hint.TextureCompression;
}
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
break;
case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
if (ctx->Extensions.ARB_texture_compression) {
*params = (GLdouble) ctx->Const.NumCompressedTextureFormats;
}
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
break;
case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
if (ctx->Extensions.ARB_texture_compression) {
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);
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
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:
*params = (GLdouble) ctx->Depth.OcclusionTest;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
}
return;
case GL_OCCLUSION_TEST_RESULT_HP:
ctx->OcclusionResultSaved = GL_FALSE;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
}
return;
break;
/* GL_EXT_convolution (also in 1.2 imaging) */
+ case GL_CONVOLUTION_1D_EXT:
+ if (ctx->Extensions.EXT_convolution || ctx->Extensions.ARB_imaging) {
+ *params = (GLdouble) ctx->Pixel.Convolution1DEnabled;
+ }
+ else {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+ return;
+ }
+ break;
+ case GL_CONVOLUTION_2D:
+ if (ctx->Extensions.EXT_convolution || ctx->Extensions.ARB_imaging) {
+ *params = (GLdouble) ctx->Pixel.Convolution2DEnabled;
+ }
+ else {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+ return;
+ }
+ break;
+ case GL_SEPARABLE_2D:
+ if (ctx->Extensions.EXT_convolution || ctx->Extensions.ARB_imaging) {
+ *params = (GLdouble) ctx->Pixel.Separable2DEnabled;
+ }
+ else {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetDoublev");
+ return;
+ }
+ break;
case GL_MAX_CONVOLUTION_WIDTH:
*params = (GLdouble) ctx->Const.MaxConvolutionWidth;
break;
*params = (GLdouble) ctx->Fog.ColorSumEnabled;
break;
case GL_CURRENT_SECONDARY_COLOR_EXT:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
- params[0] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[0]);
- params[1] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[1]);
- params[2] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[2]);
+ FLUSH_CURRENT(ctx, 0);
+ params[0] = (ctx->Current.SecondaryColor[0]);
+ params[1] = (ctx->Current.SecondaryColor[1]);
+ params[2] = (ctx->Current.SecondaryColor[2]);
break;
case GL_SECONDARY_COLOR_ARRAY_EXT:
*params = (GLdouble) ctx->Array.SecondaryColor.Enabled;
/* GL_EXT_fog_coord */
case GL_CURRENT_FOG_COORDINATE_EXT:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
*params = (GLdouble) ctx->Current.FogCoord;
break;
case GL_FOG_COORDINATE_ARRAY_EXT:
*params = (GLdouble) ctx->Array.FogCoord.Stride;
break;
+ /* GL_EXT_texture_filter_anisotropic */
+ case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+ if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+ *params = (GLdouble) ctx->Const.MaxTextureMaxAnisotropy;
+ }
+ else {
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
+ return;
+ }
+ break;
+
/* GL_MESA_sprite_point */
case GL_SPRITE_POINT_MESA:
if (ctx->Extensions.MESA_sprite_point) {
*params = (GLdouble) ctx->Point.SpriteMode;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
return;
}
break;
default:
- gl_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetDoublev" );
}
}
GLuint texUnit = ctx->Texture.CurrentUnit;
GLuint texTransformUnit = ctx->Texture.CurrentTransformUnit;
const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
-
- ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetFloatv");
+ ASSERT_OUTSIDE_BEGIN_END(ctx);
if (!params)
return;
+ /* We need this in order to get correct results for
+ * GL_OCCLUSION_TEST_RESULT_HP. There might be other important cases.
+ */
+ FLUSH_VERTICES(ctx, 0);
+
if (MESA_VERBOSE & VERBOSE_API)
- fprintf(stderr, "glGetFloatv %s\n", gl_lookup_enum_by_nr(pname));
+ fprintf(stderr, "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];
*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;
*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;
*params = (GLfloat) ctx->Transform.ClipEnabled[pname-GL_CLIP_PLANE0];
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;
*params = ENUM_TO_FLOAT(ctx->Polygon.CullFaceMode);
break;
case GL_CURRENT_COLOR:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
- params[0] = CHAN_TO_FLOAT(ctx->Current.Color[0]);
- params[1] = CHAN_TO_FLOAT(ctx->Current.Color[1]);
- params[2] = CHAN_TO_FLOAT(ctx->Current.Color[2]);
- params[3] = CHAN_TO_FLOAT(ctx->Current.Color[3]);
+ FLUSH_CURRENT(ctx, 0);
+ params[0] = (ctx->Current.Color[0]);
+ params[1] = (ctx->Current.Color[1]);
+ params[2] = (ctx->Current.Color[2]);
+ params[3] = (ctx->Current.Color[3]);
break;
case GL_CURRENT_INDEX:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
*params = (GLfloat) ctx->Current.Index;
break;
case GL_CURRENT_NORMAL:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
params[0] = ctx->Current.Normal[0];
params[1] = ctx->Current.Normal[1];
params[2] = ctx->Current.Normal[2];
*params = (GLfloat) ctx->Current.RasterPosValid;
break;
case GL_CURRENT_TEXTURE_COORDS:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
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 = (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;
*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_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
*params = (GLfloat) ctx->Current.EdgeFlag;
break;
case GL_FEEDBACK_BUFFER_SIZE:
*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:
- if (ctx->Extensions.EXT_histogram) {
+ if (ctx->Extensions.EXT_histogram || ctx->Extensions.ARB_imaging) {
*params = (GLfloat) ctx->Pixel.HistogramEnabled;
}
else {
- gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
return;
}
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;
*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;
*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;
*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;
*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;
*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;
if (ctx->Extensions.ARB_texture_cube_map)
*params = (GLfloat) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
return;
case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
if (ctx->Extensions.ARB_texture_cube_map)
*params = (GLfloat) textureUnit->CurrentCubeMap->Name;
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
return;
case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
if (ctx->Extensions.ARB_texture_cube_map)
*params = (GLfloat) ctx->Const.MaxCubeTextureSize;
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
return;
/* GL_ARB_texture_compression */
*params = (GLfloat) ctx->Hint.TextureCompression;
}
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
break;
case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
if (ctx->Extensions.ARB_texture_compression) {
*params = (GLfloat) ctx->Const.NumCompressedTextureFormats;
}
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
break;
case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
if (ctx->Extensions.ARB_texture_compression) {
params[i] = (GLfloat) ctx->Const.CompressedTextureFormats[i];
}
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+ _mesa_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:
*params = (GLfloat) ctx->Array.LockFirst;
*params = (GLfloat) ctx->Depth.OcclusionTest;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
}
return;
case GL_OCCLUSION_TEST_RESULT_HP:
ctx->OcclusionResultSaved = GL_FALSE;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
}
return;
break;
/* GL_EXT_convolution (also in 1.2 imaging) */
+ case GL_CONVOLUTION_1D_EXT:
+ if (ctx->Extensions.EXT_convolution || ctx->Extensions.ARB_imaging) {
+ *params = (GLfloat) ctx->Pixel.Convolution1DEnabled;
+ }
+ else {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+ return;
+ }
+ break;
+ case GL_CONVOLUTION_2D:
+ if (ctx->Extensions.EXT_convolution || ctx->Extensions.ARB_imaging) {
+ *params = (GLfloat) ctx->Pixel.Convolution2DEnabled;
+ }
+ else {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+ return;
+ }
+ break;
+ case GL_SEPARABLE_2D:
+ if (ctx->Extensions.EXT_convolution || ctx->Extensions.ARB_imaging) {
+ *params = (GLfloat) ctx->Pixel.Separable2DEnabled;
+ }
+ else {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+ return;
+ }
+ break;
case GL_MAX_CONVOLUTION_WIDTH:
*params = (GLfloat) ctx->Const.MaxConvolutionWidth;
break;
*params = (GLfloat) ctx->Fog.ColorSumEnabled;
break;
case GL_CURRENT_SECONDARY_COLOR_EXT:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
- params[0] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[0]);
- params[1] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[1]);
- params[2] = UBYTE_COLOR_TO_FLOAT_COLOR(ctx->Current.SecondaryColor[2]);
+ FLUSH_CURRENT(ctx, 0);
+ params[0] = (ctx->Current.SecondaryColor[0]);
+ params[1] = (ctx->Current.SecondaryColor[1]);
+ params[2] = (ctx->Current.SecondaryColor[2]);
break;
case GL_SECONDARY_COLOR_ARRAY_EXT:
*params = (GLfloat) ctx->Array.SecondaryColor.Enabled;
/* GL_EXT_fog_coord */
case GL_CURRENT_FOG_COORDINATE_EXT:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
*params = (GLfloat) ctx->Current.FogCoord;
break;
case GL_FOG_COORDINATE_ARRAY_EXT:
*params = (GLfloat) ctx->Array.FogCoord.Stride;
break;
+ /* GL_EXT_texture_filter_anisotropic */
+ case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+ if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+ *params = ctx->Const.MaxTextureMaxAnisotropy;
+ }
+ else {
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
+ return;
+ }
+ break;
+
/* GL_MESA_sprite_point */
case GL_SPRITE_POINT_MESA:
if (ctx->Extensions.MESA_sprite_point) {
*params = (GLfloat) ctx->Point.SpriteMode;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
return;
}
break;
default:
- gl_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetFloatv" );
}
}
GLuint texUnit = ctx->Texture.CurrentUnit;
GLuint texTransformUnit = ctx->Texture.CurrentTransformUnit;
const struct gl_texture_unit *textureUnit = &ctx->Texture.Unit[texUnit];
-
- ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetIntegerv");
+ ASSERT_OUTSIDE_BEGIN_END(ctx);
if (!params)
return;
+ /* We need this in order to get correct results for
+ * GL_OCCLUSION_TEST_RESULT_HP. There might be other important cases.
+ */
+ FLUSH_VERTICES(ctx, 0);
+
if (MESA_VERBOSE & VERBOSE_API)
- fprintf(stderr, "glGetIntegerv %s\n", gl_lookup_enum_by_nr(pname));
+ fprintf(stderr, "glGetIntegerv %s\n", _mesa_lookup_enum_by_nr(pname));
if (ctx->Driver.GetIntegerv
&& (*ctx->Driver.GetIntegerv)(ctx, pname, params))
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] );
*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;
*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;
*params = (GLint) ctx->Transform.ClipEnabled[i];
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;
*params = (GLint) ctx->Polygon.CullFaceMode;
break;
case GL_CURRENT_COLOR:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
- params[0] = FLOAT_TO_INT( CHAN_TO_FLOAT( ctx->Current.Color[0] ) );
- params[1] = FLOAT_TO_INT( CHAN_TO_FLOAT( ctx->Current.Color[1] ) );
- params[2] = FLOAT_TO_INT( CHAN_TO_FLOAT( ctx->Current.Color[2] ) );
- params[3] = FLOAT_TO_INT( CHAN_TO_FLOAT( ctx->Current.Color[3] ) );
+ FLUSH_CURRENT(ctx, 0);
+ params[0] = FLOAT_TO_INT( ( ctx->Current.Color[0] ) );
+ params[1] = FLOAT_TO_INT( ( ctx->Current.Color[1] ) );
+ params[2] = FLOAT_TO_INT( ( ctx->Current.Color[2] ) );
+ params[3] = FLOAT_TO_INT( ( ctx->Current.Color[3] ) );
break;
case GL_CURRENT_INDEX:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
*params = (GLint) ctx->Current.Index;
break;
case GL_CURRENT_NORMAL:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
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] );
*params = (GLint) ctx->Current.RasterPosValid;
break;
case GL_CURRENT_TEXTURE_COORDS:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
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 = (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;
*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_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
*params = (GLint) ctx->Current.EdgeFlag;
break;
case GL_FEEDBACK_BUFFER_SIZE:
*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:
- if (ctx->Extensions.EXT_histogram) {
+ if (ctx->Extensions.EXT_histogram || ctx->Extensions.ARB_imaging) {
*params = (GLint) ctx->Pixel.HistogramEnabled;
}
else {
- gl_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetFloatv");
return;
}
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;
*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;
*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;
*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;
*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;
*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;
if (ctx->Extensions.ARB_texture_cube_map)
*params = (GLint) _mesa_IsEnabled(GL_TEXTURE_CUBE_MAP_ARB);
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
return;
case GL_TEXTURE_BINDING_CUBE_MAP_ARB:
if (ctx->Extensions.ARB_texture_cube_map)
*params = textureUnit->CurrentCubeMap->Name;
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
return;
case GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB:
if (ctx->Extensions.ARB_texture_cube_map)
*params = ctx->Const.MaxCubeTextureSize;
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
return;
/* GL_ARB_texture_compression */
*params = (GLint) ctx->Hint.TextureCompression;
}
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
break;
case GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB:
if (ctx->Extensions.ARB_texture_compression) {
*params = (GLint) ctx->Const.NumCompressedTextureFormats;
}
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
break;
case GL_COMPRESSED_TEXTURE_FORMATS_ARB:
if (ctx->Extensions.ARB_texture_compression) {
params[i] = (GLint) ctx->Const.CompressedTextureFormats[i];
}
else
- gl_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+ _mesa_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:
*params = ctx->Array.LockFirst;
case GL_ARRAY_ELEMENT_LOCK_COUNT_EXT:
*params = ctx->Array.LockCount;
break;
-
+
/* GL_ARB_transpose_matrix */
case GL_TRANSPOSE_COLOR_MATRIX_ARB:
{
*params = (GLint) ctx->Depth.OcclusionTest;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
}
return;
case GL_OCCLUSION_TEST_RESULT_HP:
ctx->OcclusionResultSaved = GL_FALSE;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
}
return;
break;
/* GL_EXT_convolution (also in 1.2 imaging) */
+ case GL_CONVOLUTION_1D_EXT:
+ if (ctx->Extensions.EXT_convolution || ctx->Extensions.ARB_imaging) {
+ *params = (GLint) ctx->Pixel.Convolution1DEnabled;
+ }
+ else {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+ return;
+ }
+ break;
+ case GL_CONVOLUTION_2D:
+ if (ctx->Extensions.EXT_convolution || ctx->Extensions.ARB_imaging) {
+ *params = (GLint) ctx->Pixel.Convolution2DEnabled;
+ }
+ else {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+ return;
+ }
+ break;
+ case GL_SEPARABLE_2D:
+ if (ctx->Extensions.EXT_convolution || ctx->Extensions.ARB_imaging) {
+ *params = (GLint) ctx->Pixel.Separable2DEnabled;
+ }
+ else {
+ _mesa_error(ctx, GL_INVALID_ENUM, "glGetIntegerv");
+ return;
+ }
+ break;
case GL_MAX_CONVOLUTION_WIDTH:
*params = ctx->Const.MaxConvolutionWidth;
break;
*params = (GLint) ctx->Fog.ColorSumEnabled;
break;
case GL_CURRENT_SECONDARY_COLOR_EXT:
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
- params[0] = FLOAT_TO_INT( UBYTE_COLOR_TO_FLOAT_COLOR( ctx->Current.SecondaryColor[0] ) );
- params[1] = FLOAT_TO_INT( UBYTE_COLOR_TO_FLOAT_COLOR( ctx->Current.SecondaryColor[1] ) );
- params[2] = FLOAT_TO_INT( UBYTE_COLOR_TO_FLOAT_COLOR( ctx->Current.SecondaryColor[2] ) );
+ FLUSH_CURRENT(ctx, 0);
+ params[0] = FLOAT_TO_INT( (ctx->Current.SecondaryColor[0]) );
+ params[1] = FLOAT_TO_INT( (ctx->Current.SecondaryColor[1]) );
+ params[2] = FLOAT_TO_INT( (ctx->Current.SecondaryColor[2]) );
break;
case GL_SECONDARY_COLOR_ARRAY_EXT:
*params = (GLint) ctx->Array.SecondaryColor.Enabled;
/* GL_EXT_fog_coord */
case GL_CURRENT_FOG_COORDINATE_EXT:
if (ctx->Extensions.EXT_fog_coord) {
- FLUSH_TNL( ctx, FLUSH_UPDATE_CURRENT );
+ FLUSH_CURRENT(ctx, 0);
*params = (GLint) ctx->Current.FogCoord;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
}
break;
case GL_FOG_COORDINATE_ARRAY_EXT:
*params = (GLint) ctx->Array.FogCoord.Enabled;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
}
break;
case GL_FOG_COORDINATE_ARRAY_TYPE_EXT:
*params = (GLint) ctx->Array.FogCoord.Type;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
}
break;
case GL_FOG_COORDINATE_ARRAY_STRIDE_EXT:
*params = (GLint) ctx->Array.FogCoord.Stride;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+ }
+ break;
+
+ /* GL_EXT_texture_filter_anisotropic */
+ case GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT:
+ if (ctx->Extensions.EXT_texture_filter_anisotropic) {
+ *params = (GLint) ctx->Const.MaxTextureMaxAnisotropy;
+ }
+ else {
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+ return;
}
break;
*params = (GLint) ctx->Point.SpriteMode;
}
else {
- gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
return;
}
break;
default:
- gl_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetIntegerv" );
}
}
{
GET_CURRENT_CONTEXT(ctx);
GLuint texUnit = ctx->Texture.CurrentUnit;
-
- ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glGetPointerv");
+ ASSERT_OUTSIDE_BEGIN_END(ctx);
if (!params)
return;
if (MESA_VERBOSE & VERBOSE_API)
- fprintf(stderr, "glGetPointerv %s\n", gl_lookup_enum_by_nr(pname));
+ fprintf(stderr, "glGetPointerv %s\n", _mesa_lookup_enum_by_nr(pname));
if (ctx->Driver.GetPointerv
&& (*ctx->Driver.GetPointerv)(ctx, pname, params))
*params = ctx->Select.Buffer;
break;
default:
- gl_error( ctx, GL_INVALID_ENUM, "glGetPointerv" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetPointerv" );
return;
}
}
static const char *vendor = "Brian Paul";
static const char *renderer = "Mesa";
static const char *version = "1.2 Mesa 3.5 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);
case GL_VERSION:
return (const GLubyte *) version;
case GL_EXTENSIONS:
- return (const GLubyte *) gl_extensions_get_string( ctx );
+ return (const GLubyte *) _mesa_extensions_get_string(ctx);
default:
- gl_error( ctx, GL_INVALID_ENUM, "glGetString" );
+ _mesa_error( ctx, GL_INVALID_ENUM, "glGetString" );
return (const GLubyte *) 0;
}
}
_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));
+ fprintf(stderr, "glGetError <-- %s\n", _mesa_lookup_enum_by_nr(e));
ctx->ErrorValue = (GLenum) GL_NO_ERROR;
return e;
}
-
projects / mesa.git / blobdiff