1 files changed, 313 insertions, 208 deletions
diff --git a/src/glx/apple/gen_funcs.tcl b/src/glx/apple/gen_funcs.tcl
index e78eb3278c..1392c155a8 100644
--- a/src/glx/apple/gen_funcs.tcl
+++ b/src/glx/apple/gen_funcs.tcl
@@ -71,218 +71,323 @@ proc is-extension-supported? name {
     return [info exists extensions($name)]
 }
 
-#This is going to need to be updated for OpenGL >= 2.1 in SnowLeopard.
+# This is going to need to be updated for future OpenGL versions:
+#    cat specs/gl.tm  | grep -v '^#' | awk -F, '{sub(/[ \t]+/, ""); print "    "$1 " \"" $4 "\""}'
+#    then change void from "*" to "void"
+#
 # TextureComponentCount is GLenum in SL for everything
 # It is GLint in mesa, but is GLenum for glTexImage3DEXT
 array set typemap {
-    void void
-    List GLuint
-    Mode GLenum
-    CheckedFloat32 GLfloat
-    CheckedInt32 GLint
-    Float32 GLfloat
-    Int32 GLint
-    Int64 GLint64EXT
-    UInt64 GLuint64EXT
-    Float64 GLdouble
-    ListMode GLuint
-    SizeI GLsizei
-    ListNameType GLenum
-    Void void
-    BeginMode GLenum
-    CoordF GLfloat
-    UInt8 GLubyte
-    Boolean GLboolean
-    ColorIndexValueD GLdouble
-    ColorB GLbyte
-    ColorD GLdouble
-    ColorF GLfloat
-    ColorI GLint
-    ColorS GLshort
-    ColorUB GLubyte
-    ColorUI GLuint
-    ColorUS GLushort
-    ColorIndexValueF GLfloat
-    ColorIndexValueI GLint
-    ColorIndexValueS GLshort
-    Int8 GLbyte
-    CoordD GLdouble
-    Int16 GLshort
-    CoordI GLint
-    CoordS GLshort
-    ClipPlaneName GLenum
-    MaterialFace GLenum
-    ColorMaterialParameter GLenum
-    CullFaceMode GLenum
-    FogParameter GLenum
-    FrontFaceDirection GLenum
-    HintTarget GLenum
-    HintMode GLenum
-    LightName GLenum
-    LightParameter GLenum
-    LightModelParameter GLenum
-    LineStipple GLushort
-    MaterialParameter GLenum
-    PolygonMode GLenum
-    WinCoord GLint
-    ShadingModel GLenum
-    TextureTarget GLenum
-    TextureParameterName GLenum
-    TextureComponentCount GLint
-    PixelFormat GLenum
-    PixelType GLenum
-    TextureEnvTarget GLenum
-    TextureEnvParameter GLenum
-    TextureCoordName GLenum
-    TextureGenParameter GLenum
-    FeedbackType GLenum
-    FeedbackElement GLfloat
-    SelectName GLuint
-    RenderingMode GLenum
-    DrawBufferMode GLenum
-    ClearBufferMask GLbitfield
-    MaskedColorIndexValueF GLfloat
-    ClampedColorF GLclampf
-    StencilValue GLint
-    ClampedFloat64 GLclampd
-    MaskedStencilValue GLuint
-    MaskedColorIndexValueI GLuint
-    AccumOp GLenum
-    EnableCap GLenum
-    AttribMask GLbitfield
-    MapTarget GLenum
-    MeshMode1 GLenum
-    MeshMode2 GLenum
-    AlphaFunction GLenum
-    ClampedFloat32 GLclampf
-    BlendingFactorSrc GLenum
-    BlendingFactorDest GLenum
-    LogicOp GLenum
-    StencilFunction GLenum
-    ClampedStencilValue GLint
-    MaskedStencilValue GLuint
-    StencilOp GLenum
-    DepthFunction GLenum
-    PixelTransferParameter GLenum
-    PixelStoreParameter GLenum
-    PixelMap GLenum
-    UInt32 GLuint
-    UInt16 GLushort
-    ReadBufferMode GLenum
-    PixelCopyType GLenum
-    GetPName GLenum
-    ErrorCode GLenum
-    GetMapQuery GLenum
+    AccumOp "GLenum"
+    AlphaFunction "GLenum"
+    AttribMask "GLbitfield"
+    BeginMode "GLenum"
+    BinormalPointerTypeEXT "GLenum"
+    BlendEquationMode "GLenum"
+    BlendEquationModeEXT "GLenum"
+    BlendFuncSeparateParameterEXT "GLenum"
+    BlendingFactorDest "GLenum"
+    BlendingFactorSrc "GLenum"
+    Boolean "GLboolean"
+    BooleanPointer "GLboolean*"
+    Char "GLchar"
+    CharPointer "GLchar*"
+    CheckedFloat32 "GLfloat"
+    CheckedInt32 "GLint"
+    ClampColorTargetARB "GLenum"
+    ClampColorModeARB "GLenum"
+    ClampedColorF "GLclampf"
+    ClampedFloat32 "GLclampf"
+    ClampedFloat64 "GLclampd"
+    ClampedStencilValue "GLint"
+    ClearBufferMask "GLbitfield"
+    ClientAttribMask "GLbitfield"
+    ClipPlaneName "GLenum"
+    ColorB "GLbyte"
+    ColorD "GLdouble"
+    ColorF "GLfloat"
+    ColorI "GLint"
+    ColorIndexValueD "GLdouble"
+    ColorIndexValueF "GLfloat"
+    ColorIndexValueI "GLint"
+    ColorIndexValueS "GLshort"
+    ColorIndexValueUB "GLubyte"
+    ColorMaterialParameter "GLenum"
+    ColorPointerType "GLenum"
+    ColorS "GLshort"
+    ColorTableParameterPName "GLenum"
+    ColorTableParameterPNameSGI "GLenum"
+    ColorTableTarget "GLenum"
+    ColorTableTargetSGI "GLenum"
+    ColorUB "GLubyte"
+    ColorUI "GLuint"
+    ColorUS "GLushort"
+    CombinerBiasNV "GLenum"
+    CombinerComponentUsageNV "GLenum"
+    CombinerMappingNV "GLenum"
+    CombinerParameterNV "GLenum"
+    CombinerPortionNV "GLenum"
+    CombinerRegisterNV "GLenum"
+    CombinerScaleNV "GLenum"
+    CombinerStageNV "GLenum"
+    CombinerVariableNV "GLenum"
+    CompressedTextureARB "GLvoid"
+    ControlPointNV "GLvoid"
+    ControlPointTypeNV "GLenum"
+    ConvolutionParameter "GLenum"
+    ConvolutionParameterEXT "GLenum"
+    ConvolutionTarget "GLenum"
+    ConvolutionTargetEXT "GLenum"
+    CoordD "GLdouble"
+    CoordF "GLfloat"
+    CoordI "GLint"
+    CoordS "GLshort"
+    CullFaceMode "GLenum"
+    CullParameterEXT "GLenum"
+    DepthFunction "GLenum"
+    DrawBufferMode "GLenum"
+    DrawBufferName "GLint"
+    DrawElementsType "GLenum"
+    ElementPointerTypeATI "GLenum"
+    EnableCap "GLenum"
+    ErrorCode "GLenum"
+    EvalMapsModeNV "GLenum"
+    EvalTargetNV "GLenum"
+    FeedbackElement "GLfloat"
+    FeedbackType "GLenum"
+    FenceNV "GLuint"
+    FenceConditionNV "GLenum"
+    FenceParameterNameNV "GLenum"
+    FfdMaskSGIX "GLbitfield"
+    FfdTargetSGIX "GLenum"
+    Float32 "GLfloat"
+    Float32Pointer "GLfloat*"
+    Float64 "GLdouble"
+    Float64Pointer "GLdouble*"
+    FogParameter "GLenum"
+    FogPointerTypeEXT "GLenum"
+    FogPointerTypeIBM "GLenum"
+    FragmentLightModelParameterSGIX "GLenum"
+    FragmentLightNameSGIX "GLenum"
+    FragmentLightParameterSGIX "GLenum"
+    FramebufferAttachment "GLenum"
+    FramebufferTarget "GLenum"
+    FrontFaceDirection "GLenum"
+    FunctionPointer "_GLfuncptr"
+    GetColorTableParameterPName "GLenum"
+    GetColorTableParameterPNameSGI "GLenum"
+    GetConvolutionParameterPName "GLenum"
+    GetHistogramParameterPName "GLenum"
+    GetHistogramParameterPNameEXT "GLenum"
+    GetMapQuery "GLenum"
+    GetMinmaxParameterPName "GLenum"
+    GetMinmaxParameterPNameEXT "GLenum"
+    GetPName "GLenum"
+    GetPointervPName "GLenum"
+    GetTextureParameter "GLenum"
+    HintMode "GLenum"
+    HintTarget "GLenum"
+    HintTargetPGI "GLenum"
+    HistogramTarget "GLenum"
+    HistogramTargetEXT "GLenum"
+    IglooFunctionSelectSGIX "GLenum"
+    IglooParameterSGIX "GLvoid"
+    ImageTransformPNameHP "GLenum"
+    ImageTransformTargetHP "GLenum"
+    IndexFunctionEXT "GLenum"
+    IndexMaterialParameterEXT "GLenum"
+    IndexPointerType "GLenum"
+    Int16 "GLshort"
+    Int32 "GLint"
+    Int8 "GLbyte"
+    InterleavedArrayFormat "GLenum"
+    LightEnvParameterSGIX "GLenum"
+    LightModelParameter "GLenum"
+    LightName "GLenum"
+    LightParameter "GLenum"
+    LightTextureModeEXT "GLenum"
+    LightTexturePNameEXT "GLenum"
+    LineStipple "GLushort"
+    List "GLuint"
+    ListMode "GLenum"
+    ListNameType "GLenum"
+    ListParameterName "GLenum"
+    LogicOp "GLenum"
+    MapAttribParameterNV "GLenum"
+    MapParameterNV "GLenum"
+    MapTarget "GLenum"
+    MapTargetNV "GLenum"
+    MapTypeNV "GLenum"
+    MaskedColorIndexValueF "GLfloat"
+    MaskedColorIndexValueI "GLuint"
+    MaskedStencilValue "GLuint"
+    MaterialFace "GLenum"
+    MaterialParameter "GLenum"
+    MatrixIndexPointerTypeARB "GLenum"
+    MatrixMode "GLenum"
+    MatrixTransformNV "GLenum"
+    MeshMode1 "GLenum"
+    MeshMode2 "GLenum"
+    MinmaxTarget "GLenum"
+    MinmaxTargetEXT "GLenum"
+    NormalPointerType "GLenum"
+    NurbsCallback "GLenum"
+    NurbsObj "GLUnurbs*"
+    NurbsProperty "GLenum"
+    NurbsTrim "GLenum"
+    OcclusionQueryParameterNameNV "GLenum"
+    PixelCopyType "GLenum"
+    PixelFormat "GLenum"
+    PixelInternalFormat "GLenum"
+    PixelMap "GLenum"
+    PixelStoreParameter "GLenum"
+    PixelTexGenModeSGIX "GLenum"
+    PixelTexGenParameterNameSGIS "GLenum"
+    PixelTransferParameter "GLenum"
+    PixelTransformPNameEXT "GLenum"
+    PixelTransformTargetEXT "GLenum"
+    PixelType "GLenum"
+    PointParameterNameARB "GLenum"
+    PolygonMode "GLenum"
+    ProgramNV "GLuint"
+    ProgramCharacterNV "GLubyte"
+    ProgramParameterNV "GLenum"
+    ProgramParameterPName "GLenum"
+    QuadricCallback "GLenum"
+    QuadricDrawStyle "GLenum"
+    QuadricNormal "GLenum"
+    QuadricObj "GLUquadric*"
+    QuadricOrientation "GLenum"
+    ReadBufferMode "GLenum"
+    RenderbufferTarget "GLenum"
+    RenderingMode "GLenum"
+    ReplacementCodeSUN "GLuint"
+    ReplacementCodeTypeSUN "GLenum"
+    SamplePassARB "GLenum"
+    SamplePatternEXT "GLenum"
+    SamplePatternSGIS "GLenum"
+    SecondaryColorPointerTypeIBM "GLenum"
+    SelectName "GLuint"
+    SeparableTarget "GLenum"
+    SeparableTargetEXT "GLenum"
+    ShadingModel "GLenum"
+    SizeI "GLsizei"
+    SpriteParameterNameSGIX "GLenum"
+    StencilFunction "GLenum"
+    StencilFaceDirection "GLenum"
+    StencilOp "GLenum"
+    StencilValue "GLint"
     String "const GLubyte *"
-    StringName GLenum
-    GetTextureParameter GLenum
-    MatrixMode GLenum
-    ColorPointerType GLenum
-    DrawElementsType GLenum
-    GetPointervPName GLenum
-    VoidPointer "void *"
-    IndexPointerType GLenum
-    InterleavedArrayFormat GLenum
-    NormalPointerType GLenum
-    TexCoordPointerType GLenum
-    VertexPointerType GLenum
-    PixelInternalFormat GLenum
-    Texture GLuint
-    ColorIndexValueUB GLubyte
-    ClientAttribMask GLbitfield
-    BlendEquationMode GLenum
-    ColorTableTarget GLenum
-    ColorTableParameterPName GLenum
-    GetColorTableParameterPName GLenum
-    ConvolutionTarget GLenum
-    ConvolutionParameter GLenum
-    GetConvolutionParameterPName GLenum
-    SeparableTarget GLenum
-    HistogramTarget GLenum
-    GetHistogramParameterPName GLenum
-    MinmaxTarget GLenum
-    GetMinmaxParameterPName GLenum
-    TextureTarget GLenum
-    TextureUnit GLenum
-    CompressedTextureARB "void"
-    BlendFuncSeparateParameterEXT GLenum
-    FogPointerTypeEXT GLenum
-    PointParameterNameARB GLenum
-    GLenum GLenum
-    BufferTargetARB GLenum
-    ConstUInt32 "const GLuint"
-    BufferSize GLsizeiptr
-    ConstVoid "const GLvoid"
-    BufferUsageARB GLenum
-    BufferOffset GLintptr
-    BufferAccessARB GLenum
-    BufferPNameARB GLenum
-    BufferPointerNameARB GLenum
-    BlendEquationModeEXT GLenum
-    DrawBufferModeATI GLenum
-    StencilFaceDirection GLenum
-    Char GLchar
-    VertexAttribPropertyARB GLenum
-    VertexAttribPointerPropertyARB GLenum
-    CharPointer "GLchar *"
-    VertexAttribPointerTypeARB GLenum
-    ClampColorTargetARB unknown3.0
-    ClampColorModeARB unknown3.0
-    VertexAttribEnum GLenum
-    VertexAttribEnumNV GLenum
-    DrawBufferName unknown3.0
-    WeightPointerTypeARB GLenum
-    ProgramTargetARB GLenum
-    ProgramFormatARB GLenum
-    ProgramStringPropertyARB GLenum
-    BufferSizeARB GLsizeiptrARB
-    BufferOffsetARB GLintptrARB
-    handleARB GLhandleARB
-    charPointerARB "GLcharARB *"
-    charARB GLcharARB
-    RenderbufferTarget GLenum
-    FramebufferTarget GLenum
-    FramebufferAttachment GLenum
-    BinormalPointerTypeEXT GLenum
-    HintTargetPGI GLenum
-    ProgramParameterPName GLenum
-    ProgramPropertyARB GLenum
-    ElementPointerTypeATI GLenum
-    FenceNV GLuint
-    FenceConditionNV GLenum
-    ObjectTypeAPPLE GLenum
-    VertexArrayPNameAPPLE GLenum
-    SeparableTargetEXT GLenum
-    ColorTableTargetSGI GLenum
-    ColorTableParameterPNameSGI GLenum
-    CombinerOutputNV GLenum
-    CombinerStageNV GLenum
-    CombinerPortionNV GLenum
-    CombinerRegisterNV GLenum
-    CombinerScaleNV GLenum
-    CombinerBiasNV GLenum
-    CombinerComponentUsageNV GLenum
-    CombinerMappingNV GLenum
-    CombinerParameterNV GLenum
-    CombinerVariableNV GLenum
-    ConvolutionParameterEXT GLenum
-    ConvolutionTargetEXT GLenum
-    CullParameterEXT GLenum
-    FenceParameterNameNV GLenum
-    FragmentLightModelParameterSGIX GLenum
-    FragmentLightNameSGIX GLenum
-    FragmentLightParameterSGIX GLenum
-    GetColorTableParameterPNameSGI GLenum
-    GetHistogramParameterPNameEXT GLenum
-    GetMinmaxParameterPNameEXT GLenum
-    HistogramTargetEXT GLenum
-    LightEnvParameterSGIX GLenum
-    MinmaxTargetEXT GLenum
-    PNTrianglesPNameATI GLenum
-    ProgramCharacterNV GLubyte
-    SamplePatternEXT GLenum
-    SamplePatternSGIS GLenum
-    TypeEnum GLenum
+    StringName "GLenum"
+    TangentPointerTypeEXT "GLenum"
+    TessCallback "GLenum"
+    TessContour "GLenum"
+    TessProperty "GLenum"
+    TesselatorObj "GLUtesselator*"
+    TexCoordPointerType "GLenum"
+    Texture "GLuint"
+    TextureComponentCount "GLint"
+    TextureCoordName "GLenum"
+    TextureEnvParameter "GLenum"
+    TextureEnvTarget "GLenum"
+    TextureFilterSGIS "GLenum"
+    TextureGenParameter "GLenum"
+    TextureNormalModeEXT "GLenum"
+    TextureParameterName "GLenum"
+    TextureTarget "GLenum"
+    TextureUnit "GLenum"
+    UInt16 "GLushort"
+    UInt32 "GLuint"
+    UInt8 "GLubyte"
+    VertexAttribEnum "GLenum"
+    VertexAttribEnumNV "GLenum"
+    VertexAttribPointerTypeNV "GLenum"
+    VertexPointerType "GLenum"
+    VertexWeightPointerTypeEXT "GLenum"
+    Void "GLvoid"
+    VoidPointer "GLvoid*"
+    ConstVoidPointer "GLvoid* const"
+    WeightPointerTypeARB "GLenum"
+    WinCoord "GLint"
+    void "void"
+    ArrayObjectPNameATI "GLenum"
+    ArrayObjectUsageATI "GLenum"
+    ConstFloat32 "GLfloat"
+    ConstInt32 "GLint"
+    ConstUInt32 "GLuint"
+    ConstVoid "GLvoid"
+    DataTypeEXT "GLenum"
+    FragmentOpATI "GLenum"
+    GetTexBumpParameterATI "GLenum"
+    GetVariantValueEXT "GLenum"
+    ParameterRangeEXT "GLenum"
+    PreserveModeATI "GLenum"
+    ProgramFormatARB "GLenum"
+    ProgramTargetARB "GLenum"
+    ProgramTarget "GLenum"
+    ProgramPropertyARB "GLenum"
+    ProgramStringPropertyARB "GLenum"
+    ScalarType "GLenum"
+    SwizzleOpATI "GLenum"
+    TexBumpParameterATI "GLenum"
+    VariantCapEXT "GLenum"
+    VertexAttribPointerPropertyARB "GLenum"
+    VertexAttribPointerTypeARB "GLenum"
+    VertexAttribPropertyARB "GLenum"
+    VertexShaderCoordOutEXT "GLenum"
+    VertexShaderOpEXT "GLenum"
+    VertexShaderParameterEXT "GLenum"
+    VertexShaderStorageTypeEXT "GLenum"
+    VertexShaderTextureUnitParameter "GLenum"
+    VertexShaderWriteMaskEXT "GLenum"
+    VertexStreamATI "GLenum"
+    PNTrianglesPNameATI "GLenum"
+    BufferOffset "GLintptr"
+    BufferSize "GLsizeiptr"
+    BufferAccessARB "GLenum"
+    BufferOffsetARB "GLintptrARB"
+    BufferPNameARB "GLenum"
+    BufferPointerNameARB "GLenum"
+    BufferSizeARB "GLsizeiptrARB"
+    BufferTargetARB "GLenum"
+    BufferUsageARB "GLenum"
+    ObjectTypeAPPLE "GLenum"
+    VertexArrayPNameAPPLE "GLenum"
+    DrawBufferModeATI "GLenum"
+    Half16NV "GLhalfNV"
+    PixelDataRangeTargetNV "GLenum"
+    TypeEnum "GLenum"
+    GLbitfield "GLbitfield"
+    GLenum "GLenum"
+    Int64 "GLint64"
+    UInt64 "GLuint64"
+    handleARB "GLhandleARB"
+    charARB "GLcharARB"
+    charPointerARB "GLcharARB*"
+    sync "GLsync"
+    Int64EXT "GLint64EXT"
+    UInt64EXT "GLuint64EXT"
+    FramebufferAttachment "GLenum"
+    FramebufferAttachmentParameterName "GLenum"
+    Framebuffer "GLuint"
+    FramebufferStatus "GLenum"
+    FramebufferTarget "GLenum"
+    GetFramebufferParameter "GLenum"
+    Intptr "GLintptr"
+    ProgramFormat "GLenum"
+    ProgramProperty "GLenum"
+    ProgramStringProperty "GLenum"
+    ProgramTarget "GLenum"
+    Renderbuffer "GLuint"
+    RenderbufferParameterName "GLenum"
+    Sizeiptr "GLsizeiptr"
+    TextureInternalFormat "GLenum"
+    VertexBufferObjectAccess "GLenum"
+    VertexBufferObjectParameter "GLenum"
+    VertexBufferObjectUsage "GLenum"
+    BufferAccessMask "GLbitfield"
+    GetMultisamplePNameNV "GLenum"
+    SampleMaskNV "GLbitfield"
 }
 
 proc psplit s {