diff options
| -rw-r--r-- | src/mesa/glapi/glapioffsets.h | 1379 | ||||
| -rw-r--r-- | src/mesa/main/blend.c | 12 | ||||
| -rw-r--r-- | src/mesa/main/blend.h | 10 | ||||
| -rw-r--r-- | src/mesa/main/colortab.c | 58 | ||||
| -rw-r--r-- | src/mesa/main/colortab.h | 29 | ||||
| -rw-r--r-- | src/mesa/main/dlist.c | 94 | ||||
| -rw-r--r-- | src/mesa/main/get.c | 34 | ||||
| -rw-r--r-- | src/mesa/main/state.c | 24 |
8 files changed, 687 insertions, 953 deletions
diff --git a/src/mesa/glapi/glapioffsets.h b/src/mesa/glapi/glapioffsets.h index 91ea19f893f..67481c8e0bb 100644 --- a/src/mesa/glapi/glapioffsets.h +++ b/src/mesa/glapi/glapioffsets.h @@ -1,824 +1,559 @@ -/* $Id: glapioffsets.h,v 1.3 2000/02/11 21:14:28 brianp Exp $ */ - -/* - * Mesa 3-D graphics library - * Version: 3.3 - * - * Copyright (C) 1999 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 - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - - -/* - * This file defines a static offset for all GL functions within the - * dispatch table. - * - * Eventually a replacement for this file will be available from SGI - * or the ARB so all vendors have the same info. - * - * XXX this file is incomplete - many more extension functions left to add - */ - - - -#ifndef _glextfunc_h_ -#define _glextfunc_h_ - -#define _BASE 0 - - -/* GL 1.1 */ -#define _gloffset_Accum (_BASE + 1) -#define _gloffset_AlphaFunc (_BASE + 2) -#define _gloffset_Begin (_BASE + 3) -#define _gloffset_Bitmap (_BASE + 4) -#define _gloffset_BlendFunc (_BASE + 5) -#define _gloffset_CallList (_BASE + 6) -#define _gloffset_CallLists (_BASE + 7) -#define _gloffset_Clear (_BASE + 8) -#define _gloffset_ClearAccum (_BASE + 9) -#define _gloffset_ClearColor (_BASE + 10) -#define _gloffset_ClearDepth (_BASE + 11) -#define _gloffset_ClearIndex (_BASE + 12) -#define _gloffset_ClearStencil (_BASE + 13) -#define _gloffset_ClipPlane (_BASE + 14) -#define _gloffset_Color3b (_BASE + 15) -#define _gloffset_Color3bv (_BASE + 16) -#define _gloffset_Color3d (_BASE + 17) -#define _gloffset_Color3dv (_BASE + 18) -#define _gloffset_Color3f (_BASE + 19) -#define _gloffset_Color3fv (_BASE + 20) -#define _gloffset_Color3i (_BASE + 21) -#define _gloffset_Color3iv (_BASE + 22) -#define _gloffset_Color3s (_BASE + 23) -#define _gloffset_Color3sv (_BASE + 24) -#define _gloffset_Color3ub (_BASE + 25) -#define _gloffset_Color3ubv (_BASE + 26) -#define _gloffset_Color3ui (_BASE + 27) -#define _gloffset_Color3uiv (_BASE + 28) -#define _gloffset_Color3us (_BASE + 29) -#define _gloffset_Color3usv (_BASE + 30) -#define _gloffset_Color4b (_BASE + 31) -#define _gloffset_Color4bv (_BASE + 32) -#define _gloffset_Color4d (_BASE + 33) -#define _gloffset_Color4dv (_BASE + 34) -#define _gloffset_Color4f (_BASE + 35) -#define _gloffset_Color4fv (_BASE + 36) -#define _gloffset_Color4i (_BASE + 37) -#define _gloffset_Color4iv (_BASE + 38) -#define _gloffset_Color4s (_BASE + 39) -#define _gloffset_Color4sv (_BASE + 40) -#define _gloffset_Color4ub (_BASE + 41) -#define _gloffset_Color4ubv (_BASE + 42) -#define _gloffset_Color4ui (_BASE + 43) -#define _gloffset_Color4uiv (_BASE + 44) -#define _gloffset_Color4us (_BASE + 45) -#define _gloffset_Color4usv (_BASE + 46) -#define _gloffset_ColorMask (_BASE + 47) -#define _gloffset_ColorMaterial (_BASE + 48) -#define _gloffset_CopyPixels (_BASE + 49) -#define _gloffset_CullFace (_BASE + 50) -#define _gloffset_DeleteLists (_BASE + 51) -#define _gloffset_DepthFunc (_BASE + 52) -#define _gloffset_DepthMask (_BASE + 53) -#define _gloffset_DepthRange (_BASE + 54) -#define _gloffset_Disable (_BASE + 55) -#define _gloffset_DrawBuffer (_BASE + 56) -#define _gloffset_DrawPixels (_BASE + 57) -#define _gloffset_EdgeFlag (_BASE + 58) -#define _gloffset_EdgeFlagv (_BASE + 59) -#define _gloffset_Enable (_BASE + 60) -#define _gloffset_End (_BASE + 61) -#define _gloffset_EndList (_BASE + 62) -#define _gloffset_EvalCoord1d (_BASE + 63) -#define _gloffset_EvalCoord1dv (_BASE + 64) -#define _gloffset_EvalCoord1f (_BASE + 65) -#define _gloffset_EvalCoord1fv (_BASE + 66) -#define _gloffset_EvalCoord2d (_BASE + 67) -#define _gloffset_EvalCoord2dv (_BASE + 68) -#define _gloffset_EvalCoord2f (_BASE + 69) -#define _gloffset_EvalCoord2fv (_BASE + 70) -#define _gloffset_EvalMesh1 (_BASE + 71) -#define _gloffset_EvalMesh2 (_BASE + 72) -#define _gloffset_EvalPoint1 (_BASE + 73) -#define _gloffset_EvalPoint2 (_BASE + 74) -#define _gloffset_FeedbackBuffer (_BASE + 75) -#define _gloffset_Finish (_BASE + 76) -#define _gloffset_Flush (_BASE + 77) -#define _gloffset_Fogf (_BASE + 78) -#define _gloffset_Fogfv (_BASE + 79) -#define _gloffset_Fogi (_BASE + 80) -#define _gloffset_Fogiv (_BASE + 81) -#define _gloffset_FrontFace (_BASE + 82) -#define _gloffset_Frustum (_BASE + 83) -#define _gloffset_GenLists (_BASE + 84) -#define _gloffset_GetBooleanv (_BASE + 85) -#define _gloffset_GetClipPlane (_BASE + 86) -#define _gloffset_GetDoublev (_BASE + 87) -#define _gloffset_GetError (_BASE + 88) -#define _gloffset_GetFloatv (_BASE + 89) -#define _gloffset_GetIntegerv (_BASE + 90) -#define _gloffset_GetLightfv (_BASE + 91) -#define _gloffset_GetLightiv (_BASE + 92) -#define _gloffset_GetMapdv (_BASE + 93) -#define _gloffset_GetMapfv (_BASE + 94) -#define _gloffset_GetMapiv (_BASE + 95) -#define _gloffset_GetMaterialfv (_BASE + 96) -#define _gloffset_GetMaterialiv (_BASE + 97) -#define _gloffset_GetPixelMapfv (_BASE + 98) -#define _gloffset_GetPixelMapuiv (_BASE + 99) -#define _gloffset_GetPixelMapusv (_BASE + 100) -#define _gloffset_GetPolygonStipple (_BASE + 101) -#define _gloffset_GetString (_BASE + 102) -#define _gloffset_GetTexEnvfv (_BASE + 103) -#define _gloffset_GetTexEnviv (_BASE + 104) -#define _gloffset_GetTexGendv (_BASE + 105) -#define _gloffset_GetTexGenfv (_BASE + 106) -#define _gloffset_GetTexGeniv (_BASE + 107) -#define _gloffset_GetTexImage (_BASE + 108) -#define _gloffset_GetTexLevelParameterfv (_BASE + 109) -#define _gloffset_GetTexLevelParameteriv (_BASE + 110) -#define _gloffset_GetTexParameterfv (_BASE + 111) -#define _gloffset_GetTexParameteriv (_BASE + 112) -#define _gloffset_Hint (_BASE + 113) -#define _gloffset_IndexMask (_BASE + 114) -#define _gloffset_Indexd (_BASE + 115) -#define _gloffset_Indexdv (_BASE + 116) -#define _gloffset_Indexf (_BASE + 117) -#define _gloffset_Indexfv (_BASE + 118) -#define _gloffset_Indexi (_BASE + 119) -#define _gloffset_Indexiv (_BASE + 120) -#define _gloffset_Indexs (_BASE + 121) -#define _gloffset_Indexsv (_BASE + 122) -#define _gloffset_InitNames (_BASE + 123) -#define _gloffset_IsEnabled (_BASE + 124) -#define _gloffset_IsList (_BASE + 125) -#define _gloffset_LightModelf (_BASE + 126) -#define _gloffset_LightModelfv (_BASE + 127) -#define _gloffset_LightModeli (_BASE + 128) -#define _gloffset_LightModeliv (_BASE + 129) -#define _gloffset_Lightf (_BASE + 130) -#define _gloffset_Lightfv (_BASE + 131) -#define _gloffset_Lighti (_BASE + 132) -#define _gloffset_Lightiv (_BASE + 133) -#define _gloffset_LineStipple (_BASE + 134) -#define _gloffset_LineWidth (_BASE + 135) -#define _gloffset_ListBase (_BASE + 136) -#define _gloffset_LoadIdentity (_BASE + 137) -#define _gloffset_LoadMatrixd (_BASE + 138) -#define _gloffset_LoadMatrixf (_BASE + 139) -#define _gloffset_LoadName (_BASE + 140) -#define _gloffset_LogicOp (_BASE + 141) -#define _gloffset_Map1d (_BASE + 142) -#define _gloffset_Map1f (_BASE + 143) -#define _gloffset_Map2d (_BASE + 144) -#define _gloffset_Map2f (_BASE + 145) -#define _gloffset_MapGrid1d (_BASE + 146) -#define _gloffset_MapGrid1f (_BASE + 147) -#define _gloffset_MapGrid2d (_BASE + 148) -#define _gloffset_MapGrid2f (_BASE + 149) -#define _gloffset_Materialf (_BASE + 150) -#define _gloffset_Materialfv (_BASE + 151) -#define _gloffset_Materiali (_BASE + 152) -#define _gloffset_Materialiv (_BASE + 153) -#define _gloffset_MatrixMode (_BASE + 154) -#define _gloffset_MultMatrixd (_BASE + 155) -#define _gloffset_MultMatrixf (_BASE + 156) -#define _gloffset_NewList (_BASE + 157) -#define _gloffset_Normal3b (_BASE + 158) -#define _gloffset_Normal3bv (_BASE + 159) -#define _gloffset_Normal3d (_BASE + 160) -#define _gloffset_Normal3dv (_BASE + 161) -#define _gloffset_Normal3f (_BASE + 162) -#define _gloffset_Normal3fv (_BASE + 163) -#define _gloffset_Normal3i (_BASE + 164) -#define _gloffset_Normal3iv (_BASE + 165) -#define _gloffset_Normal3s (_BASE + 166) -#define _gloffset_Normal3sv (_BASE + 167) -#define _gloffset_Ortho (_BASE + 168) -#define _gloffset_PassThrough (_BASE + 169) -#define _gloffset_PixelMapfv (_BASE + 170) -#define _gloffset_PixelMapuiv (_BASE + 171) -#define _gloffset_PixelMapusv (_BASE + 172) -#define _gloffset_PixelStoref (_BASE + 173) -#define _gloffset_PixelStorei (_BASE + 174) -#define _gloffset_PixelTransferf (_BASE + 175) -#define _gloffset_PixelTransferi (_BASE + 176) -#define _gloffset_PixelZoom (_BASE + 177) -#define _gloffset_PointSize (_BASE + 178) -#define _gloffset_PolygonMode (_BASE + 179) -#define _gloffset_PolygonOffset (_BASE + 180) -#define _gloffset_PolygonStipple (_BASE + 181) -#define _gloffset_PopAttrib (_BASE + 182) -#define _gloffset_PopMatrix (_BASE + 183) -#define _gloffset_PopName (_BASE + 184) -#define _gloffset_PushAttrib (_BASE + 185) -#define _gloffset_PushMatrix (_BASE + 186) -#define _gloffset_PushName (_BASE + 187) -#define _gloffset_RasterPos2d (_BASE + 188) -#define _gloffset_RasterPos2dv (_BASE + 189) -#define _gloffset_RasterPos2f (_BASE + 190) -#define _gloffset_RasterPos2fv (_BASE + 191) -#define _gloffset_RasterPos2i (_BASE + 192) -#define _gloffset_RasterPos2iv (_BASE + 193) -#define _gloffset_RasterPos2s (_BASE + 194) -#define _gloffset_RasterPos2sv (_BASE + 195) -#define _gloffset_RasterPos3d (_BASE + 196) -#define _gloffset_RasterPos3dv (_BASE + 197) -#define _gloffset_RasterPos3f (_BASE + 198) -#define _gloffset_RasterPos3fv (_BASE + 199) -#define _gloffset_RasterPos3i (_BASE + 200) -#define _gloffset_RasterPos3iv (_BASE + 201) -#define _gloffset_RasterPos3s (_BASE + 202) -#define _gloffset_RasterPos3sv (_BASE + 203) -#define _gloffset_RasterPos4d (_BASE + 204) -#define _gloffset_RasterPos4dv (_BASE + 205) -#define _gloffset_RasterPos4f (_BASE + 206) -#define _gloffset_RasterPos4fv (_BASE + 207) -#define _gloffset_RasterPos4i (_BASE + 208) -#define _gloffset_RasterPos4iv (_BASE + 209) -#define _gloffset_RasterPos4s (_BASE + 210) -#define _gloffset_RasterPos4sv (_BASE + 211) -#define _gloffset_ReadBuffer (_BASE + 212) -#define _gloffset_ReadPixels (_BASE + 213) -#define _gloffset_Rectd (_BASE + 214) -#define _gloffset_Rectdv (_BASE + 215) -#define _gloffset_Rectf (_BASE + 216) -#define _gloffset_Rectfv (_BASE + 217) -#define _gloffset_Recti (_BASE + 218) -#define _gloffset_Rectiv (_BASE + 219) -#define _gloffset_Rects (_BASE + 220) -#define _gloffset_Rectsv (_BASE + 221) -#define _gloffset_RenderMode (_BASE + 222) -#define _gloffset_Rotated (_BASE + 223) -#define _gloffset_Rotatef (_BASE + 224) -#define _gloffset_Scaled (_BASE + 225) -#define _gloffset_Scalef (_BASE + 226) -#define _gloffset_Scissor (_BASE + 227) -#define _gloffset_SelectBuffer (_BASE + 228) -#define _gloffset_ShadeModel (_BASE + 229) -#define _gloffset_StencilFunc (_BASE + 230) -#define _gloffset_StencilMask (_BASE + 231) -#define _gloffset_StencilOp (_BASE + 232) -#define _gloffset_TexCoord1d (_BASE + 233) -#define _gloffset_TexCoord1dv (_BASE + 234) -#define _gloffset_TexCoord1f (_BASE + 235) -#define _gloffset_TexCoord1fv (_BASE + 236) -#define _gloffset_TexCoord1i (_BASE + 237) -#define _gloffset_TexCoord1iv (_BASE + 238) -#define _gloffset_TexCoord1s (_BASE + 239) -#define _gloffset_TexCoord1sv (_BASE + 240) -#define _gloffset_TexCoord2d (_BASE + 241) -#define _gloffset_TexCoord2dv (_BASE + 242) -#define _gloffset_TexCoord2f (_BASE + 243) -#define _gloffset_TexCoord2fv (_BASE + 244) -#define _gloffset_TexCoord2i (_BASE + 245) -#define _gloffset_TexCoord2iv (_BASE + 246) -#define _gloffset_TexCoord2s (_BASE + 247) -#define _gloffset_TexCoord2sv (_BASE + 248) -#define _gloffset_TexCoord3d (_BASE + 249) -#define _gloffset_TexCoord3dv (_BASE + 250) -#define _gloffset_TexCoord3f (_BASE + 251) -#define _gloffset_TexCoord3fv (_BASE + 252) -#define _gloffset_TexCoord3i (_BASE + 253) -#define _gloffset_TexCoord3iv (_BASE + 254) -#define _gloffset_TexCoord3s (_BASE + 255) -#define _gloffset_TexCoord3sv (_BASE + 256) -#define _gloffset_TexCoord4d (_BASE + 257) -#define _gloffset_TexCoord4dv (_BASE + 258) -#define _gloffset_TexCoord4f (_BASE + 259) -#define _gloffset_TexCoord4fv (_BASE + 260) -#define _gloffset_TexCoord4i (_BASE + 261) -#define _gloffset_TexCoord4iv (_BASE + 262) -#define _gloffset_TexCoord4s (_BASE + 263) -#define _gloffset_TexCoord4sv (_BASE + 264) -#define _gloffset_TexEnvf (_BASE + 265) -#define _gloffset_TexEnvfv (_BASE + 266) -#define _gloffset_TexEnvi (_BASE + 267) -#define _gloffset_TexEnviv (_BASE + 268) -#define _gloffset_TexGend (_BASE + 269) -#define _gloffset_TexGendv (_BASE + 270) -#define _gloffset_TexGenf (_BASE + 271) -#define _gloffset_TexGenfv (_BASE + 272) -#define _gloffset_TexGeni (_BASE + 273) -#define _gloffset_TexGeniv (_BASE + 274) -#define _gloffset_TexImage1D (_BASE + 275) -#define _gloffset_TexImage2D (_BASE + 276) -#define _gloffset_TexParameterf (_BASE + 277) -#define _gloffset_TexParameterfv (_BASE + 278) -#define _gloffset_TexParameteri (_BASE + 279) -#define _gloffset_TexParameteriv (_BASE + 280) -#define _gloffset_Translated (_BASE + 281) -#define _gloffset_Translatef (_BASE + 282) -#define _gloffset_Vertex2d (_BASE + 283) -#define _gloffset_Vertex2dv (_BASE + 284) -#define _gloffset_Vertex2f (_BASE + 285) -#define _gloffset_Vertex2fv (_BASE + 286) -#define _gloffset_Vertex2i (_BASE + 287) -#define _gloffset_Vertex2iv (_BASE + 288) -#define _gloffset_Vertex2s (_BASE + 289) -#define _gloffset_Vertex2sv (_BASE + 290) -#define _gloffset_Vertex3d (_BASE + 291) -#define _gloffset_Vertex3dv (_BASE + 292) -#define _gloffset_Vertex3f (_BASE + 293) -#define _gloffset_Vertex3fv (_BASE + 294) -#define _gloffset_Vertex3i (_BASE + 295) -#define _gloffset_Vertex3iv (_BASE + 296) -#define _gloffset_Vertex3s (_BASE + 297) -#define _gloffset_Vertex3sv (_BASE + 298) -#define _gloffset_Vertex4d (_BASE + 299) -#define _gloffset_Vertex4dv (_BASE + 300) -#define _gloffset_Vertex4f (_BASE + 301) -#define _gloffset_Vertex4fv (_BASE + 302) -#define _gloffset_Vertex4i (_BASE + 303) -#define _gloffset_Vertex4iv (_BASE + 304) -#define _gloffset_Vertex4s (_BASE + 305) -#define _gloffset_Vertex4sv (_BASE + 306) -#define _gloffset_Viewport (_BASE + 307) - -/* GL 1.1 */ -#define _gloffset_AreTexturesResident (_BASE + 308) -#define _gloffset_ArrayElement (_BASE + 309) -#define _gloffset_BindTexture (_BASE + 310) -#define _gloffset_ColorPointer (_BASE + 311) -#define _gloffset_CopyTexImage1D (_BASE + 312) -#define _gloffset_CopyTexImage2D (_BASE + 313) -#define _gloffset_CopyTexSubImage1D (_BASE + 314) -#define _gloffset_CopyTexSubImage2D (_BASE + 315) -#define _gloffset_DeleteTextures (_BASE + 316) -#define _gloffset_DisableClientState (_BASE + 317) -#define _gloffset_DrawArrays (_BASE + 318) -#define _gloffset_DrawElements (_BASE + 319) -#define _gloffset_EdgeFlagPointer (_BASE + 320) -#define _gloffset_EnableClientState (_BASE + 321) -#define _gloffset_GenTextures (_BASE + 322) -#define _gloffset_GetPointerv (_BASE + 323) -#define _gloffset_IndexPointer (_BASE + 324) -#define _gloffset_Indexub (_BASE + 325) -#define _gloffset_Indexubv (_BASE + 326) -#define _gloffset_InterleavedArrays (_BASE + 327) -#define _gloffset_IsTexture (_BASE + 328) -#define _gloffset_NormalPointer (_BASE + 329) -#define _gloffset_PopClientAttrib (_BASE + 330) -#define _gloffset_PrioritizeTextures (_BASE + 331) -#define _gloffset_PushClientAttrib (_BASE + 332) -#define _gloffset_TexCoordPointer (_BASE + 333) -#define _gloffset_TexSubImage1D (_BASE + 334) -#define _gloffset_TexSubImage2D (_BASE + 335) -#define _gloffset_VertexPointer (_BASE + 336) - -/* GL 1.2 */ -#define _gloffset_CopyTexSubImage3D (_BASE + 337) -#define _gloffset_DrawRangeElements (_BASE + 338) -#define _gloffset_TexImage3D (_BASE + 339) -#define _gloffset_TexSubImage3D (_BASE + 340) - -/* GL_ARB_imaging */ -#define _gloffset_BlendColor (_BASE + 341) -#define _gloffset_BlendEquation (_BASE + 342) -#define _gloffset_ColorSubTable (_BASE + 343) -#define _gloffset_ColorTable (_BASE + 344) -#define _gloffset_ColorTableParameterfv (_BASE + 345) -#define _gloffset_ColorTableParameteriv (_BASE + 346) -#define _gloffset_ConvolutionFilter1D (_BASE + 347) -#define _gloffset_ConvolutionFilter2D (_BASE + 348) -#define _gloffset_ConvolutionParameterf (_BASE + 349) -#define _gloffset_ConvolutionParameterfv (_BASE + 350) -#define _gloffset_ConvolutionParameteri (_BASE + 351) -#define _gloffset_ConvolutionParameteriv (_BASE + 352) -#define _gloffset_CopyColorSubTable (_BASE + 353) -#define _gloffset_CopyColorTable (_BASE + 354) -#define _gloffset_CopyConvolutionFilter1D (_BASE + 355) -#define _gloffset_CopyConvolutionFilter2D (_BASE + 356) -#define _gloffset_GetColorTable (_BASE + 357) -#define _gloffset_GetColorTableParameterfv (_BASE + 358) -#define _gloffset_GetColorTableParameteriv (_BASE + 359) -#define _gloffset_GetConvolutionFilter (_BASE + 360) -#define _gloffset_GetConvolutionParameterfv (_BASE + 361) -#define _gloffset_GetConvolutionParameteriv (_BASE + 362) -#define _gloffset_GetHistogram (_BASE + 363) -#define _gloffset_GetHistogramParameterfv (_BASE + 364) -#define _gloffset_GetHistogramParameteriv (_BASE + 365) -#define _gloffset_GetMinmax (_BASE + 366) -#define _gloffset_GetMinmaxParameterfv (_BASE + 367) -#define _gloffset_GetMinmaxParameteriv (_BASE + 368) -#define _gloffset_GetSeparableFilter (_BASE + 369) -#define _gloffset_Histogram (_BASE + 370) -#define _gloffset_Minmax (_BASE + 371) -#define _gloffset_ResetHistogram (_BASE + 372) -#define _gloffset_ResetMinmax (_BASE + 373) -#define _gloffset_SeparableFilter2D (_BASE + 374) - -/* GL_ARB_multitexture */ -#define _gloffset_ActiveTextureARB (_BASE + 375) -#define _gloffset_ClientActiveTextureARB (_BASE + 376) -#define _gloffset_MultiTexCoord1dARB (_BASE + 377) -#define _gloffset_MultiTexCoord1dvARB (_BASE + 378) -#define _gloffset_MultiTexCoord1fARB (_BASE + 379) -#define _gloffset_MultiTexCoord1fvARB (_BASE + 380) -#define _gloffset_MultiTexCoord1iARB (_BASE + 381) -#define _gloffset_MultiTexCoord1ivARB (_BASE + 382) -#define _gloffset_MultiTexCoord1sARB (_BASE + 383) -#define _gloffset_MultiTexCoord1svARB (_BASE + 384) -#define _gloffset_MultiTexCoord2dARB (_BASE + 385) -#define _gloffset_MultiTexCoord2dvARB (_BASE + 386) -#define _gloffset_MultiTexCoord2fARB (_BASE + 387) -#define _gloffset_MultiTexCoord2fvARB (_BASE + 388) -#define _gloffset_MultiTexCoord2iARB (_BASE + 389) -#define _gloffset_MultiTexCoord2ivARB (_BASE + 390) -#define _gloffset_MultiTexCoord2sARB (_BASE + 391) -#define _gloffset_MultiTexCoord2svARB (_BASE + 392) -#define _gloffset_MultiTexCoord3dARB (_BASE + 393) -#define _gloffset_MultiTexCoord3dvARB (_BASE + 394) -#define _gloffset_MultiTexCoord3fARB (_BASE + 395) -#define _gloffset_MultiTexCoord3fvARB (_BASE + 396) -#define _gloffset_MultiTexCoord3iARB (_BASE + 397) -#define _gloffset_MultiTexCoord3ivARB (_BASE + 398) -#define _gloffset_MultiTexCoord3sARB (_BASE + 399) -#define _gloffset_MultiTexCoord3svARB (_BASE + 400) -#define _gloffset_MultiTexCoord4dARB (_BASE + 401) -#define _gloffset_MultiTexCoord4dvARB (_BASE + 402) -#define _gloffset_MultiTexCoord4fARB (_BASE + 403) -#define _gloffset_MultiTexCoord4fvARB (_BASE + 404) -#define _gloffset_MultiTexCoord4iARB (_BASE + 405) -#define _gloffset_MultiTexCoord4ivARB (_BASE + 406) -#define _gloffset_MultiTexCoord4sARB (_BASE + 407) -#define _gloffset_MultiTexCoord4svARB (_BASE + 408) - - - -#define _EXTBASE (_BASE + 409) - - -/* 1. GL_EXT_abgr - no functions */ - -/* 2. GL_EXT_blend_color */ -#define _gloffset_BlendColorEXT (_EXTBASE + 0) - -/* 3. GL_EXT_polygon_offset */ -#define _gloffset_PolygonOffsetEXT (_EXTBASE + 1) - -/* 4. GL_EXT_texture - no functions */ - -/* 5. ??? */ - -/* 6. GL_EXT_texture3D */ -#define _gloffset_CopyTexSubImage3DEXT (_EXTBASE + 2) -#define _gloffset_TexImage3DEXT (_EXTBASE + 3) -#define _gloffset_TexSubImage3DEXT (_EXTBASE + 4) - -/* 7. GL_SGI_texture_filter4 */ -#define _gloffset_GetTexFilterFuncSGIS (_EXTBASE + 5) -#define _gloffset_TexFilterFuncSGIS (_EXTBASE + 6) - -/* 8. ??? */ - -/* 9. GL_EXT_subtexture */ -#define _gloffset_TexSubImage1DEXT (_EXTBASE + 7) -#define _gloffset_TexSubImage2DEXT (_EXTBASE + 8) -/*#define _gloffset_TexSubImage3DEXT*/ - -/* 10. GL_EXT_copy_texture */ -#define _gloffset_CopyTexImage1DEXT (_EXTBASE + 9) -#define _gloffset_CopyTexImage2DEXT (_EXTBASE + 10) -#define _gloffset_CopyTexSubImage1DEXT (_EXTBASE + 11) -#define _gloffset_CopyTexSubImage2DEXT (_EXTBASE + 12) -/*#define _gloffset_CopyTexSubImage3DEXT*/ - -/* 11. GL_EXT_histogram */ -#define _gloffset_GetHistogramEXT (_EXTBASE + 13) -#define _gloffset_GetHistogramParameterfvEXT (_EXTBASE + 15) -#define _gloffset_GetHistogramParameterivEXT (_EXTBASE + 14) -#define _gloffset_GetMinmaxEXT (_EXTBASE + 16) -#define _gloffset_GetMinmaxParameterfvEXT (_EXTBASE + 18) -#define _gloffset_GetMinmaxParameterivEXT (_EXTBASE + 17) -#define _gloffset_HistogramEXT (_EXTBASE + 19) -#define _gloffset_MinmaxEXT (_EXTBASE + 20) -#define _gloffset_ResetHistogramEXT (_EXTBASE + 21) -#define _gloffset_ResetMinmaxEXT (_EXTBASE + 22) - -/* 12. GL_EXT_convolution */ -#define _gloffset_ConvolutionFilter1DEXT (_EXTBASE + 23) -#define _gloffset_ConvolutionFilter2DEXT (_EXTBASE + 24) -#define _gloffset_ConvolutionParameterfEXT (_EXTBASE + 25) -#define _gloffset_ConvolutionParameterfvEXT (_EXTBASE + 26) -#define _gloffset_ConvolutionParameteriEXT (_EXTBASE + 27) -#define _gloffset_ConvolutionParameterivEXT (_EXTBASE + 28) -#define _gloffset_CopyConvolutionFilter1DEXT (_EXTBASE + 29) -#define _gloffset_CopyConvolutionFilter2DEXT (_EXTBASE + 30) -#define _gloffset_GetConvolutionFilterEXT (_EXTBASE + 31) -#define _gloffset_GetConvolutionParameterivEXT (_EXTBASE + 32) -#define _gloffset_GetConvolutionParameterfvEXT (_EXTBASE + 33) -#define _gloffset_GetSeparableFilterEXT (_EXTBASE + 34) -#define _gloffset_SeparableFilter2DEXT (_EXTBASE + 35) - -/* 13. GL_SGI_color_matrix - no functions */ - -/* 14. GL_SGI_color_table */ -#define _gloffset_ColorTableSGI (_EXTBASE + 36) -#define _gloffset_ColorTableParameterfvSGI (_EXTBASE + 37) -#define _gloffset_ColorTableParameterivSGI (_EXTBASE + 38) -#define _gloffset_CopyColorTableSGI (_EXTBASE + 39) -#define _gloffset_GetColorTableSGI (_EXTBASE + 40) -#define _gloffset_GetColorTableParameterfvSGI (_EXTBASE + 41) -#define _gloffset_GetColorTableParameterivSGI (_EXTBASE + 42) - -/* 15. GL_SGIS_pixel_texture */ -#define _gloffset_PixelTexGenParameterfSGIS (_EXTBASE + 43) -#define _gloffset_PixelTexGenParameteriSGIS (_EXTBASE + 44) -#define _gloffset_GetPixelTexGenParameterfvSGIS (_EXTBASE + 45) -#define _gloffset_GetPixelTexGenParameterivSGIS (_EXTBASE + 46) - -/* 16. GL_SGIS_texture4D */ -#define _gloffset_TexImage4DSGIS (_EXTBASE + 47) -#define _gloffset_TexSubImage4DSGIS (_EXTBASE + 48) - -/* 17. GL_SGI_texture_color_table - no functions */ - -/* 18. GL_EXT_cmyka - no functions */ - -/* 19. ??? */ - -/* 20. GL_EXT_texture_object */ -#define _gloffset_AreTexturesResidentEXT (_EXTBASE + 49) -#define _gloffset_BindTextureEXT (_EXTBASE + 50) -#define _gloffset_DeleteTexturesEXT (_EXTBASE + 51) -#define _gloffset_GenTexturesEXT (_EXTBASE + 52) -#define _gloffset_IsTextureEXT (_EXTBASE + 53) -#define _gloffset_PrioritizeTexturesEXT (_EXTBASE + 54) - -/* 21. GL_SGIS_detail_texture */ -#define _gloffset_DetailTexFuncSGIS (_EXTBASE + 55) -#define _gloffset_GetDetailTexFuncSGIS (_EXTBASE + 56) - -/* 22. GL_SGIS_sharpen_texture */ -#define _gloffset_GetSharpenTexFuncSGIS (_EXTBASE + 57) -#define _gloffset_SharpenTexFuncSGIS (_EXTBASE + 58) - -/* 23. GL_EXT_packed_pixels - no functions */ - -/* 24. GL_SGIS_texture_lod - no functions */ - -/* 25. GL_SGIS_multisample */ -#define _gloffset_SampleMaskSGIS (_EXTBASE + 54) -#define _gloffset_SamplePatternSGIS (_EXTBASE + 55) - -/* 26. ??? */ - -/* 27. GL_EXT_rescale_normal - no functions */ - -/* 28. GLX_EXT_visual_info - no functions */ - -/* 29. ??? */ - -/* 30. GL_EXT_vertex_array */ -#define _gloffset_ArrayElementEXT (_EXTBASE + 56) -#define _gloffset_ColorPointerEXT (_EXTBASE + 57) -#define _gloffset_DrawArraysEXT (_EXTBASE + 58) -#define _gloffset_EdgeFlagPointerEXT (_EXTBASE + 59) -#define _gloffset_GetPointervEXT (_EXTBASE + 60) -#define _gloffset_IndexPointerEXT (_EXTBASE + 61) -#define _gloffset_NormalPointerEXT (_EXTBASE + 62) -#define _gloffset_TexCoordPointerEXT (_EXTBASE + 63) -#define _gloffset_VertexPointerEXT (_EXTBASE + 64) - -/* 31. GL_EXT_misc_attribute - no functions */ - -/* 32. GL_SGIS_generate_mipmap - no functions */ - -/* 33. GL_SGIX_clipmap - no functions */ - -/* 34. GL_SGIX_shadow - no functions */ - -/* 35. GL_SGIS_texture_edge_clamp - no functions */ - -/* 36. GL_SGIS_texture_border_clamp - no functions */ - -/* 37. GL_EXT_blend_minmax */ -#define _gloffset_BlendEquationEXT (_EXTBASE + 65) - -/* 38. GL_EXT_blend_subtract - no functions */ - -/* 39. GL_EXT_blend_logic_op - no functions */ - -/* 40. GLX_SGI_swap_control - GLX functions */ - -/* 41. GLX_SGI_video_sync - GLX functions */ - -/* 42. GLX_SGI_make_current_read - GLX functions */ - -/* 43. GLX_SGIX_video_source - GLX functions */ - -/* 44. GLX_EXT_visual_rating - no functions */ - -/* 45. GL_SGIX_interlace - no functions */ - -/* 46. ??? */ - -/* 47. GLX_EXT_import_context - GLX functions */ - -/* 48. ??? */ - -/* 49. GLX_SGIX_fbconfig - some GLX functions */ - -/* 50. GLX_SGIX_pbuffer - GLX functions */ - -/* 51. GL_SGIS_texture_select - no functions */ - -/* 52. GL_SGIX_sprite */ -#define _gloffset_SpriteParameterfSGIX (_EXTBASE + 66) -#define _gloffset_SpriteParameterfvSGIX (_EXTBASE + 67) -#define _gloffset_SpriteParameteriSGIX (_EXTBASE + 68) -#define _gloffset_SpriteParameterivSGIX (_EXTBASE + 69) - -/* 53. ??? */ - -/* 54. GL_EXT_point_parameters */ -#define _gloffset_PointParameterfEXT (_EXTBASE + 70) -#define _gloffset_PointParameterfvEXT (_EXTBASE + 71) - -/* 55. GL_SGIX_instruments */ -#define _gloffset_InstrumentsBufferSGIX (_EXTBASE + 72) -#define _gloffset_StartInstrumentsSGIX (_EXTBASE + 73) -#define _gloffset_StopInstrumentsSGIX (_EXTBASE + 74) -#define _gloffset_ReadInstrumentsSGIX (_EXTBASE + 75) -#define _gloffset_PollInstrumentsSGIX (_EXTBASE + 76) -#define _gloffset_GetInstrumentsSGIX (_EXTBASE + 77) - -/* 56. GL_SGIX_texture_scale_bias - no functions */ - -/* 57. GL_SGIX_framezoom */ -#define _gloffset_FrameZoomSGIX (_EXTBASE + 78) - -/* 58. GL_SGIX_tag_sample_buffer - no functions */ - -/* 59. ??? */ - -/* 60. GL_SGIX_reference_plane */ -#define _gloffset_ReferencePlaneSGIX (_EXTBASE + 79) - -/* 61. GL_SGIX_flush_raster */ -#define _gloffset_FlushRasterSGIX (_EXTBASE + 80) - -/* 62. GLX_SGI_cushion - GLX functions */ - -/* 63. GL_SGIX_depth_texture - no functions */ - -/* 64. ??? */ - -/* 65. GL_SGIX_fog_offset - no functions */ - -/* 66. GL_HP_image_transform */ -#define _gloffset_GetImageTransformParameterfvHP (_EXTBASE + 81) -#define _gloffset_GetImageTransformParameterivHP (_EXTBASE + 82) -#define _gloffset_ImageTransformParameterfHP (_EXTBASE + 83) -#define _gloffset_ImageTransformParameterfvHP (_EXTBASE + 84) -#define _gloffset_ImageTransformParameteriHP (_EXTBASE + 85) -#define _gloffset_ImageTransformParameterivHP (_EXTBASE + 86) - -/* 67. GL_HP_convolution_border_modes - no functions */ - -/* 68. ??? */ - -/* 69. GL_SGIX_texture_add_env - no functions */ - -/* 70. ??? */ - -/* 71. ??? */ - -/* 72. ??? */ - -/* 73. ??? */ - -/* 74. GL_EXT_color_subtable */ -#define _gloffset_ColorSubTableEXT (_EXTBASE + 87) -#define _gloffset_CopyColorSubTableEXT (_EXTBASE + 88) - -/* 75. GLU_EXT_object_space_tess - GLU functions */ - -/* 76. GL_PGI_vertex_hints - no functions */ - -/* 77. GL_PGI_misc_hints */ -#define _gloffset_HintPGI (_EXTBASE + 89) - -/* 78. GL_EXT_paletted_texture */ -/* ColorSubTableEXT already defined */ -#define _gloffset_ColorTableEXT (_EXTBASE + 91) -#define _gloffset_GetColorTableEXT (_EXTBASE + 92) -#define _gloffset_GetColorTableParameterfvEXT (_EXTBASE + 93) -#define _gloffset_GetColorTableParameterivEXT (_EXTBASE + 94) - -/* 79. GL_EXT_clip_volume_hint - no functions */ - -/* 80. GL_SGIX_list_priority */ -#define _gloffset_GetListParameterfvSGIX (_EXTBASE + 95) -#define _gloffset_GetListParameterivSGIX (_EXTBASE + 96) -#define _gloffset_ListParameterfSGIX (_EXTBASE + 97) -#define _gloffset_ListParameterfvSGIX (_EXTBASE + 98) -#define _gloffset_ListParameteriSGIX (_EXTBASE + 99) -#define _gloffset_ListParameterivSGIX (_EXTBASE + 100) - -/* 81. GL_SGIX_ir_instrument1 - no functions */ - -/* 82. ??? */ - -/* 83. GLX_SGIX_video_resize - GLX functions */ - -/* 84. GL_SGIX_texture_lod_bias - no functions */ - -/* 85. GLU_SGI_filter4_parameters - GLU functions */ - -/* 86. GLX_SGIX_dm_buffer - GLX functions */ - -/* 87. ??? */ - -/* 88. ??? */ - -/* 89. ??? */ - -/* 90. ??? */ - -/* 91. GLX_SGIX_swap_group - GLX functions */ - -/* 92. GLX_SGIX_swap_barrier - GLX functions */ - -/* 93. GL_EXT_index_texture - no functions */ - -/* 94. GL_EXT_index_material */ -#define _gloffset_IndexMaterialEXT (_EXTBASE + 101) - -/* 95. GL_EXT_index_func */ -#define _gloffset_IndexFuncEXT (_EXTBASE + 102) - -/* 96. GL_EXT_index_array_formats - no functions */ - -/* 97. GL_EXT_compiled_vertex_array */ -#define _gloffset_LockArraysEXT (_EXTBASE + 103) -#define _gloffset_UnlockArraysEXT (_EXTBASE + 104) - -/* 98. GL_EXT_cull_vertex */ -#define _gloffset_CullParameterfvEXT (_EXTBASE + 105) -#define _gloffset_CullParameterdvEXT (_EXTBASE + 106) - -/* 99. ??? */ - -/* 100. GLU_EXT_nurbs_tessellator - GLU functions */ - -/* 173. GL_EXT/INGR_blend_func_separate */ -#define _gloffset_BlendFuncSeparateINGR (_EXTBASE + 107) - -/* GL_MESA_window_pos */ -#define _gloffset_WindowPos2dMESA (_EXTBASE + 108) -#define _gloffset_WindowPos2dvMESA (_EXTBASE + 109) -#define _gloffset_WindowPos2fMESA (_EXTBASE + 110) -#define _gloffset_WindowPos2fvMESA (_EXTBASE + 111) -#define _gloffset_WindowPos2iMESA (_EXTBASE + 112) -#define _gloffset_WindowPos2ivMESA (_EXTBASE + 113) -#define _gloffset_WindowPos2sMESA (_EXTBASE + 114) -#define _gloffset_WindowPos2svMESA (_EXTBASE + 115) -#define _gloffset_WindowPos3dMESA (_EXTBASE + 116) -#define _gloffset_WindowPos3dvMESA (_EXTBASE + 117) -#define _gloffset_WindowPos3fMESA (_EXTBASE + 118) -#define _gloffset_WindowPos3fvMESA (_EXTBASE + 119) -#define _gloffset_WindowPos3iMESA (_EXTBASE + 120) -#define _gloffset_WindowPos3ivMESA (_EXTBASE + 121) -#define _gloffset_WindowPos3sMESA (_EXTBASE + 122) -#define _gloffset_WindowPos3svMESA (_EXTBASE + 123) -#define _gloffset_WindowPos4dMESA (_EXTBASE + 124) -#define _gloffset_WindowPos4dvMESA (_EXTBASE + 125) -#define _gloffset_WindowPos4fMESA (_EXTBASE + 126) -#define _gloffset_WindowPos4fvMESA (_EXTBASE + 127) -#define _gloffset_WindowPos4iMESA (_EXTBASE + 128) -#define _gloffset_WindowPos4ivMESA (_EXTBASE + 129) -#define _gloffset_WindowPos4sMESA (_EXTBASE + 130) -#define _gloffset_WindowPos4svMESA (_EXTBASE + 131) - -/* GL_MESA_resize_buffers */ -#define _gloffset_ResizeBuffersMESA (_EXTBASE + 132) - -/* GL_ARB_transpose_matrix */ -#define _gloffset_LoadTransposeMatrixdARB (_EXTBASE + 133) -#define _gloffset_LoadTransposeMatrixfARB (_EXTBASE + 134) -#define _gloffset_MultTransposeMatrixdARB (_EXTBASE + 135) -#define _gloffset_MultTransposeMatrixfARB (_EXTBASE + 136) - - +/* DO NOT EDIT - This file generated automatically */ +#ifndef _GLAPI_OFFSETS_H_ +#define _GLAPI_OFFSETS_H_ + +#define _gloffset_NewList 0 +#define _gloffset_EndList 1 +#define _gloffset_CallList 2 +#define _gloffset_CallLists 3 +#define _gloffset_DeleteLists 4 +#define _gloffset_GenLists 5 +#define _gloffset_ListBase 6 +#define _gloffset_Begin 7 +#define _gloffset_Bitmap 8 +#define _gloffset_Color3b 9 +#define _gloffset_Color3bv 10 +#define _gloffset_Color3d 11 +#define _gloffset_Color3dv 12 +#define _gloffset_Color3f 13 +#define _gloffset_Color3fv 14 +#define _gloffset_Color3i 15 +#define _gloffset_Color3iv 16 +#define _gloffset_Color3s 17 +#define _gloffset_Color3sv 18 +#define _gloffset_Color3ub 19 +#define _gloffset_Color3ubv 20 +#define _gloffset_Color3ui 21 +#define _gloffset_Color3uiv 22 +#define _gloffset_Color3us 23 +#define _gloffset_Color3usv 24 +#define _gloffset_Color4b 25 +#define _gloffset_Color4bv 26 +#define _gloffset_Color4d 27 +#define _gloffset_Color4dv 28 +#define _gloffset_Color4f 29 +#define _gloffset_Color4fv 30 +#define _gloffset_Color4i 31 +#define _gloffset_Color4iv 32 +#define _gloffset_Color4s 33 +#define _gloffset_Color4sv 34 +#define _gloffset_Color4ub 35 +#define _gloffset_Color4ubv 36 +#define _gloffset_Color4ui 37 +#define _gloffset_Color4uiv 38 +#define _gloffset_Color4us 39 +#define _gloffset_Color4usv 40 +#define _gloffset_EdgeFlag 41 +#define _gloffset_EdgeFlagv 42 +#define _gloffset_End 43 +#define _gloffset_Indexd 44 +#define _gloffset_Indexdv 45 +#define _gloffset_Indexf 46 +#define _gloffset_Indexfv 47 +#define _gloffset_Indexi 48 +#define _gloffset_Indexiv 49 +#define _gloffset_Indexs 50 +#define _gloffset_Indexsv 51 +#define _gloffset_Normal3b 52 +#define _gloffset_Normal3bv 53 +#define _gloffset_Normal3d 54 +#define _gloffset_Normal3dv 55 +#define _gloffset_Normal3f 56 +#define _gloffset_Normal3fv 57 +#define _gloffset_Normal3i 58 +#define _gloffset_Normal3iv 59 +#define _gloffset_Normal3s 60 +#define _gloffset_Normal3sv 61 +#define _gloffset_RasterPos2d 62 +#define _gloffset_RasterPos2dv 63 +#define _gloffset_RasterPos2f 64 +#define _gloffset_RasterPos2fv 65 +#define _gloffset_RasterPos2i 66 +#define _gloffset_RasterPos2iv 67 +#define _gloffset_RasterPos2s 68 +#define _gloffset_RasterPos2sv 69 +#define _gloffset_RasterPos3d 70 +#define _gloffset_RasterPos3dv 71 +#define _gloffset_RasterPos3f 72 +#define _gloffset_RasterPos3fv 73 +#define _gloffset_RasterPos3i 74 +#define _gloffset_RasterPos3iv 75 +#define _gloffset_RasterPos3s 76 +#define _gloffset_RasterPos3sv 77 +#define _gloffset_RasterPos4d 78 +#define _gloffset_RasterPos4dv 79 +#define _gloffset_RasterPos4f 80 +#define _gloffset_RasterPos4fv 81 +#define _gloffset_RasterPos4i 82 +#define _gloffset_RasterPos4iv 83 +#define _gloffset_RasterPos4s 84 +#define _gloffset_RasterPos4sv 85 +#define _gloffset_Rectd 86 +#define _gloffset_Rectdv 87 +#define _gloffset_Rectf 88 +#define _gloffset_Rectfv 89 +#define _gloffset_Recti 90 +#define _gloffset_Rectiv 91 +#define _gloffset_Rects 92 +#define _gloffset_Rectsv 93 +#define _gloffset_TexCoord1d 94 +#define _gloffset_TexCoord1dv 95 +#define _gloffset_TexCoord1f 96 +#define _gloffset_TexCoord1fv 97 +#define _gloffset_TexCoord1i 98 +#define _gloffset_TexCoord1iv 99 +#define _gloffset_TexCoord1s 100 +#define _gloffset_TexCoord1sv 101 +#define _gloffset_TexCoord2d 102 +#define _gloffset_TexCoord2dv 103 +#define _gloffset_TexCoord2f 104 +#define _gloffset_TexCoord2fv 105 +#define _gloffset_TexCoord2i 106 +#define _gloffset_TexCoord2iv 107 +#define _gloffset_TexCoord2s 108 +#define _gloffset_TexCoord2sv 109 +#define _gloffset_TexCoord3d 110 +#define _gloffset_TexCoord3dv 111 +#define _gloffset_TexCoord3f 112 +#define _gloffset_TexCoord3fv 113 +#define _gloffset_TexCoord3i 114 +#define _gloffset_TexCoord3iv 115 +#define _gloffset_TexCoord3s 116 +#define _gloffset_TexCoord3sv 117 +#define _gloffset_TexCoord4d 118 +#define _gloffset_TexCoord4dv 119 +#define _gloffset_TexCoord4f 120 +#define _gloffset_TexCoord4fv 121 +#define _gloffset_TexCoord4i 122 +#define _gloffset_TexCoord4iv 123 +#define _gloffset_TexCoord4s 124 +#define _gloffset_TexCoord4sv 125 +#define _gloffset_Vertex2d 126 +#define _gloffset_Vertex2dv 127 +#define _gloffset_Vertex2f 128 +#define _gloffset_Vertex2fv 129 +#define _gloffset_Vertex2i 130 +#define _gloffset_Vertex2iv 131 +#define _gloffset_Vertex2s 132 +#define _gloffset_Vertex2sv 133 +#define _gloffset_Vertex3d 134 +#define _gloffset_Vertex3dv 135 +#define _gloffset_Vertex3f 136 +#define _gloffset_Vertex3fv 137 +#define _gloffset_Vertex3i 138 +#define _gloffset_Vertex3iv 139 +#define _gloffset_Vertex3s 140 +#define _gloffset_Vertex3sv 141 +#define _gloffset_Vertex4d 142 +#define _gloffset_Vertex4dv 143 +#define _gloffset_Vertex4f 144 +#define _gloffset_Vertex4fv 145 +#define _gloffset_Vertex4i 146 +#define _gloffset_Vertex4iv 147 +#define _gloffset_Vertex4s 148 +#define _gloffset_Vertex4sv 149 +#define _gloffset_ClipPlane 150 +#define _gloffset_ColorMaterial 151 +#define _gloffset_CullFace 152 +#define _gloffset_Fogf 153 +#define _gloffset_Fogfv 154 +#define _gloffset_Fogi 155 +#define _gloffset_Fogiv 156 +#define _gloffset_FrontFace 157 +#define _gloffset_Hint 158 +#define _gloffset_Lightf 159 +#define _gloffset_Lightfv 160 +#define _gloffset_Lighti 161 +#define _gloffset_Lightiv 162 +#define _gloffset_LightModelf 163 +#define _gloffset_LightModelfv 164 +#define _gloffset_LightModeli 165 +#define _gloffset_LightModeliv 166 +#define _gloffset_LineStipple 167 +#define _gloffset_LineWidth 168 +#define _gloffset_Materialf 169 +#define _gloffset_Materialfv 170 +#define _gloffset_Materiali 171 +#define _gloffset_Materialiv 172 +#define _gloffset_PointSize 173 +#define _gloffset_PolygonMode 174 +#define _gloffset_PolygonStipple 175 +#define _gloffset_Scissor 176 +#define _gloffset_ShadeModel 177 +#define _gloffset_TexParameterf 178 +#define _gloffset_TexParameterfv 179 +#define _gloffset_TexParameteri 180 +#define _gloffset_TexParameteriv 181 +#define _gloffset_TexImage1D 182 +#define _gloffset_TexImage2D 183 +#define _gloffset_TexEnvf 184 +#define _gloffset_TexEnvfv 185 +#define _gloffset_TexEnvi 186 +#define _gloffset_TexEnviv 187 +#define _gloffset_TexGend 188 +#define _gloffset_TexGendv 189 +#define _gloffset_TexGenf 190 +#define _gloffset_TexGenfv 191 +#define _gloffset_TexGeni 192 +#define _gloffset_TexGeniv 193 +#define _gloffset_FeedbackBuffer 194 +#define _gloffset_SelectBuffer 195 +#define _gloffset_RenderMode 196 +#define _gloffset_InitNames 197 +#define _gloffset_LoadName 198 +#define _gloffset_PassThrough 199 +#define _gloffset_PopName 200 +#define _gloffset_PushName 201 +#define _gloffset_DrawBuffer 202 +#define _gloffset_Clear 203 +#define _gloffset_ClearAccum 204 +#define _gloffset_ClearIndex 205 +#define _gloffset_ClearColor 206 +#define _gloffset_ClearStencil 207 +#define _gloffset_ClearDepth 208 +#define _gloffset_StencilMask 209 +#define _gloffset_ColorMask 210 +#define _gloffset_DepthMask 211 +#define _gloffset_IndexMask 212 +#define _gloffset_Accum 213 +#define _gloffset_Disable 214 +#define _gloffset_Enable 215 +#define _gloffset_Finish 216 +#define _gloffset_Flush 217 +#define _gloffset_PopAttrib 218 +#define _gloffset_PushAttrib 219 +#define _gloffset_Map1d 220 +#define _gloffset_Map1f 221 +#define _gloffset_Map2d 222 +#define _gloffset_Map2f 223 +#define _gloffset_MapGrid1d 224 +#define _gloffset_MapGrid1f 225 +#define _gloffset_MapGrid2d 226 +#define _gloffset_MapGrid2f 227 +#define _gloffset_EvalCoord1d 228 +#define _gloffset_EvalCoord1dv 229 +#define _gloffset_EvalCoord1f 230 +#define _gloffset_EvalCoord1fv 231 +#define _gloffset_EvalCoord2d 232 +#define _gloffset_EvalCoord2dv 233 +#define _gloffset_EvalCoord2f 234 +#define _gloffset_EvalCoord2fv 235 +#define _gloffset_EvalMesh1 236 +#define _gloffset_EvalPoint1 237 +#define _gloffset_EvalMesh2 238 +#define _gloffset_EvalPoint2 239 +#define _gloffset_AlphaFunc 240 +#define _gloffset_BlendFunc 241 +#define _gloffset_LogicOp 242 +#define _gloffset_StencilFunc 243 +#define _gloffset_StencilOp 244 +#define _gloffset_DepthFunc 245 +#define _gloffset_PixelZoom 246 +#define _gloffset_PixelTransferf 247 +#define _gloffset_PixelTransferi 248 +#define _gloffset_PixelStoref 249 +#define _gloffset_PixelStorei 250 +#define _gloffset_PixelMapfv 251 +#define _gloffset_PixelMapuiv 252 +#define _gloffset_PixelMapusv 253 +#define _gloffset_ReadBuffer 254 +#define _gloffset_CopyPixels 255 +#define _gloffset_ReadPixels 256 +#define _gloffset_DrawPixels 257 +#define _gloffset_GetBooleanv 258 +#define _gloffset_GetClipPlane 259 +#define _gloffset_GetDoublev 260 +#define _gloffset_GetError 261 +#define _gloffset_GetFloatv 262 +#define _gloffset_GetIntegerv 263 +#define _gloffset_GetLightfv 264 +#define _gloffset_GetLightiv 265 +#define _gloffset_GetMapdv 266 +#define _gloffset_GetMapfv 267 +#define _gloffset_GetMapiv 268 +#define _gloffset_GetMaterialfv 269 +#define _gloffset_GetMaterialiv 270 +#define _gloffset_GetPixelMapfv 271 +#define _gloffset_GetPixelMapuiv 272 +#define _gloffset_GetPixelMapusv 273 +#define _gloffset_GetPolygonStipple 274 +#define _gloffset_GetString 275 +#define _gloffset_GetTexEnvfv 276 +#define _gloffset_GetTexEnviv 277 +#define _gloffset_GetTexGendv 278 +#define _gloffset_GetTexGenfv 279 +#define _gloffset_GetTexGeniv 280 +#define _gloffset_GetTexImage 281 +#define _gloffset_GetTexParameterfv 282 +#define _gloffset_GetTexParameteriv 283 +#define _gloffset_GetTexLevelParameterfv 284 +#define _gloffset_GetTexLevelParameteriv 285 +#define _gloffset_IsEnabled 286 +#define _gloffset_IsList 287 +#define _gloffset_DepthRange 288 +#define _gloffset_Frustum 289 +#define _gloffset_LoadIdentity 290 +#define _gloffset_LoadMatrixf 291 +#define _gloffset_LoadMatrixd 292 +#define _gloffset_MatrixMode 293 +#define _gloffset_MultMatrixf 294 +#define _gloffset_MultMatrixd 295 +#define _gloffset_Ortho 296 +#define _gloffset_PopMatrix 297 +#define _gloffset_PushMatrix 298 +#define _gloffset_Rotated 299 +#define _gloffset_Rotatef 300 +#define _gloffset_Scaled 301 +#define _gloffset_Scalef 302 +#define _gloffset_Translated 303 +#define _gloffset_Translatef 304 +#define _gloffset_Viewport 305 +#define _gloffset_ArrayElement 306 +#define _gloffset_BindTexture 307 +#define _gloffset_ColorPointer 308 +#define _gloffset_DisableClientState 309 +#define _gloffset_DrawArrays 310 +#define _gloffset_DrawElements 311 +#define _gloffset_EdgeFlagPointer 312 +#define _gloffset_EnableClientState 313 +#define _gloffset_IndexPointer 314 +#define _gloffset_Indexub 315 +#define _gloffset_Indexubv 316 +#define _gloffset_InterleavedArrays 317 +#define _gloffset_NormalPointer 318 +#define _gloffset_PolygonOffset 319 +#define _gloffset_TexCoordPointer 320 +#define _gloffset_VertexPointer 321 +#define _gloffset_AreTexturesResident 322 +#define _gloffset_CopyTexImage1D 323 +#define _gloffset_CopyTexImage2D 324 +#define _gloffset_CopyTexSubImage1D 325 +#define _gloffset_CopyTexSubImage2D 326 +#define _gloffset_DeleteTextures 327 +#define _gloffset_GenTextures 328 +#define _gloffset_GetPointerv 329 +#define _gloffset_IsTexture 330 +#define _gloffset_PrioritizeTextures 331 +#define _gloffset_TexSubImage1D 332 +#define _gloffset_TexSubImage2D 333 +#define _gloffset_PopClientAttrib 334 +#define _gloffset_PushClientAttrib 335 +#define _gloffset_BlendColor 336 +#define _gloffset_BlendEquation 337 +#define _gloffset_DrawRangeElements 338 +#define _gloffset_ColorTable 339 +#define _gloffset_ColorTableParameterfv 340 +#define _gloffset_ColorTableParameteriv 341 +#define _gloffset_CopyColorTable 342 +#define _gloffset_GetColorTable 343 +#define _gloffset_GetColorTableParameterfv 344 +#define _gloffset_GetColorTableParameteriv 345 +#define _gloffset_ColorSubTable 346 +#define _gloffset_CopyColorSubTable 347 +#define _gloffset_ConvolutionFilter1D 348 +#define _gloffset_ConvolutionFilter2D 349 +#define _gloffset_ConvolutionParameterf 350 +#define _gloffset_ConvolutionParameterfv 351 +#define _gloffset_ConvolutionParameteri 352 +#define _gloffset_ConvolutionParameteriv 353 +#define _gloffset_CopyConvolutionFilter1D 354 +#define _gloffset_CopyConvolutionFilter2D 355 +#define _gloffset_GetConvolutionFilter 356 +#define _gloffset_GetConvolutionParameterfv 357 +#define _gloffset_GetConvolutionParameteriv 358 +#define _gloffset_GetSeparableFilter 359 +#define _gloffset_SeparableFilter2D 360 +#define _gloffset_GetHistogram 361 +#define _gloffset_GetHistogramParameterfv 362 +#define _gloffset_GetHistogramParameteriv 363 +#define _gloffset_GetMinmax 364 +#define _gloffset_GetMinmaxParameterfv 365 +#define _gloffset_GetMinmaxParameteriv 366 +#define _gloffset_Histogram 367 +#define _gloffset_Minmax 368 +#define _gloffset_ResetHistogram 369 +#define _gloffset_ResetMinmax 370 +#define _gloffset_TexImage3D 371 +#define _gloffset_TexSubImage3D 372 +#define _gloffset_CopyTexSubImage3D 373 +#define _gloffset_ActiveTextureARB 374 +#define _gloffset_ClientActiveTextureARB 375 +#define _gloffset_MultiTexCoord1dARB 376 +#define _gloffset_MultiTexCoord1dvARB 377 +#define _gloffset_MultiTexCoord1fARB 378 +#define _gloffset_MultiTexCoord1fvARB 379 +#define _gloffset_MultiTexCoord1iARB 380 +#define _gloffset_MultiTexCoord1ivARB 381 +#define _gloffset_MultiTexCoord1sARB 382 +#define _gloffset_MultiTexCoord1svARB 383 +#define _gloffset_MultiTexCoord2dARB 384 +#define _gloffset_MultiTexCoord2dvARB 385 +#define _gloffset_MultiTexCoord2fARB 386 +#define _gloffset_MultiTexCoord2fvARB 387 +#define _gloffset_MultiTexCoord2iARB 388 +#define _gloffset_MultiTexCoord2ivARB 389 +#define _gloffset_MultiTexCoord2sARB 390 +#define _gloffset_MultiTexCoord2svARB 391 +#define _gloffset_MultiTexCoord3dARB 392 +#define _gloffset_MultiTexCoord3dvARB 393 +#define _gloffset_MultiTexCoord3fARB 394 +#define _gloffset_MultiTexCoord3fvARB 395 +#define _gloffset_MultiTexCoord3iARB 396 +#define _gloffset_MultiTexCoord3ivARB 397 +#define _gloffset_MultiTexCoord3sARB 398 +#define _gloffset_MultiTexCoord3svARB 399 +#define _gloffset_MultiTexCoord4dARB 400 +#define _gloffset_MultiTexCoord4dvARB 401 +#define _gloffset_MultiTexCoord4fARB 402 +#define _gloffset_MultiTexCoord4fvARB 403 +#define _gloffset_MultiTexCoord4iARB 404 +#define _gloffset_MultiTexCoord4ivARB 405 +#define _gloffset_MultiTexCoord4sARB 406 +#define _gloffset_MultiTexCoord4svARB 407 +#define _gloffset_LoadTransposeMatrixfARB 408 +#define _gloffset_LoadTransposeMatrixdARB 409 +#define _gloffset_MultTransposeMatrixfARB 410 +#define _gloffset_MultTransposeMatrixdARB 411 +#define _gloffset_SampleCoverageARB 412 +#define _gloffset_SamplePassARB 413 +#define _gloffset_PolygonOffsetEXT 414 +#define _gloffset_GetTexFilterFuncSGIS 415 +#define _gloffset_TexFilterFuncSGIS 416 +#define _gloffset_GetHistogramEXT 417 +#define _gloffset_GetHistogramParameterfvEXT 418 +#define _gloffset_GetHistogramParameterivEXT 419 +#define _gloffset_GetMinmaxEXT 420 +#define _gloffset_GetMinmaxParameterfvEXT 421 +#define _gloffset_GetMinmaxParameterivEXT 422 +#define _gloffset_GetConvolutionFilterEXT 423 +#define _gloffset_GetConvolutionParameterfvEXT 424 +#define _gloffset_GetConvolutionParameterivEXT 425 +#define _gloffset_GetSeparableFilterEXT 426 +#define _gloffset_GetColorTableSGI 427 +#define _gloffset_GetColorTableParameterfvSGI 428 +#define _gloffset_GetColorTableParameterivSGI 429 +#define _gloffset_PixelTexGenSGIX 430 +#define _gloffset_PixelTexGenParameteriSGIS 431 +#define _gloffset_PixelTexGenParameterivSGIS 432 +#define _gloffset_PixelTexGenParameterfSGIS 433 +#define _gloffset_PixelTexGenParameterfvSGIS 434 +#define _gloffset_GetPixelTexGenParameterivSGIS 435 +#define _gloffset_GetPixelTexGenParameterfvSGIS 436 +#define _gloffset_TexImage4DSGIS 437 +#define _gloffset_TexSubImage4DSGIS 438 +#define _gloffset_AreTexturesResidentEXT 439 +#define _gloffset_GenTexturesEXT 440 +#define _gloffset_IsTextureEXT 441 +#define _gloffset_DetailTexFuncSGIS 442 +#define _gloffset_GetDetailTexFuncSGIS 443 +#define _gloffset_SharpenTexFuncSGIS 444 +#define _gloffset_GetSharpenTexFuncSGIS 445 +#define _gloffset_SampleMaskSGIS 446 +#define _gloffset_SamplePatternSGIS 447 +#define _gloffset_ColorPointerEXT 448 +#define _gloffset_EdgeFlagPointerEXT 449 +#define _gloffset_IndexPointerEXT 450 +#define _gloffset_NormalPointerEXT 451 +#define _gloffset_TexCoordPointerEXT 452 +#define _gloffset_VertexPointerEXT 453 +#define _gloffset_SpriteParameterfSGIX 454 +#define _gloffset_SpriteParameterfvSGIX 455 +#define _gloffset_SpriteParameteriSGIX 456 +#define _gloffset_SpriteParameterivSGIX 457 +#define _gloffset_PointParameterfEXT 458 +#define _gloffset_PointParameterfvEXT 459 +#define _gloffset_GetInstrumentsSGIX 460 +#define _gloffset_InstrumentsBufferSGIX 461 +#define _gloffset_PollInstrumentsSGIX 462 +#define _gloffset_ReadInstrumentsSGIX 463 +#define _gloffset_StartInstrumentsSGIX 464 +#define _gloffset_StopInstrumentsSGIX 465 +#define _gloffset_FrameZoomSGIX 466 +#define _gloffset_TagSampleBufferSGIX 467 +#define _gloffset_ReferencePlaneSGIX 468 +#define _gloffset_FlushRasterSGIX 469 +#define _gloffset_GetListParameterfvSGIX 470 +#define _gloffset_GetListParameterivSGIX 471 +#define _gloffset_ListParameterfSGIX 472 +#define _gloffset_ListParameterfvSGIX 473 +#define _gloffset_ListParameteriSGIX 474 +#define _gloffset_ListParameterivSGIX 475 +#define _gloffset_FragmentColorMaterialSGIX 476 +#define _gloffset_FragmentLightfSGIX 477 +#define _gloffset_FragmentLightfvSGIX 478 +#define _gloffset_FragmentLightiSGIX 479 +#define _gloffset_FragmentLightivSGIX 480 +#define _gloffset_FragmentLightModelfSGIX 481 +#define _gloffset_FragmentLightModelfvSGIX 482 +#define _gloffset_FragmentLightModeliSGIX 483 +#define _gloffset_FragmentLightModelivSGIX 484 +#define _gloffset_FragmentMaterialfSGIX 485 +#define _gloffset_FragmentMaterialfvSGIX 486 +#define _gloffset_FragmentMaterialiSGIX 487 +#define _gloffset_FragmentMaterialivSGIX 488 +#define _gloffset_GetFragmentLightfvSGIX 489 +#define _gloffset_GetFragmentLightivSGIX 490 +#define _gloffset_GetFragmentMaterialfvSGIX 491 +#define _gloffset_GetFragmentMaterialivSGIX 492 +#define _gloffset_LightEnviSGIX 493 +#define _gloffset_VertexWeightfEXT 494 +#define _gloffset_VertexWeightfvEXT 495 +#define _gloffset_VertexWeightPointerEXT 496 +#define _gloffset_FlushVertexArrayRangeNV 497 +#define _gloffset_VertexArrayRangeNV 498 +#define _gloffset_CombinerParameterfvNV 499 +#define _gloffset_CombinerParameterfNV 500 +#define _gloffset_CombinerParameterivNV 501 +#define _gloffset_CombinerParameteriNV 502 +#define _gloffset_CombinerInputNV 503 +#define _gloffset_CombinerOutputNV 504 +#define _gloffset_FinalCombinerInputNV 505 +#define _gloffset_GetCombinerInputParameterfvNV 506 +#define _gloffset_GetCombinerInputParameterivNV 507 +#define _gloffset_GetCombinerOutputParameterfvNV 508 +#define _gloffset_GetCombinerOutputParameterivNV 509 +#define _gloffset_GetFinalCombinerInputParameterfvNV 510 +#define _gloffset_GetFinalCombinerInputParameterivNV 511 +#define _gloffset_ResizeBuffersMESA 512 +#define _gloffset_WindowPos2dMESA 513 +#define _gloffset_WindowPos2dvMESA 514 +#define _gloffset_WindowPos2fMESA 515 +#define _gloffset_WindowPos2fvMESA 516 +#define _gloffset_WindowPos2iMESA 517 +#define _gloffset_WindowPos2ivMESA 518 +#define _gloffset_WindowPos2sMESA 519 +#define _gloffset_WindowPos2svMESA 520 +#define _gloffset_WindowPos3dMESA 521 +#define _gloffset_WindowPos3dvMESA 522 +#define _gloffset_WindowPos3fMESA 523 +#define _gloffset_WindowPos3fvMESA 524 +#define _gloffset_WindowPos3iMESA 525 +#define _gloffset_WindowPos3ivMESA 526 +#define _gloffset_WindowPos3sMESA 527 +#define _gloffset_WindowPos3svMESA 528 +#define _gloffset_WindowPos4dMESA 529 +#define _gloffset_WindowPos4dvMESA 530 +#define _gloffset_WindowPos4fMESA 531 +#define _gloffset_WindowPos4fvMESA 532 +#define _gloffset_WindowPos4iMESA 533 +#define _gloffset_WindowPos4ivMESA 534 +#define _gloffset_WindowPos4sMESA 535 +#define _gloffset_WindowPos4svMESA 536 +#define _gloffset_BlendFuncSeparateEXT 537 +#define _gloffset_IndexMaterialEXT 538 +#define _gloffset_IndexFuncEXT 539 +#define _gloffset_LockArraysEXT 540 +#define _gloffset_UnlockArraysEXT 541 +#define _gloffset_CullParameterdvEXT 542 +#define _gloffset_CullParameterfvEXT 543 +#define _gloffset_HintPGI 544 +#define _gloffset_FogCoordfEXT 545 +#define _gloffset_FogCoordfvEXT 546 +#define _gloffset_FogCoorddEXT 547 +#define _gloffset_FogCoorddvEXT 548 +#define _gloffset_FogCoordPointerEXT 549 +#define _gloffset_GetColorTableEXT 550 +#define _gloffset_GetColorTableParameterivEXT 551 +#define _gloffset_GetColorTableParameterfvEXT 552 #endif - diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c index 0bcefd09748..6bdc76a6ea9 100644 --- a/src/mesa/main/blend.c +++ b/src/mesa/main/blend.c @@ -1,4 +1,4 @@ -/* $Id: blend.c,v 1.12 2000/02/21 14:50:31 brianp Exp $ */ +/* $Id: blend.c,v 1.13 2000/02/24 22:04:03 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -102,10 +102,10 @@ _mesa_BlendFunc( GLenum sfactor, GLenum dfactor ) } -/* GL_INGR_blend_func_separate */ +/* GL_EXT_blend_func_separate */ void -_mesa_BlendFuncSeparateINGR( GLenum sfactorRGB, GLenum dfactorRGB, - GLenum sfactorA, GLenum dfactorA ) +_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB, + GLenum sfactorA, GLenum dfactorA ) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glBlendFuncSeparate"); @@ -212,7 +212,7 @@ _mesa_BlendFuncSeparateINGR( GLenum sfactorRGB, GLenum dfactorRGB, /* This is really an extension function! */ void -_mesa_BlendEquationEXT( GLenum mode ) +_mesa_BlendEquation( GLenum mode ) { GET_CURRENT_CONTEXT(ctx); ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glBlendEquation"); @@ -256,7 +256,7 @@ _mesa_BlendEquationEXT( GLenum mode ) void -_mesa_BlendColorEXT( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) +_mesa_BlendColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) { GET_CURRENT_CONTEXT(ctx); ctx->Color.BlendColor[0] = CLAMP( red, 0.0F, 1.0F ); diff --git a/src/mesa/main/blend.h b/src/mesa/main/blend.h index 880fcd15dba..c3ceb700752 100644 --- a/src/mesa/main/blend.h +++ b/src/mesa/main/blend.h @@ -1,4 +1,4 @@ -/* $Id: blend.h,v 1.3 2000/02/02 22:08:26 brianp Exp $ */ +/* $Id: blend.h,v 1.4 2000/02/24 22:04:03 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -49,16 +49,16 @@ _mesa_BlendFunc( GLenum sfactor, GLenum dfactor ); extern void -_mesa_BlendFuncSeparateINGR( GLenum sfactorRGB, GLenum dfactorRGB, - GLenum sfactorA, GLenum dfactorA ); +_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB, + GLenum sfactorA, GLenum dfactorA ); extern void -_mesa_BlendEquationEXT( GLenum mode ); +_mesa_BlendEquation( GLenum mode ); extern void -_mesa_BlendColorEXT(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); +_mesa_BlendColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); #endif diff --git a/src/mesa/main/colortab.c b/src/mesa/main/colortab.c index 7597d10773f..f190beaf36b 100644 --- a/src/mesa/main/colortab.c +++ b/src/mesa/main/colortab.c @@ -1,10 +1,10 @@ -/* $Id: colortab.c,v 1.7 1999/11/19 22:51:29 brianp Exp $ */ +/* $Id: colortab.c,v 1.8 2000/02/24 22:04:03 brianp Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 * - * Copyright (C) 1999 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2000 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"), @@ -112,9 +112,9 @@ decode_internal_format( GLint format ) void -_mesa_ColorTableEXT( GLenum target, GLenum internalFormat, - GLsizei width, GLenum format, GLenum type, - const GLvoid *table ) +_mesa_ColorTable( GLenum target, GLenum internalFormat, + GLsizei width, GLenum format, GLenum type, + const GLvoid *table ) { GET_CURRENT_CONTEXT(ctx); struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; @@ -122,7 +122,7 @@ _mesa_ColorTableEXT( GLenum target, GLenum internalFormat, struct gl_color_table *palette; GLboolean proxy = GL_FALSE; - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorTableEXT"); + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorTable"); switch (target) { case GL_TEXTURE_1D: @@ -157,24 +157,24 @@ _mesa_ColorTableEXT( GLenum target, GLenum internalFormat, palette = &ctx->Texture.Palette; break; default: - gl_error(ctx, GL_INVALID_ENUM, "glColorTableEXT(target)"); + gl_error(ctx, GL_INVALID_ENUM, "glColorTable(target)"); return; } assert(palette); if (!gl_is_legal_format_and_type(format, type)) { - gl_error(ctx, GL_INVALID_ENUM, "glColorTableEXT(format or type)"); + gl_error(ctx, GL_INVALID_ENUM, "glColorTable(format or type)"); return; } if (decode_internal_format(internalFormat) < 0) { - gl_error( ctx, GL_INVALID_ENUM, "glColorTableEXT(internalFormat)" ); + gl_error( ctx, GL_INVALID_ENUM, "glColorTable(internalFormat)" ); return; } if (width < 1 || width > MAX_TEXTURE_PALETTE_SIZE || !power_of_two(width)) { - gl_error(ctx, GL_INVALID_VALUE, "glColorTableEXT(width)"); + gl_error(ctx, GL_INVALID_VALUE, "glColorTable(width)"); if (proxy) { palette->Size = 0; palette->IntFormat = (GLenum) 0; @@ -209,9 +209,9 @@ _mesa_ColorTableEXT( GLenum target, GLenum internalFormat, void -_mesa_ColorSubTableEXT( GLenum target, GLsizei start, - GLsizei count, GLenum format, GLenum type, - const GLvoid *table ) +_mesa_ColorSubTable( GLenum target, GLsizei start, + GLsizei count, GLenum format, GLenum type, + const GLvoid *table ) { GET_CURRENT_CONTEXT(ctx); struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; @@ -220,7 +220,7 @@ _mesa_ColorSubTableEXT( GLenum target, GLsizei start, GLint comps; GLubyte *dest; - ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorSubTableEXT"); + ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx, "glColorSubTable"); switch (target) { case GL_TEXTURE_1D: @@ -240,19 +240,19 @@ _mesa_ColorSubTableEXT( GLenum target, GLsizei start, palette = &ctx->Texture.Palette; break; default: - gl_error(ctx, GL_INVALID_ENUM, "glColorSubTableEXT(target)"); + gl_error(ctx, GL_INVALID_ENUM, "glColorSubTable(target)"); return; } assert(palette); if (!gl_is_legal_format_and_type(format, type)) { - gl_error(ctx, GL_INVALID_ENUM, "glColorSubTableEXT(format or type)"); + gl_error(ctx, GL_INVALID_ENUM, "glColorSubTable(format or type)"); return; } if (count < 1) { - gl_error(ctx, GL_INVALID_VALUE, "glColorSubTableEXT(count)"); + gl_error(ctx, GL_INVALID_VALUE, "glColorSubTable(count)"); return; } @@ -260,7 +260,7 @@ _mesa_ColorSubTableEXT( GLenum target, GLsizei start, assert(comps > 0); /* error should be caught sooner */ if (start + count > palette->Size) { - gl_error(ctx, GL_INVALID_VALUE, "glColorSubTableEXT(count)"); + gl_error(ctx, GL_INVALID_VALUE, "glColorSubTable(count)"); return; } dest = palette->Table + start * comps * sizeof(GLubyte); @@ -285,8 +285,8 @@ _mesa_ColorSubTableEXT( GLenum target, GLsizei start, void -_mesa_GetColorTableEXT( GLenum target, GLenum format, - GLenum type, GLvoid *table ) +_mesa_GetColorTable( GLenum target, GLenum format, + GLenum type, GLvoid *table ) { GET_CURRENT_CONTEXT(ctx); struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; @@ -294,7 +294,7 @@ _mesa_GetColorTableEXT( GLenum target, GLenum format, GLubyte rgba[MAX_TEXTURE_PALETTE_SIZE][4]; GLint i; - ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTableEXT"); + ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTable"); switch (target) { case GL_TEXTURE_1D: @@ -310,7 +310,7 @@ _mesa_GetColorTableEXT( GLenum target, GLenum format, palette = &ctx->Texture.Palette; break; default: - gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableEXT(target)"); + gl_error(ctx, GL_INVALID_ENUM, "glGetColorTable(target)"); return; } @@ -366,7 +366,7 @@ _mesa_GetColorTableEXT( GLenum target, GLenum format, } break; default: - gl_problem(ctx, "bad palette format in glGetColorTableEXT"); + gl_problem(ctx, "bad palette format in glGetColorTable"); return; } @@ -381,23 +381,23 @@ _mesa_GetColorTableEXT( GLenum target, GLenum format, void -_mesa_GetColorTableParameterfvEXT( GLenum target, GLenum pname, GLfloat *params ) +_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params ) { GLint iparams[10]; - _mesa_GetColorTableParameterivEXT( target, pname, iparams ); + _mesa_GetColorTableParameteriv( target, pname, iparams ); *params = (GLfloat) iparams[0]; } void -_mesa_GetColorTableParameterivEXT( GLenum target, GLenum pname, GLint *params ) +_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params ) { GET_CURRENT_CONTEXT(ctx); struct gl_texture_unit *texUnit = &ctx->Texture.Unit[ctx->Texture.CurrentUnit]; struct gl_color_table *palette; - ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTableParameterEXT"); + ASSERT_OUTSIDE_BEGIN_END(ctx, "glGetColorTableParameter"); switch (target) { case GL_TEXTURE_1D: @@ -413,7 +413,7 @@ _mesa_GetColorTableParameterivEXT( GLenum target, GLenum pname, GLint *params ) palette = &ctx->Texture.Palette; break; default: - gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameterEXT(target)"); + gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter(target)"); return; } @@ -443,7 +443,7 @@ _mesa_GetColorTableParameterivEXT( GLenum target, GLenum pname, GLint *params ) *params = 8; break; default: - gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameterEXT" ); + gl_error(ctx, GL_INVALID_ENUM, "glGetColorTableParameter" ); return; } } diff --git a/src/mesa/main/colortab.h b/src/mesa/main/colortab.h index 916ee34a364..748e2038a66 100644 --- a/src/mesa/main/colortab.h +++ b/src/mesa/main/colortab.h @@ -1,10 +1,10 @@ -/* $Id: colortab.h,v 1.4 1999/11/12 08:32:37 joukj Exp $ */ +/* $Id: colortab.h,v 1.5 2000/02/24 22:04:03 brianp Exp $ */ /* * Mesa 3-D graphics library * Version: 3.3 * - * Copyright (C) 1999 Brian Paul All Rights Reserved. + * Copyright (C) 1999-2000 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"), @@ -33,29 +33,24 @@ extern void -_mesa_ColorTableEXT( GLenum target, GLenum internalformat, - GLsizei width, GLenum format, GLenum type, - const GLvoid *table ); +_mesa_ColorTable( GLenum target, GLenum internalformat, + GLsizei width, GLenum format, GLenum type, + const GLvoid *table ); extern void -_mesa_ColorSubTableEXT( GLenum target, GLsizei start, - GLsizei count, GLenum format, GLenum type, - const GLvoid *table ); +_mesa_ColorSubTable( GLenum target, GLsizei start, + GLsizei count, GLenum format, GLenum type, + const GLvoid *table ); extern void -_mesa_GetColorTableEXT( GLenum target, GLenum format, - GLenum type, GLvoid *table ); -#ifdef VMS -/* VMS does not support externals longer than 32 characters. */ -#define _mesa_GetColorTableParameterfvEXT VMS_GCTParameterfvEXT -#define _mesa_GetColorTableParameterivEXT VMS_GCTParameterivEXT -#endif +_mesa_GetColorTable( GLenum target, GLenum format, + GLenum type, GLvoid *table ); extern void -_mesa_GetColorTableParameterfvEXT( GLenum target, GLenum pname, GLfloat *params ); +_mesa_GetColorTableParameterfv( GLenum target, GLenum pname, GLfloat *params ); extern void -_mesa_GetColorTableParameterivEXT( GLenum target, GLenum pname, GLint *params ); +_mesa_GetColorTableParameteriv( GLenum target, GLenum pname, GLint *params ); #endif diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index a85cd7e993c..71c4996a1b2 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -1,4 +1,4 @@ -/* $Id: dlist.c,v 1.30 2000/02/12 17:26:15 brianp Exp $ */ +/* $Id: dlist.c,v 1.31 2000/02/24 22:04:03 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -33,6 +33,7 @@ #include "attrib.h" #include "bitmap.h" #include "bbox.h" +#include "blend.h" #include "buffers.h" #include "clip.h" #include "colortab.h" @@ -692,7 +693,7 @@ static void save_BlendEquation( GLenum mode ) n[1].e = mode; } if (ctx->ExecuteFlag) { - (*ctx->Exec->BlendEquationEXT)( mode ); + (*ctx->Exec->BlendEquation)( mode ); } } @@ -713,8 +714,8 @@ static void save_BlendFunc( GLenum sfactor, GLenum dfactor ) } -static void save_BlendFuncSeparateINGR(GLenum sfactorRGB, GLenum dfactorRGB, - GLenum sfactorA, GLenum dfactorA) +static void save_BlendFuncSeparateEXT(GLenum sfactorRGB, GLenum dfactorRGB, + GLenum sfactorA, GLenum dfactorA) { GET_CURRENT_CONTEXT(ctx); Node *n; @@ -727,7 +728,7 @@ static void save_BlendFuncSeparateINGR(GLenum sfactorRGB, GLenum dfactorRGB, n[4].e = dfactorA; } if (ctx->ExecuteFlag) { - (*ctx->Exec->BlendFuncSeparateINGR)( sfactorRGB, dfactorRGB, + (*ctx->Exec->BlendFuncSeparateEXT)( sfactorRGB, dfactorRGB, sfactorA, dfactorA); } } @@ -747,7 +748,7 @@ static void save_BlendColor( GLfloat red, GLfloat green, n[4].f = alpha; } if (ctx->ExecuteFlag) { - (*ctx->Exec->BlendColorEXT)( red, green, blue, alpha ); + (*ctx->Exec->BlendColor)( red, green, blue, alpha ); } } @@ -939,17 +940,17 @@ static void save_ColorMaterial( GLenum face, GLenum mode ) } -static void save_ColorTableEXT( GLenum target, GLenum internalFormat, - GLsizei width, GLenum format, GLenum type, - const GLvoid *table ) +static void save_ColorTable( GLenum target, GLenum internalFormat, + GLsizei width, GLenum format, GLenum type, + const GLvoid *table ) { GET_CURRENT_CONTEXT(ctx); if (target == GL_PROXY_TEXTURE_1D || target == GL_PROXY_TEXTURE_2D || target == GL_PROXY_TEXTURE_3D) { /* execute immediately */ - (*ctx->Exec->ColorTableEXT)( target, internalFormat, width, - format, type, table ); + (*ctx->Exec->ColorTable)( target, internalFormat, width, + format, type, table ); } else { GLvoid *image = _mesa_unpack_image(width, 1, 1, format, type, table, @@ -969,16 +970,16 @@ static void save_ColorTableEXT( GLenum target, GLenum internalFormat, FREE(image); } if (ctx->ExecuteFlag) { - (*ctx->Exec->ColorTableEXT)( target, internalFormat, width, - format, type, table ); + (*ctx->Exec->ColorTable)( target, internalFormat, width, + format, type, table ); } } } -static void save_ColorSubTableEXT( GLenum target, GLsizei start, GLsizei count, - GLenum format, GLenum type, - const GLvoid *table) +static void save_ColorSubTable( GLenum target, GLsizei start, GLsizei count, + GLenum format, GLenum type, + const GLvoid *table) { GET_CURRENT_CONTEXT(ctx); GLvoid *image = _mesa_unpack_image(count, 1, 1, format, type, table, @@ -998,7 +999,7 @@ static void save_ColorSubTableEXT( GLenum target, GLsizei start, GLsizei count, FREE(image); } if (ctx->ExecuteFlag) { - (*ctx->Exec->ColorSubTableEXT)(target, start, count, format, type, table); + (*ctx->Exec->ColorSubTable)(target, start, count, format, type, table); } } @@ -2883,17 +2884,6 @@ static void save_TexImage3D( GLenum target, } -static void save_TexImage3DEXT( GLenum target, - GLint level, GLenum components, - GLsizei width, GLsizei height, GLsizei depth, - GLint border, GLenum format, GLenum type, - const GLvoid *pixels ) -{ - save_TexImage3D(target, level, (GLint) components, width, height, - depth, border, format, type, pixels); -} - - static void save_TexSubImage1D( GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels ) @@ -3403,16 +3393,16 @@ static void execute_list( GLcontext *ctx, GLuint list ) } break; case OPCODE_BLEND_COLOR: - (*ctx->Exec->BlendColorEXT)( n[1].f, n[2].f, n[3].f, n[4].f ); + (*ctx->Exec->BlendColor)( n[1].f, n[2].f, n[3].f, n[4].f ); break; case OPCODE_BLEND_EQUATION: - (*ctx->Exec->BlendEquationEXT)( n[1].e ); + (*ctx->Exec->BlendEquation)( n[1].e ); break; case OPCODE_BLEND_FUNC: (*ctx->Exec->BlendFunc)( n[1].e, n[2].e ); break; case OPCODE_BLEND_FUNC_SEPARATE: - (*ctx->Exec->BlendFuncSeparateINGR)(n[1].e, n[2].e, n[3].e, n[4].e); + (*ctx->Exec->BlendFuncSeparateEXT)(n[1].e, n[2].e, n[3].e, n[4].e); break; case OPCODE_CALL_LIST: /* Generated by glCallList(), don't add ListBase */ @@ -3464,8 +3454,8 @@ static void execute_list( GLcontext *ctx, GLuint list ) { struct gl_pixelstore_attrib save = ctx->Unpack; ctx->Unpack = _mesa_native_packing; - (*ctx->Exec->ColorTableEXT)( n[1].e, n[2].e, n[3].i, n[4].e, - n[5].e, n[6].data ); + (*ctx->Exec->ColorTable)( n[1].e, n[2].e, n[3].i, n[4].e, + n[5].e, n[6].data ); ctx->Unpack = save; /* restore */ } break; @@ -3473,8 +3463,8 @@ static void execute_list( GLcontext *ctx, GLuint list ) { struct gl_pixelstore_attrib save = ctx->Unpack; ctx->Unpack = _mesa_native_packing; - (*ctx->Exec->ColorSubTableEXT)( n[1].e, n[2].i, n[3].i, - n[4].e, n[5].e, n[6].data ); + (*ctx->Exec->ColorSubTable)( n[1].e, n[2].i, n[3].i, + n[4].e, n[5].e, n[6].data ); ctx->Unpack = save; /* restore */ } break; @@ -4515,9 +4505,9 @@ _mesa_init_dlist_table( struct _glapi_table *table ) table->TexSubImage3D = save_TexSubImage3D; /* GL_ARB_imaging */ - /* NOT supported, just call stub functions */ - table->BlendColor = _mesa_BlendColor; - table->BlendEquation = _mesa_BlendEquation; + /* Not all are supported */ + table->BlendColor = save_BlendColor; + table->BlendEquation = save_BlendEquation; table->ColorSubTable = _mesa_ColorSubTable; table->ColorTable = _mesa_ColorTable; table->ColorTableParameterfv = _mesa_ColorTableParameterfv; @@ -4551,17 +4541,21 @@ _mesa_init_dlist_table( struct _glapi_table *table ) table->ResetMinmax = _mesa_ResetMinmax; table->SeparableFilter2D = _mesa_SeparableFilter2D; - /* 6. GL_EXT_texture3d */ + /* GL_EXT_texture3d */ +#if 0 table->CopyTexSubImage3DEXT = save_CopyTexSubImage3D; table->TexImage3DEXT = save_TexImage3DEXT; table->TexSubImage3DEXT = save_TexSubImage3D; +#endif /* GL_EXT_paletted_texture */ - table->ColorTableEXT = save_ColorTableEXT; - table->ColorSubTableEXT = save_ColorSubTableEXT; - table->GetColorTableEXT = _mesa_GetColorTableEXT; - table->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfvEXT; - table->GetColorTableParameterivEXT = _mesa_GetColorTableParameterivEXT; +#if 0 + table->ColorTableEXT = save_ColorTable; + table->ColorSubTableEXT = save_ColorSubTable; +#endif + table->GetColorTableEXT = _mesa_GetColorTable; + table->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfv; + table->GetColorTableParameterivEXT = _mesa_GetColorTableParameteriv; /* GL_EXT_compiled_vertex_array */ table->LockArraysEXT = _mesa_LockArraysEXT; @@ -4578,10 +4572,14 @@ _mesa_init_dlist_table( struct _glapi_table *table ) table->PolygonOffsetEXT = save_PolygonOffsetEXT; /* GL_EXT_blend_minmax */ - table->BlendEquationEXT = save_BlendEquation; +#if 0 + table->BlendEquationEXT = save_BlendEquationEXT; +#endif /* GL_EXT_blend_color */ - table->BlendColorEXT = save_BlendColor; +#if 0 + table->BlendColorEXT = save_BlendColorEXT; +#endif /* GL_ARB_multitexture */ table->ActiveTextureARB = save_ActiveTextureARB; @@ -4619,8 +4617,8 @@ _mesa_init_dlist_table( struct _glapi_table *table ) table->MultiTexCoord4sARB = _mesa_MultiTexCoord4sARB; table->MultiTexCoord4svARB = _mesa_MultiTexCoord4svARB; - /* GL_INGR_blend_func_separate */ - table->BlendFuncSeparateINGR = save_BlendFuncSeparateINGR; + /* GL_EXT_blend_func_separate */ + table->BlendFuncSeparateEXT = save_BlendFuncSeparateEXT; /* GL_MESA_window_pos */ table->WindowPos2dMESA = save_WindowPos2dMESA; diff --git a/src/mesa/main/get.c b/src/mesa/main/get.c index 924f75a74c9..8a352aa7993 100644 --- a/src/mesa/main/get.c +++ b/src/mesa/main/get.c @@ -1,4 +1,4 @@ -/* $Id: get.c,v 1.13 2000/02/17 20:53:48 brianp Exp $ */ +/* $Id: get.c,v 1.14 2000/02/24 22:04:03 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -122,16 +122,16 @@ _mesa_GetBooleanv( GLenum pname, GLboolean *params ) case GL_BLEND_SRC: *params = ENUM_TO_BOOL(ctx->Color.BlendSrcRGB); break; - case GL_BLEND_SRC_RGB_INGR: + case GL_BLEND_SRC_RGB_EXT: *params = ENUM_TO_BOOL(ctx->Color.BlendSrcRGB); break; - case GL_BLEND_DST_RGB_INGR: + case GL_BLEND_DST_RGB_EXT: *params = ENUM_TO_BOOL(ctx->Color.BlendDstRGB); break; - case GL_BLEND_SRC_ALPHA_INGR: + case GL_BLEND_SRC_ALPHA_EXT: *params = ENUM_TO_BOOL(ctx->Color.BlendSrcA); break; - case GL_BLEND_DST_ALPHA_INGR: + case GL_BLEND_DST_ALPHA_EXT: *params = ENUM_TO_BOOL(ctx->Color.BlendDstA); break; case GL_BLEND_EQUATION_EXT: @@ -1084,16 +1084,16 @@ _mesa_GetDoublev( GLenum pname, GLdouble *params ) case GL_BLEND_SRC: *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcRGB); break; - case GL_BLEND_SRC_RGB_INGR: + case GL_BLEND_SRC_RGB_EXT: *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcRGB); break; - case GL_BLEND_DST_RGB_INGR: + case GL_BLEND_DST_RGB_EXT: *params = ENUM_TO_DOUBLE(ctx->Color.BlendDstRGB); break; - case GL_BLEND_SRC_ALPHA_INGR: + case GL_BLEND_SRC_ALPHA_EXT: *params = ENUM_TO_DOUBLE(ctx->Color.BlendSrcA); break; - case GL_BLEND_DST_ALPHA_INGR: + case GL_BLEND_DST_ALPHA_EXT: *params = ENUM_TO_DOUBLE(ctx->Color.BlendDstA); break; case GL_BLEND_EQUATION_EXT: @@ -2047,16 +2047,16 @@ _mesa_GetFloatv( GLenum pname, GLfloat *params ) case GL_BLEND_SRC: *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB); break; - case GL_BLEND_SRC_RGB_INGR: + case GL_BLEND_SRC_RGB_EXT: *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcRGB); break; - case GL_BLEND_DST_RGB_INGR: + case GL_BLEND_DST_RGB_EXT: *params = ENUM_TO_FLOAT(ctx->Color.BlendDstRGB); break; - case GL_BLEND_SRC_ALPHA_INGR: + case GL_BLEND_SRC_ALPHA_EXT: *params = ENUM_TO_FLOAT(ctx->Color.BlendSrcA); break; - case GL_BLEND_DST_ALPHA_INGR: + case GL_BLEND_DST_ALPHA_EXT: *params = ENUM_TO_FLOAT(ctx->Color.BlendDstA); break; case GL_BLEND_EQUATION_EXT: @@ -2987,16 +2987,16 @@ _mesa_GetIntegerv( GLenum pname, GLint *params ) case GL_BLEND_SRC: *params = (GLint) ctx->Color.BlendSrcRGB; break; - case GL_BLEND_SRC_RGB_INGR: + case GL_BLEND_SRC_RGB_EXT: *params = (GLint) ctx->Color.BlendSrcRGB; break; - case GL_BLEND_DST_RGB_INGR: + case GL_BLEND_DST_RGB_EXT: *params = (GLint) ctx->Color.BlendDstRGB; break; - case GL_BLEND_SRC_ALPHA_INGR: + case GL_BLEND_SRC_ALPHA_EXT: *params = (GLint) ctx->Color.BlendSrcA; break; - case GL_BLEND_DST_ALPHA_INGR: + case GL_BLEND_DST_ALPHA_EXT: *params = (GLint) ctx->Color.BlendDstA; break; case GL_BLEND_EQUATION_EXT: diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index e092f81b616..667953a65ca 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -1,4 +1,4 @@ -/* $Id: state.c,v 1.3 2000/02/11 21:14:29 brianp Exp $ */ +/* $Id: state.c,v 1.4 2000/02/24 22:04:03 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -88,8 +88,6 @@ - - static int generic_noop(void) { @@ -511,17 +509,21 @@ _mesa_init_exec_table(struct _glapi_table *exec) exec->ResetMinmax = _mesa_ResetMinmax; exec->SeparableFilter2D = _mesa_SeparableFilter2D; - /* 6. GL_EXT_texture3d */ + /* GL_EXT_texture3d */ +#if 0 exec->CopyTexSubImage3DEXT = _mesa_CopyTexSubImage3D; exec->TexImage3DEXT = _mesa_TexImage3DEXT; exec->TexSubImage3DEXT = _mesa_TexSubImage3D; +#endif /* GL_EXT_paletted_texture */ +#if 0 exec->ColorTableEXT = _mesa_ColorTableEXT; exec->ColorSubTableEXT = _mesa_ColorSubTableEXT; - exec->GetColorTableEXT = _mesa_GetColorTableEXT; - exec->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfvEXT; - exec->GetColorTableParameterivEXT = _mesa_GetColorTableParameterivEXT; +#endif + exec->GetColorTableEXT = _mesa_GetColorTable; + exec->GetColorTableParameterfvEXT = _mesa_GetColorTableParameterfv; + exec->GetColorTableParameterivEXT = _mesa_GetColorTableParameteriv; /* GL_EXT_compiled_vertex_array */ exec->LockArraysEXT = _mesa_LockArraysEXT; @@ -531,17 +533,21 @@ _mesa_init_exec_table(struct _glapi_table *exec) exec->PointParameterfEXT = _mesa_PointParameterfEXT; exec->PointParameterfvEXT = _mesa_PointParameterfvEXT; - /* 77. GL_PGI_misc_hints */ + /* GL_PGI_misc_hints */ exec->HintPGI = _mesa_HintPGI; /* GL_EXT_polygon_offset */ exec->PolygonOffsetEXT = _mesa_PolygonOffsetEXT; /* GL_EXT_blend_minmax */ +#if 0 exec->BlendEquationEXT = _mesa_BlendEquationEXT; +#endif /* GL_EXT_blend_color */ +#if 0 exec->BlendColorEXT = _mesa_BlendColorEXT; +#endif /* GL_ARB_multitexture */ exec->ActiveTextureARB = _mesa_ActiveTextureARB; @@ -580,7 +586,7 @@ _mesa_init_exec_table(struct _glapi_table *exec) exec->MultiTexCoord4svARB = _mesa_MultiTexCoord4svARB; /* GL_INGR_blend_func_separate */ - exec->BlendFuncSeparateINGR = _mesa_BlendFuncSeparateINGR; + exec->BlendFuncSeparateEXT = _mesa_BlendFuncSeparateEXT; /* GL_MESA_window_pos */ exec->WindowPos2dMESA = _mesa_WindowPos2dMESA; |