mesa: Standardize names of OpenGL functions.

This patch adjusts the aliasing pattern in the GL API description XML,
and the functions that implement the GL API within Mesa, to
consistently follow these naming conventions:

- When several function names are aliases of each other, the primary
  name is the one with no extension suffix (or the name with the
  suffix "ARB", if no unsuffixed name is available).  (By "primary
  name", I mean the name that all the other functions point to using
  the XML "alias" attribute).

- The name of the mesa implementation of each function is the same as
  the primary name, with the prefix "_mesa_".

This patch renames the following mesa functions:
  _check_GetTexGenxvOES => _mesa_GetTexGenxvOES
  _check_TexGenxOES => _mesa_TexGenxOES
  _check_TexGenxvOES => _mesa_TexGenxvOES
  _es_AlphaFuncx => _mesa_AlphaFuncx
  _es_ClearColorx => _mesa_ClearColorx
  _es_ClearDepthx => _mesa_ClearDepthx
  _es_ClipPlanef => _mesa_ClipPlanef
  _es_ClipPlanex => _mesa_ClipPlanex
  _es_Color4x => _mesa_Color4x
  _es_DepthRangex => _mesa_DepthRangex
  _es_DrawTexxOES => _mesa_DrawTexxOES
  _es_DrawTexxvOES => _mesa_DrawTexxvOES
  _es_Fogx => _mesa_Fogx
  _es_Fogxv => _mesa_Fogxv
  _es_Frustumf => _mesa_Frustumf
  _es_Frustumx => _mesa_Frustumx
  _es_GetClipPlanef => _mesa_GetClipPlanef
  _es_GetClipPlanex => _mesa_GetClipPlanex
  _es_GetLightxv => _mesa_GetLightxv
  _es_GetMaterialxv => _mesa_GetMaterialxv
  _es_GetTexEnvxv => _mesa_GetTexEnvxv
  _es_GetTexParameterxv => _mesa_GetTexParameterxv
  _es_LightModelx => _mesa_LightModelx
  _es_LightModelxv => _mesa_LightModelxv
  _es_Lightx => _mesa_Lightx
  _es_Lightxv => _mesa_Lightxv
  _es_LineWidthx => _mesa_LineWidthx
  _es_LoadMatrixx => _mesa_LoadMatrixx
  _es_Materialx => _mesa_Materialx
  _es_Materialxv => _mesa_Materialxv
  _es_MultMatrixx => _mesa_MultMatrixx
  _es_MultiTexCoord4x => _mesa_MultiTexCoord4x
  _es_Normal3x => _mesa_Normal3x
  _es_Orthof => _mesa_Orthof
  _es_Orthox => _mesa_Orthox
  _es_PointParameterx => _mesa_PointParameterx
  _es_PointParameterxv => _mesa_PointParameterxv
  _es_PointSizex => _mesa_PointSizex
  _es_PolygonOffsetx => _mesa_PolygonOffsetx
  _es_QueryMatrixxOES => _mesa_QueryMatrixxOES
  _es_Rotatex => _mesa_Rotatex
  _es_SampleCoveragex => _mesa_SampleCoveragex
  _es_Scalex => _mesa_Scalex
  _es_TexEnvx => _mesa_TexEnvx
  _es_TexEnvxv => _mesa_TexEnvxv
  _es_TexParameterx => _mesa_TexParameterx
  _es_TexParameterxv => _mesa_TexParameterxv
  _es_Translatex => _mesa_Translatex
  _mesa_ActiveTextureARB => _mesa_ActiveTexture
  _mesa_BeginQueryARB => _mesa_BeginQuery
  _mesa_BindAttribLocationARB => _mesa_BindAttribLocation
  _mesa_BindBufferARB => _mesa_BindBuffer
  _mesa_BindFramebufferEXT => _mesa_BindFramebuffer
  _mesa_BindProgram => _mesa_BindProgramARB
  _mesa_BindRenderbufferEXT => _mesa_BindRenderbuffer
  _mesa_BlendEquationSeparateEXT => _mesa_BlendEquationSeparate
  _mesa_BlendEquationSeparatei => _mesa_BlendEquationSeparateiARB
  _mesa_BlendEquationi => _mesa_BlendEquationiARB
  _mesa_BlendFuncSeparateEXT => _mesa_BlendFuncSeparate
  _mesa_BlendFuncSeparatei => _mesa_BlendFuncSeparateiARB
  _mesa_BlendFunci => _mesa_BlendFunciARB
  _mesa_BlitFramebufferEXT => _mesa_BlitFramebuffer
  _mesa_BufferDataARB => _mesa_BufferData
  _mesa_BufferSubDataARB => _mesa_BufferSubData
  _mesa_CheckFramebufferStatusEXT => _mesa_CheckFramebufferStatus
  _mesa_ClampColorARB => _mesa_ClampColor
  _mesa_ClientActiveTextureARB => _mesa_ClientActiveTexture
  _mesa_ColorMaskIndexed => _mesa_ColorMaski
  _mesa_CompileShaderARB => _mesa_CompileShader
  _mesa_CompressedTexImage1DARB => _mesa_CompressedTexImage1D
  _mesa_CompressedTexImage2DARB => _mesa_CompressedTexImage2D
  _mesa_CompressedTexImage3DARB => _mesa_CompressedTexImage3D
  _mesa_CompressedTexSubImage1DARB => _mesa_CompressedTexSubImage1D
  _mesa_CompressedTexSubImage2DARB => _mesa_CompressedTexSubImage2D
  _mesa_CompressedTexSubImage3DARB => _mesa_CompressedTexSubImage3D
  _mesa_DeleteBuffersARB => _mesa_DeleteBuffers
  _mesa_DeleteFramebuffersEXT => _mesa_DeleteFramebuffers
  _mesa_DeletePrograms => _mesa_DeleteProgramsARB
  _mesa_DeleteQueriesARB => _mesa_DeleteQueries
  _mesa_DeleteRenderbuffersEXT => _mesa_DeleteRenderbuffers
  _mesa_DeleteVertexArraysAPPLE => _mesa_DeleteVertexArrays
  _mesa_DisableIndexed => _mesa_Disablei
  _mesa_DisableVertexAttribArrayARB => _mesa_DisableVertexAttribArray
  _mesa_DrawBuffersARB => _mesa_DrawBuffers
  _mesa_DrawTexf => _mesa_DrawTexfOES
  _mesa_DrawTexfv => _mesa_DrawTexfvOES
  _mesa_DrawTexi => _mesa_DrawTexiOES
  _mesa_DrawTexiv => _mesa_DrawTexivOES
  _mesa_DrawTexs => _mesa_DrawTexsOES
  _mesa_DrawTexsv => _mesa_DrawTexsvOES
  _mesa_EnableIndexed => _mesa_Enablei
  _mesa_EnableVertexAttribArrayARB => _mesa_EnableVertexAttribArray
  _mesa_EndQueryARB => _mesa_EndQuery
  _mesa_FogCoordPointerEXT => _mesa_FogCoordPointer
  _mesa_FramebufferRenderbufferEXT => _mesa_FramebufferRenderbuffer
  _mesa_FramebufferTexture1DEXT => _mesa_FramebufferTexture1D
  _mesa_FramebufferTexture2DEXT => _mesa_FramebufferTexture2D
  _mesa_FramebufferTexture3DEXT => _mesa_FramebufferTexture3D
  _mesa_FramebufferTextureLayerEXT => _mesa_FramebufferTextureLayer
  _mesa_GenBuffersARB => _mesa_GenBuffers
  _mesa_GenFramebuffersEXT => _mesa_GenFramebuffers
  _mesa_GenPrograms => _mesa_GenProgramsARB
  _mesa_GenQueriesARB => _mesa_GenQueries
  _mesa_GenRenderbuffersEXT => _mesa_GenRenderbuffers
  _mesa_GenerateMipmapEXT => _mesa_GenerateMipmap
  _mesa_GetActiveAttribARB => _mesa_GetActiveAttrib
  _mesa_GetActiveUniformARB => _mesa_GetActiveUniform
  _mesa_GetAttribLocationARB => _mesa_GetAttribLocation
  _mesa_GetBooleanIndexedv => _mesa_GetBooleani_v
  _mesa_GetBufferParameterivARB => _mesa_GetBufferParameteriv
  _mesa_GetBufferPointervARB => _mesa_GetBufferPointerv
  _mesa_GetBufferSubDataARB => _mesa_GetBufferSubData
  _mesa_GetCompressedTexImageARB => _mesa_GetCompressedTexImage
  _mesa_GetFramebufferAttachmentParameterivEXT => _mesa_GetFramebufferAttachmentParameteriv
  _mesa_GetIntegerIndexedv => _mesa_GetIntegeri_v
  _mesa_GetQueryObjecti64vEXT => _mesa_GetQueryObjecti64v
  _mesa_GetQueryObjectivARB => _mesa_GetQueryObjectiv
  _mesa_GetQueryObjectui64vEXT => _mesa_GetQueryObjectui64v
  _mesa_GetQueryObjectuivARB => _mesa_GetQueryObjectuiv
  _mesa_GetQueryivARB => _mesa_GetQueryiv
  _mesa_GetRenderbufferParameterivEXT => _mesa_GetRenderbufferParameteriv
  _mesa_GetShaderSourceARB => _mesa_GetShaderSource
  _mesa_GetUniformLocationARB => _mesa_GetUniformLocation
  _mesa_GetUniformfvARB => _mesa_GetUniformfv
  _mesa_GetUniformivARB => _mesa_GetUniformiv
  _mesa_GetVertexAttribPointervARB => _mesa_GetVertexAttribPointerv
  _mesa_GetVertexAttribdvARB => _mesa_GetVertexAttribdv
  _mesa_GetVertexAttribfvARB => _mesa_GetVertexAttribfv
  _mesa_GetVertexAttribivARB => _mesa_GetVertexAttribiv
  _mesa_IsBufferARB => _mesa_IsBuffer
  _mesa_IsEnabledIndexed => _mesa_IsEnabledi
  _mesa_IsFramebufferEXT => _mesa_IsFramebuffer
  _mesa_IsQueryARB => _mesa_IsQuery
  _mesa_IsRenderbufferEXT => _mesa_IsRenderbuffer
  _mesa_IsVertexArrayAPPLE => _mesa_IsVertexArray
  _mesa_LinkProgramARB => _mesa_LinkProgram
  _mesa_LoadTransposeMatrixdARB => _mesa_LoadTransposeMatrixd
  _mesa_LoadTransposeMatrixfARB => _mesa_LoadTransposeMatrixf
  _mesa_MapBufferARB => _mesa_MapBuffer
  _mesa_MultTransposeMatrixdARB => _mesa_MultTransposeMatrixd
  _mesa_MultTransposeMatrixfARB => _mesa_MultTransposeMatrixf
  _mesa_MultiDrawArraysEXT => _mesa_MultiDrawArrays
  _mesa_PointSizePointer => _mesa_PointSizePointerOES
  _mesa_ProvokingVertexEXT => _mesa_ProvokingVertex
  _mesa_RenderbufferStorageEXT => _mesa_RenderbufferStorage
  _mesa_SampleCoverageARB => _mesa_SampleCoverage
  _mesa_SecondaryColorPointerEXT => _mesa_SecondaryColorPointer
  _mesa_ShaderSourceARB => _mesa_ShaderSource
  _mesa_Uniform1fARB => _mesa_Uniform1f
  _mesa_Uniform1fvARB => _mesa_Uniform1fv
  _mesa_Uniform1iARB => _mesa_Uniform1i
  _mesa_Uniform1ivARB => _mesa_Uniform1iv
  _mesa_Uniform2fARB => _mesa_Uniform2f
  _mesa_Uniform2fvARB => _mesa_Uniform2fv
  _mesa_Uniform2iARB => _mesa_Uniform2i
  _mesa_Uniform2ivARB => _mesa_Uniform2iv
  _mesa_Uniform3fARB => _mesa_Uniform3f
  _mesa_Uniform3fvARB => _mesa_Uniform3fv
  _mesa_Uniform3iARB => _mesa_Uniform3i
  _mesa_Uniform3ivARB => _mesa_Uniform3iv
  _mesa_Uniform4fARB => _mesa_Uniform4f
  _mesa_Uniform4fvARB => _mesa_Uniform4fv
  _mesa_Uniform4iARB => _mesa_Uniform4i
  _mesa_Uniform4ivARB => _mesa_Uniform4iv
  _mesa_UniformMatrix2fvARB => _mesa_UniformMatrix2fv
  _mesa_UniformMatrix3fvARB => _mesa_UniformMatrix3fv
  _mesa_UniformMatrix4fvARB => _mesa_UniformMatrix4fv
  _mesa_UnmapBufferARB => _mesa_UnmapBuffer
  _mesa_UseProgramObjectARB => _mesa_UseProgram
  _mesa_ValidateProgramARB => _mesa_ValidateProgram
  _mesa_VertexAttribPointerARB => _mesa_VertexAttribPointer
  _mesa_WindowPos2dMESA => _mesa_WindowPos2d
  _mesa_WindowPos2dvMESA => _mesa_WindowPos2dv
  _mesa_WindowPos2fMESA => _mesa_WindowPos2f
  _mesa_WindowPos2fvMESA => _mesa_WindowPos2fv
  _mesa_WindowPos2iMESA => _mesa_WindowPos2i
  _mesa_WindowPos2ivMESA => _mesa_WindowPos2iv
  _mesa_WindowPos2sMESA => _mesa_WindowPos2s
  _mesa_WindowPos2svMESA => _mesa_WindowPos2sv
  _mesa_WindowPos3dMESA => _mesa_WindowPos3d
  _mesa_WindowPos3dvMESA => _mesa_WindowPos3dv
  _mesa_WindowPos3fMESA => _mesa_WindowPos3f
  _mesa_WindowPos3fvMESA => _mesa_WindowPos3fv
  _mesa_WindowPos3iMESA => _mesa_WindowPos3i
  _mesa_WindowPos3ivMESA => _mesa_WindowPos3iv
  _mesa_WindowPos3sMESA => _mesa_WindowPos3s
  _mesa_WindowPos3svMESA => _mesa_WindowPos3sv
  loopback_Color3b_f => _mesa_Color3b
  loopback_Color3bv_f => _mesa_Color3bv
  loopback_Color3d_f => _mesa_Color3d
  loopback_Color3dv_f => _mesa_Color3dv
  loopback_Color3i_f => _mesa_Color3i
  loopback_Color3iv_f => _mesa_Color3iv
  loopback_Color3s_f => _mesa_Color3s
  loopback_Color3sv_f => _mesa_Color3sv
  loopback_Color3ub_f => _mesa_Color3ub
  loopback_Color3ubv_f => _mesa_Color3ubv
  loopback_Color3ui_f => _mesa_Color3ui
  loopback_Color3uiv_f => _mesa_Color3uiv
  loopback_Color3us_f => _mesa_Color3us
  loopback_Color3usv_f => _mesa_Color3usv
  loopback_Color4b_f => _mesa_Color4b
  loopback_Color4bv_f => _mesa_Color4bv
  loopback_Color4d_f => _mesa_Color4d
  loopback_Color4dv_f => _mesa_Color4dv
  loopback_Color4i_f => _mesa_Color4i
  loopback_Color4iv_f => _mesa_Color4iv
  loopback_Color4s_f => _mesa_Color4s
  loopback_Color4sv_f => _mesa_Color4sv
  loopback_Color4ub_f => _mesa_Color4ub
  loopback_Color4ubv_f => _mesa_Color4ubv
  loopback_Color4ui_f => _mesa_Color4ui
  loopback_Color4uiv_f => _mesa_Color4uiv
  loopback_Color4us_f => _mesa_Color4us
  loopback_Color4usv_f => _mesa_Color4usv
  loopback_EdgeFlagv => _mesa_EdgeFlagv
  loopback_EvalCoord1d => _mesa_EvalCoord1d
  loopback_EvalCoord1dv => _mesa_EvalCoord1dv
  loopback_EvalCoord1fv => _mesa_EvalCoord1fv
  loopback_EvalCoord2d => _mesa_EvalCoord2d
  loopback_EvalCoord2dv => _mesa_EvalCoord2dv
  loopback_EvalCoord2fv => _mesa_EvalCoord2fv
  loopback_FogCoorddEXT => _mesa_FogCoordd
  loopback_FogCoorddvEXT => _mesa_FogCoorddv
  loopback_Indexd => _mesa_Indexd
  loopback_Indexdv => _mesa_Indexdv
  loopback_Indexi => _mesa_Indexi
  loopback_Indexiv => _mesa_Indexiv
  loopback_Indexs => _mesa_Indexs
  loopback_Indexsv => _mesa_Indexsv
  loopback_Indexub => _mesa_Indexub
  loopback_Indexubv => _mesa_Indexubv
  loopback_Materialf => _mesa_Materialf
  loopback_Materiali => _mesa_Materiali
  loopback_Materialiv => _mesa_Materialiv
  loopback_MultiTexCoord1dARB => _mesa_MultiTexCoord1d
  loopback_MultiTexCoord1dvARB => _mesa_MultiTexCoord1dv
  loopback_MultiTexCoord1iARB => _mesa_MultiTexCoord1i
  loopback_MultiTexCoord1ivARB => _mesa_MultiTexCoord1iv
  loopback_MultiTexCoord1sARB => _mesa_MultiTexCoord1s
  loopback_MultiTexCoord1svARB => _mesa_MultiTexCoord1sv
  loopback_MultiTexCoord2dARB => _mesa_MultiTexCoord2d
  loopback_MultiTexCoord2dvARB => _mesa_MultiTexCoord2dv
  loopback_MultiTexCoord2iARB => _mesa_MultiTexCoord2i
  loopback_MultiTexCoord2ivARB => _mesa_MultiTexCoord2iv
  loopback_MultiTexCoord2sARB => _mesa_MultiTexCoord2s
  loopback_MultiTexCoord2svARB => _mesa_MultiTexCoord2sv
  loopback_MultiTexCoord3dARB => _mesa_MultiTexCoord3d
  loopback_MultiTexCoord3dvARB => _mesa_MultiTexCoord3dv
  loopback_MultiTexCoord3iARB => _mesa_MultiTexCoord3i
  loopback_MultiTexCoord3ivARB => _mesa_MultiTexCoord3iv
  loopback_MultiTexCoord3sARB => _mesa_MultiTexCoord3s
  loopback_MultiTexCoord3svARB => _mesa_MultiTexCoord3sv
  loopback_MultiTexCoord4dARB => _mesa_MultiTexCoord4d
  loopback_MultiTexCoord4dvARB => _mesa_MultiTexCoord4dv
  loopback_MultiTexCoord4iARB => _mesa_MultiTexCoord4i
  loopback_MultiTexCoord4ivARB => _mesa_MultiTexCoord4iv
  loopback_MultiTexCoord4sARB => _mesa_MultiTexCoord4s
  loopback_MultiTexCoord4svARB => _mesa_MultiTexCoord4sv
  loopback_Normal3b => _mesa_Normal3b
  loopback_Normal3bv => _mesa_Normal3bv
  loopback_Normal3d => _mesa_Normal3d
  loopback_Normal3dv => _mesa_Normal3dv
  loopback_Normal3i => _mesa_Normal3i
  loopback_Normal3iv => _mesa_Normal3iv
  loopback_Normal3s => _mesa_Normal3s
  loopback_Normal3sv => _mesa_Normal3sv
  loopback_Rectd => _mesa_Rectd
  loopback_Rectdv => _mesa_Rectdv
  loopback_Rectfv => _mesa_Rectfv
  loopback_Recti => _mesa_Recti
  loopback_Rectiv => _mesa_Rectiv
  loopback_Rects => _mesa_Rects
  loopback_Rectsv => _mesa_Rectsv
  loopback_SecondaryColor3bEXT_f => _mesa_SecondaryColor3b
  loopback_SecondaryColor3bvEXT_f => _mesa_SecondaryColor3bv
  loopback_SecondaryColor3dEXT_f => _mesa_SecondaryColor3d
  loopback_SecondaryColor3dvEXT_f => _mesa_SecondaryColor3dv
  loopback_SecondaryColor3iEXT_f => _mesa_SecondaryColor3i
  loopback_SecondaryColor3ivEXT_f => _mesa_SecondaryColor3iv
  loopback_SecondaryColor3sEXT_f => _mesa_SecondaryColor3s
  loopback_SecondaryColor3svEXT_f => _mesa_SecondaryColor3sv
  loopback_SecondaryColor3ubEXT_f => _mesa_SecondaryColor3ub
  loopback_SecondaryColor3ubvEXT_f => _mesa_SecondaryColor3ubv
  loopback_SecondaryColor3uiEXT_f => _mesa_SecondaryColor3ui
  loopback_SecondaryColor3uivEXT_f => _mesa_SecondaryColor3uiv
  loopback_SecondaryColor3usEXT_f => _mesa_SecondaryColor3us
  loopback_SecondaryColor3usvEXT_f => _mesa_SecondaryColor3usv
  loopback_TexCoord1d => _mesa_TexCoord1d
  loopback_TexCoord1dv => _mesa_TexCoord1dv
  loopback_TexCoord1i => _mesa_TexCoord1i
  loopback_TexCoord1iv => _mesa_TexCoord1iv
  loopback_TexCoord1s => _mesa_TexCoord1s
  loopback_TexCoord1sv => _mesa_TexCoord1sv
  loopback_TexCoord2d => _mesa_TexCoord2d
  loopback_TexCoord2dv => _mesa_TexCoord2dv
  loopback_TexCoord2i => _mesa_TexCoord2i
  loopback_TexCoord2iv => _mesa_TexCoord2iv
  loopback_TexCoord2s => _mesa_TexCoord2s
  loopback_TexCoord2sv => _mesa_TexCoord2sv
  loopback_TexCoord3d => _mesa_TexCoord3d
  loopback_TexCoord3dv => _mesa_TexCoord3dv
  loopback_TexCoord3i => _mesa_TexCoord3i
  loopback_TexCoord3iv => _mesa_TexCoord3iv
  loopback_TexCoord3s => _mesa_TexCoord3s
  loopback_TexCoord3sv => _mesa_TexCoord3sv
  loopback_TexCoord4d => _mesa_TexCoord4d
  loopback_TexCoord4dv => _mesa_TexCoord4dv
  loopback_TexCoord4i => _mesa_TexCoord4i
  loopback_TexCoord4iv => _mesa_TexCoord4iv
  loopback_TexCoord4s => _mesa_TexCoord4s
  loopback_TexCoord4sv => _mesa_TexCoord4sv
  loopback_Vertex2d => _mesa_Vertex2d
  loopback_Vertex2dv => _mesa_Vertex2dv
  loopback_Vertex2i => _mesa_Vertex2i
  loopback_Vertex2iv => _mesa_Vertex2iv
  loopback_Vertex2s => _mesa_Vertex2s
  loopback_Vertex2sv => _mesa_Vertex2sv
  loopback_Vertex3d => _mesa_Vertex3d
  loopback_Vertex3dv => _mesa_Vertex3dv
  loopback_Vertex3i => _mesa_Vertex3i
  loopback_Vertex3iv => _mesa_Vertex3iv
  loopback_Vertex3s => _mesa_Vertex3s
  loopback_Vertex3sv => _mesa_Vertex3sv
  loopback_Vertex4d => _mesa_Vertex4d
  loopback_Vertex4dv => _mesa_Vertex4dv
  loopback_Vertex4i => _mesa_Vertex4i
  loopback_Vertex4iv => _mesa_Vertex4iv
  loopback_Vertex4s => _mesa_Vertex4s
  loopback_Vertex4sv => _mesa_Vertex4sv
  loopback_VertexAttrib1dARB => _mesa_VertexAttrib1d
  loopback_VertexAttrib1dNV => _mesa_VertexAttrib1dNV
  loopback_VertexAttrib1dvARB => _mesa_VertexAttrib1dv
  loopback_VertexAttrib1dvNV => _mesa_VertexAttrib1dvNV
  loopback_VertexAttrib1sARB => _mesa_VertexAttrib1s
  loopback_VertexAttrib1sNV => _mesa_VertexAttrib1sNV
  loopback_VertexAttrib1svARB => _mesa_VertexAttrib1sv
  loopback_VertexAttrib1svNV => _mesa_VertexAttrib1svNV
  loopback_VertexAttrib2dARB => _mesa_VertexAttrib2d
  loopback_VertexAttrib2dNV => _mesa_VertexAttrib2dNV
  loopback_VertexAttrib2dvARB => _mesa_VertexAttrib2dv
  loopback_VertexAttrib2dvNV => _mesa_VertexAttrib2dvNV
  loopback_VertexAttrib2sARB => _mesa_VertexAttrib2s
  loopback_VertexAttrib2sNV => _mesa_VertexAttrib2sNV
  loopback_VertexAttrib2svARB => _mesa_VertexAttrib2sv
  loopback_VertexAttrib2svNV => _mesa_VertexAttrib2svNV
  loopback_VertexAttrib3dARB => _mesa_VertexAttrib3d
  loopback_VertexAttrib3dNV => _mesa_VertexAttrib3dNV
  loopback_VertexAttrib3dvARB => _mesa_VertexAttrib3dv
  loopback_VertexAttrib3dvNV => _mesa_VertexAttrib3dvNV
  loopback_VertexAttrib3sARB => _mesa_VertexAttrib3s
  loopback_VertexAttrib3sNV => _mesa_VertexAttrib3sNV
  loopback_VertexAttrib3svARB => _mesa_VertexAttrib3sv
  loopback_VertexAttrib3svNV => _mesa_VertexAttrib3svNV
  loopback_VertexAttrib4NbvARB => _mesa_VertexAttrib4Nbv
  loopback_VertexAttrib4NivARB => _mesa_VertexAttrib4Niv
  loopback_VertexAttrib4NsvARB => _mesa_VertexAttrib4Nsv
  loopback_VertexAttrib4NubARB => _mesa_VertexAttrib4Nub
  loopback_VertexAttrib4NubvARB => _mesa_VertexAttrib4Nubv
  loopback_VertexAttrib4NuivARB => _mesa_VertexAttrib4Nuiv
  loopback_VertexAttrib4NusvARB => _mesa_VertexAttrib4Nusv
  loopback_VertexAttrib4bvARB => _mesa_VertexAttrib4bv
  loopback_VertexAttrib4dARB => _mesa_VertexAttrib4d
  loopback_VertexAttrib4dNV => _mesa_VertexAttrib4dNV
  loopback_VertexAttrib4dvARB => _mesa_VertexAttrib4dv
  loopback_VertexAttrib4dvNV => _mesa_VertexAttrib4dvNV
  loopback_VertexAttrib4ivARB => _mesa_VertexAttrib4iv
  loopback_VertexAttrib4sARB => _mesa_VertexAttrib4s
  loopback_VertexAttrib4sNV => _mesa_VertexAttrib4sNV
  loopback_VertexAttrib4svARB => _mesa_VertexAttrib4sv
  loopback_VertexAttrib4svNV => _mesa_VertexAttrib4svNV
  loopback_VertexAttrib4ubNV => _mesa_VertexAttrib4ubNV
  loopback_VertexAttrib4ubvARB => _mesa_VertexAttrib4ubv
  loopback_VertexAttrib4ubvNV => _mesa_VertexAttrib4ubvNV
  loopback_VertexAttrib4uivARB => _mesa_VertexAttrib4uiv
  loopback_VertexAttrib4usvARB => _mesa_VertexAttrib4usv
  loopback_VertexAttribI1iv => _mesa_VertexAttribI1iv
  loopback_VertexAttribI1uiv => _mesa_VertexAttribI1uiv
  loopback_VertexAttribI4bv => _mesa_VertexAttribI4bv
  loopback_VertexAttribI4sv => _mesa_VertexAttribI4sv
  loopback_VertexAttribI4ubv => _mesa_VertexAttribI4ubv
  loopback_VertexAttribI4usv => _mesa_VertexAttribI4usv
  loopback_VertexAttribs1dvNV => _mesa_VertexAttribs1dvNV
  loopback_VertexAttribs1fvNV => _mesa_VertexAttribs1fvNV
  loopback_VertexAttribs1svNV => _mesa_VertexAttribs1svNV
  loopback_VertexAttribs2dvNV => _mesa_VertexAttribs2dvNV
  loopback_VertexAttribs2fvNV => _mesa_VertexAttribs2fvNV
  loopback_VertexAttribs2svNV => _mesa_VertexAttribs2svNV
  loopback_VertexAttribs3dvNV => _mesa_VertexAttribs3dvNV
  loopback_VertexAttribs3fvNV => _mesa_VertexAttribs3fvNV
  loopback_VertexAttribs3svNV => _mesa_VertexAttribs3svNV
  loopback_VertexAttribs4dvNV => _mesa_VertexAttribs4dvNV
  loopback_VertexAttribs4fvNV => _mesa_VertexAttribs4fvNV
  loopback_VertexAttribs4svNV => _mesa_VertexAttribs4svNV
  loopback_VertexAttribs4ubvNV => _mesa_VertexAttribs4ubvNV

And changes the primary name assignment in the XML as follows:
  ActiveTextureARB => ActiveTexture
  AlphaFuncxOES => AlphaFuncx
  BeginConditionalRenderNV => BeginConditionalRender
  BeginQueryARB => BeginQuery
  BeginTransformFeedbackEXT => BeginTransformFeedback
  BindAttribLocationARB => BindAttribLocation
  BindBufferARB => BindBuffer
  BindBufferBaseEXT => BindBufferBase
  BindBufferRangeEXT => BindBufferRange
  BindFragDataLocationEXT => BindFragDataLocation
  BindFramebufferEXT => BindFramebuffer
  BindProgramNV => BindProgramARB
  BindRenderbufferEXT => BindRenderbuffer
  BlendEquationSeparateEXT => BlendEquationSeparate
  BlendFuncSeparateEXT => BlendFuncSeparate
  BlitFramebufferEXT => BlitFramebuffer
  BufferDataARB => BufferData
  BufferSubDataARB => BufferSubData
  CheckFramebufferStatusEXT => CheckFramebufferStatus
  ClampColorARB => ClampColor
  ClearColorxOES => ClearColorx
  ClearDepthxOES => ClearDepthx
  ClientActiveTextureARB => ClientActiveTexture
  ClipPlanefOES => ClipPlanef
  ClipPlanexOES => ClipPlanex
  Color4xOES => Color4x
  ColorMaskIndexedEXT => ColorMaski
  CompileShaderARB => CompileShader
  CompressedTexImage1DARB => CompressedTexImage1D
  CompressedTexImage2DARB => CompressedTexImage2D
  CompressedTexImage3DARB => CompressedTexImage3D
  CompressedTexSubImage1DARB => CompressedTexSubImage1D
  CompressedTexSubImage2DARB => CompressedTexSubImage2D
  CompressedTexSubImage3DARB => CompressedTexSubImage3D
  DeleteBuffersARB => DeleteBuffers
  DeleteFramebuffersEXT => DeleteFramebuffers
  DeleteProgramsNV => DeleteProgramsARB
  DeleteQueriesARB => DeleteQueries
  DeleteRenderbuffersEXT => DeleteRenderbuffers
  DeleteVertexArraysAPPLE => DeleteVertexArrays
  DepthRangexOES => DepthRangex
  DisableIndexedEXT => Disablei
  DisableVertexAttribArrayARB => DisableVertexAttribArray
  DrawBuffersARB => DrawBuffers
  EnableIndexedEXT => Enablei
  EnableVertexAttribArrayARB => EnableVertexAttribArray
  EndConditionalRenderNV => EndConditionalRender
  EndQueryARB => EndQuery
  EndTransformFeedbackEXT => EndTransformFeedback
  FogCoordPointerEXT => FogCoordPointer
  FogCoorddEXT => FogCoordd
  FogCoorddvEXT => FogCoorddv
  FogxOES => Fogx
  FogxvOES => Fogxv
  FramebufferRenderbufferEXT => FramebufferRenderbuffer
  FramebufferTexture1DEXT => FramebufferTexture1D
  FramebufferTexture2DEXT => FramebufferTexture2D
  FramebufferTexture3DEXT => FramebufferTexture3D
  FramebufferTextureLayerEXT => FramebufferTextureLayer
  FrustumfOES => Frustumf
  FrustumxOES => Frustumx
  GenBuffersARB => GenBuffers
  GenFramebuffersEXT => GenFramebuffers
  GenProgramsNV => GenProgramsARB
  GenQueriesARB => GenQueries
  GenRenderbuffersEXT => GenRenderbuffers
  GenerateMipmapEXT => GenerateMipmap
  GetActiveAttribARB => GetActiveAttrib
  GetActiveUniformARB => GetActiveUniform
  GetAttribLocationARB => GetAttribLocation
  GetBooleanIndexedvEXT => GetBooleani_v
  GetBufferParameterivARB => GetBufferParameteriv
  GetBufferPointervARB => GetBufferPointerv
  GetBufferSubDataARB => GetBufferSubData
  GetClipPlanefOES => GetClipPlanef
  GetClipPlanexOES => GetClipPlanex
  GetCompressedTexImageARB => GetCompressedTexImage
  GetFixedvOES => GetFixedv
  GetFragDataLocationEXT => GetFragDataLocation
  GetFramebufferAttachmentParameterivEXT => GetFramebufferAttachmentParameteriv
  GetIntegerIndexedvEXT => GetIntegeri_v
  GetLightxvOES => GetLightxv
  GetMaterialxvOES => GetMaterialxv
  GetQueryObjecti64vEXT => GetQueryObjecti64v
  GetQueryObjectivARB => GetQueryObjectiv
  GetQueryObjectui64vEXT => GetQueryObjectui64v
  GetQueryObjectuivARB => GetQueryObjectuiv
  GetQueryivARB => GetQueryiv
  GetRenderbufferParameterivEXT => GetRenderbufferParameteriv
  GetShaderSourceARB => GetShaderSource
  GetTexEnvxvOES => GetTexEnvxv
  GetTexParameterIivEXT => GetTexParameterIiv
  GetTexParameterIuivEXT => GetTexParameterIuiv
  GetTexParameterxvOES => GetTexParameterxv
  GetTransformFeedbackVaryingEXT => GetTransformFeedbackVarying
  GetUniformLocationARB => GetUniformLocation
  GetUniformfvARB => GetUniformfv
  GetUniformivARB => GetUniformiv
  GetUniformuivEXT => GetUniformuiv
  GetVertexAttribIivEXT => GetVertexAttribIiv
  GetVertexAttribIuivEXT => GetVertexAttribIuiv
  GetVertexAttribPointervNV => GetVertexAttribPointerv
  GetVertexAttribdvARB => GetVertexAttribdv
  GetVertexAttribfvARB => GetVertexAttribfv
  GetVertexAttribivARB => GetVertexAttribiv
  IsBufferARB => IsBuffer
  IsEnabledIndexedEXT => IsEnabledi
  IsFramebufferEXT => IsFramebuffer
  IsProgramNV => IsProgramARB
  IsQueryARB => IsQuery
  IsRenderbufferEXT => IsRenderbuffer
  IsVertexArrayAPPLE => IsVertexArray
  LightModelxOES => LightModelx
  LightModelxvOES => LightModelxv
  LightxOES => Lightx
  LightxvOES => Lightxv
  LineWidthxOES => LineWidthx
  LinkProgramARB => LinkProgram
  LoadMatrixxOES => LoadMatrixx
  LoadTransposeMatrixdARB => LoadTransposeMatrixd
  LoadTransposeMatrixfARB => LoadTransposeMatrixf
  MapBufferARB => MapBuffer
  MaterialxOES => Materialx
  MaterialxvOES => Materialxv
  MultMatrixxOES => MultMatrixx
  MultTransposeMatrixdARB => MultTransposeMatrixd
  MultTransposeMatrixfARB => MultTransposeMatrixf
  MultiDrawArraysEXT => MultiDrawArrays
  MultiTexCoord1dARB => MultiTexCoord1d
  MultiTexCoord1dvARB => MultiTexCoord1dv
  MultiTexCoord1iARB => MultiTexCoord1i
  MultiTexCoord1ivARB => MultiTexCoord1iv
  MultiTexCoord1sARB => MultiTexCoord1s
  MultiTexCoord1svARB => MultiTexCoord1sv
  MultiTexCoord2dARB => MultiTexCoord2d
  MultiTexCoord2dvARB => MultiTexCoord2dv
  MultiTexCoord2iARB => MultiTexCoord2i
  MultiTexCoord2ivARB => MultiTexCoord2iv
  MultiTexCoord2sARB => MultiTexCoord2s
  MultiTexCoord2svARB => MultiTexCoord2sv
  MultiTexCoord3dARB => MultiTexCoord3d
  MultiTexCoord3dvARB => MultiTexCoord3dv
  MultiTexCoord3iARB => MultiTexCoord3i
  MultiTexCoord3ivARB => MultiTexCoord3iv
  MultiTexCoord3sARB => MultiTexCoord3s
  MultiTexCoord3svARB => MultiTexCoord3sv
  MultiTexCoord4dARB => MultiTexCoord4d
  MultiTexCoord4dvARB => MultiTexCoord4dv
  MultiTexCoord4iARB => MultiTexCoord4i
  MultiTexCoord4ivARB => MultiTexCoord4iv
  MultiTexCoord4sARB => MultiTexCoord4s
  MultiTexCoord4svARB => MultiTexCoord4sv
  MultiTexCoord4xOES => MultiTexCoord4x
  Normal3xOES => Normal3x
  OrthofOES => Orthof
  OrthoxOES => Orthox
  PointParameterfEXT => PointParameterf
  PointParameterfvEXT => PointParameterfv
  PointParameteriNV => PointParameteri
  PointParameterivNV => PointParameteriv
  PointParameterxOES => PointParameterx
  PointParameterxvOES => PointParameterxv
  PointSizexOES => PointSizex
  PolygonOffsetxOES => PolygonOffsetx
  PrimitiveRestartIndexNV => PrimitiveRestartIndex
  ProvokingVertexEXT => ProvokingVertex
  RenderbufferStorageEXT => RenderbufferStorage
  RotatexOES => Rotatex
  SampleCoverageARB => SampleCoverage
  SampleCoveragexOES => SampleCoveragex
  ScalexOES => Scalex
  SecondaryColor3bEXT => SecondaryColor3b
  SecondaryColor3bvEXT => SecondaryColor3bv
  SecondaryColor3dEXT => SecondaryColor3d
  SecondaryColor3dvEXT => SecondaryColor3dv
  SecondaryColor3iEXT => SecondaryColor3i
  SecondaryColor3ivEXT => SecondaryColor3iv
  SecondaryColor3sEXT => SecondaryColor3s
  SecondaryColor3svEXT => SecondaryColor3sv
  SecondaryColor3ubEXT => SecondaryColor3ub
  SecondaryColor3ubvEXT => SecondaryColor3ubv
  SecondaryColor3uiEXT => SecondaryColor3ui
  SecondaryColor3uivEXT => SecondaryColor3uiv
  SecondaryColor3usEXT => SecondaryColor3us
  SecondaryColor3usvEXT => SecondaryColor3usv
  SecondaryColorPointerEXT => SecondaryColorPointer
  ShaderSourceARB => ShaderSource
  TexBufferARB => TexBuffer
  TexEnvxOES => TexEnvx
  TexEnvxvOES => TexEnvxv
  TexParameterIivEXT => TexParameterIiv
  TexParameterIuivEXT => TexParameterIuiv
  TexParameterxOES => TexParameterx
  TexParameterxvOES => TexParameterxv
  TransformFeedbackVaryingsEXT => TransformFeedbackVaryings
  TranslatexOES => Translatex
  Uniform1fARB => Uniform1f
  Uniform1fvARB => Uniform1fv
  Uniform1iARB => Uniform1i
  Uniform1ivARB => Uniform1iv
  Uniform1uiEXT => Uniform1ui
  Uniform1uivEXT => Uniform1uiv
  Uniform2fARB => Uniform2f
  Uniform2fvARB => Uniform2fv
  Uniform2iARB => Uniform2i
  Uniform2ivARB => Uniform2iv
  Uniform2uiEXT => Uniform2ui
  Uniform2uivEXT => Uniform2uiv
  Uniform3fARB => Uniform3f
  Uniform3fvARB => Uniform3fv
  Uniform3iARB => Uniform3i
  Uniform3ivARB => Uniform3iv
  Uniform3uiEXT => Uniform3ui
  Uniform3uivEXT => Uniform3uiv
  Uniform4fARB => Uniform4f
  Uniform4fvARB => Uniform4fv
  Uniform4iARB => Uniform4i
  Uniform4ivARB => Uniform4iv
  Uniform4uiEXT => Uniform4ui
  Uniform4uivEXT => Uniform4uiv
  UniformMatrix2fvARB => UniformMatrix2fv
  UniformMatrix3fvARB => UniformMatrix3fv
  UniformMatrix4fvARB => UniformMatrix4fv
  UnmapBufferARB => UnmapBuffer
  UseProgramObjectARB => UseProgram
  ValidateProgramARB => ValidateProgram
  VertexAttrib1dARB => VertexAttrib1d
  VertexAttrib1dvARB => VertexAttrib1dv
  VertexAttrib1sARB => VertexAttrib1s
  VertexAttrib1svARB => VertexAttrib1sv
  VertexAttrib2dARB => VertexAttrib2d
  VertexAttrib2dvARB => VertexAttrib2dv
  VertexAttrib2sARB => VertexAttrib2s
  VertexAttrib2svARB => VertexAttrib2sv
  VertexAttrib3dARB => VertexAttrib3d
  VertexAttrib3dvARB => VertexAttrib3dv
  VertexAttrib3sARB => VertexAttrib3s
  VertexAttrib3svARB => VertexAttrib3sv
  VertexAttrib4NbvARB => VertexAttrib4Nbv
  VertexAttrib4NivARB => VertexAttrib4Niv
  VertexAttrib4NsvARB => VertexAttrib4Nsv
  VertexAttrib4NubARB => VertexAttrib4Nub
  VertexAttrib4NubvARB => VertexAttrib4Nubv
  VertexAttrib4NuivARB => VertexAttrib4Nuiv
  VertexAttrib4NusvARB => VertexAttrib4Nusv
  VertexAttrib4bvARB => VertexAttrib4bv
  VertexAttrib4dARB => VertexAttrib4d
  VertexAttrib4dvARB => VertexAttrib4dv
  VertexAttrib4ivARB => VertexAttrib4iv
  VertexAttrib4sARB => VertexAttrib4s
  VertexAttrib4svARB => VertexAttrib4sv
  VertexAttrib4ubvARB => VertexAttrib4ubv
  VertexAttrib4uivARB => VertexAttrib4uiv
  VertexAttrib4usvARB => VertexAttrib4usv
  VertexAttribDivisorARB => VertexAttribDivisor
  VertexAttribI1ivEXT => VertexAttribI1iv
  VertexAttribI1uivEXT => VertexAttribI1uiv
  VertexAttribI4bvEXT => VertexAttribI4bv
  VertexAttribI4svEXT => VertexAttribI4sv
  VertexAttribI4ubvEXT => VertexAttribI4ubv
  VertexAttribI4usvEXT => VertexAttribI4usv
  VertexAttribIPointerEXT => VertexAttribIPointer
  VertexAttribPointerARB => VertexAttribPointer
  WindowPos2dMESA => WindowPos2d
  WindowPos2dvMESA => WindowPos2dv
  WindowPos2fMESA => WindowPos2f
  WindowPos2fvMESA => WindowPos2fv
  WindowPos2iMESA => WindowPos2i
  WindowPos2ivMESA => WindowPos2iv
  WindowPos2sMESA => WindowPos2s
  WindowPos2svMESA => WindowPos2sv
  WindowPos3dMESA => WindowPos3d
  WindowPos3dvMESA => WindowPos3dv
  WindowPos3fMESA => WindowPos3f
  WindowPos3fvMESA => WindowPos3fv
  WindowPos3iMESA => WindowPos3i
  WindowPos3ivMESA => WindowPos3iv
  WindowPos3sMESA => WindowPos3s
  WindowPos3svMESA => WindowPos3sv

Acked-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Paul Berry 2012-11-06 08:57:59 -08:00
parent 7708a86464
commit 1a1db1746d
87 changed files with 3205 additions and 3288 deletions

View file

@ -64,7 +64,7 @@ static void _apple_glapi_create_table(void) {
SET_CopyPixels(__applegl_api, __applegl_glCopyPixels);
SET_CopyColorTable(__applegl_api, __applegl_glCopyColorTable);
SET_DrawBuffer(__applegl_api, __applegl_glDrawBuffer);
SET_DrawBuffersARB(__applegl_api, __applegl_glDrawBuffersARB);
SET_DrawBuffers(__applegl_api, __applegl_glDrawBuffers);
SET_Viewport(__applegl_api, __applegl_glViewport);
}

View file

@ -36,7 +36,7 @@ void __applegl_glCopyColorTable(GLenum target, GLenum internalformat, GLint x, G
GLsizei width);
void __applegl_glDrawBuffer(GLenum mode);
void __applegl_glDrawBuffersARB(GLsizei n, const GLenum * bufs);
void __applegl_glDrawBuffers(GLsizei n, const GLenum * bufs);
void __applegl_glViewport(GLint x, GLint y, GLsizei width, GLsizei height);

View file

@ -84,7 +84,7 @@ __applegl_glDrawBuffer(GLenum mode)
void
__applegl_glDrawBuffersARB(GLsizei n, const GLenum * bufs)
__applegl_glDrawBuffers(GLsizei n, const GLenum * bufs)
{
struct glx_context * gc = __glXGetCurrentContext();

View file

@ -40,7 +40,7 @@
void
__indirect_glGetCompressedTexImageARB(GLenum target, GLint level,
__indirect_glGetCompressedTexImage(GLenum target, GLint level,
GLvoid * img)
{
__GLX_SINGLE_DECLARE_VARIABLES();
@ -191,7 +191,7 @@ CompressedTexSubImage1D2D(GLenum target, GLint level,
void
__indirect_glCompressedTexImage1DARB(GLenum target, GLint level,
__indirect_glCompressedTexImage1D(GLenum target, GLint level,
GLenum internal_format, GLsizei width,
GLint border, GLsizei image_size,
const GLvoid * data)
@ -203,7 +203,7 @@ __indirect_glCompressedTexImage1DARB(GLenum target, GLint level,
void
__indirect_glCompressedTexImage2DARB(GLenum target, GLint level,
__indirect_glCompressedTexImage2D(GLenum target, GLint level,
GLenum internal_format,
GLsizei width, GLsizei height,
GLint border, GLsizei image_size,
@ -216,7 +216,7 @@ __indirect_glCompressedTexImage2DARB(GLenum target, GLint level,
void
__indirect_glCompressedTexImage3DARB(GLenum target, GLint level,
__indirect_glCompressedTexImage3D(GLenum target, GLint level,
GLenum internal_format,
GLsizei width, GLsizei height,
GLsizei depth, GLint border,
@ -264,7 +264,7 @@ __indirect_glCompressedTexImage3DARB(GLenum target, GLint level,
void
__indirect_glCompressedTexSubImage1DARB(GLenum target, GLint level,
__indirect_glCompressedTexSubImage1D(GLenum target, GLint level,
GLint xoffset,
GLsizei width,
GLenum format, GLsizei image_size,
@ -277,7 +277,7 @@ __indirect_glCompressedTexSubImage1DARB(GLenum target, GLint level,
void
__indirect_glCompressedTexSubImage2DARB(GLenum target, GLint level,
__indirect_glCompressedTexSubImage2D(GLenum target, GLint level,
GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height,
GLenum format, GLsizei image_size,
@ -290,7 +290,7 @@ __indirect_glCompressedTexSubImage2DARB(GLenum target, GLint level,
void
__indirect_glCompressedTexSubImage3DARB(GLenum target, GLint level,
__indirect_glCompressedTexSubImage3D(GLenum target, GLint level,
GLint xoffset, GLint yoffset,
GLint zoffset, GLsizei width,
GLsizei height, GLsizei depth,

View file

@ -49,7 +49,7 @@ TransposeMatrixd(const GLdouble s[16], GLdouble d[16])
void
__indirect_glLoadTransposeMatrixdARB(const GLdouble * m)
__indirect_glLoadTransposeMatrixd(const GLdouble * m)
{
GLdouble mt[16];
@ -58,7 +58,7 @@ __indirect_glLoadTransposeMatrixdARB(const GLdouble * m)
}
void
__indirect_glLoadTransposeMatrixfARB(const GLfloat * m)
__indirect_glLoadTransposeMatrixf(const GLfloat * m)
{
GLfloat mt[16];
@ -67,7 +67,7 @@ __indirect_glLoadTransposeMatrixfARB(const GLfloat * m)
}
void
__indirect_glMultTransposeMatrixdARB(const GLdouble * m)
__indirect_glMultTransposeMatrixd(const GLdouble * m)
{
GLdouble mt[16];
@ -76,7 +76,7 @@ __indirect_glMultTransposeMatrixdARB(const GLdouble * m)
}
void
__indirect_glMultTransposeMatrixfARB(const GLfloat * m)
__indirect_glMultTransposeMatrixf(const GLfloat * m)
{
GLfloat mt[16];

View file

@ -1030,7 +1030,7 @@ __indirect_glDrawRangeElements(GLenum mode, GLuint start, GLuint end,
void
__indirect_glMultiDrawArraysEXT(GLenum mode, const GLint *first,
__indirect_glMultiDrawArrays(GLenum mode, const GLint *first,
const GLsizei *count, GLsizei primcount)
{
struct glx_context *gc = __glXGetCurrentContext();
@ -1462,7 +1462,7 @@ __indirect_glTexCoordPointer(GLint size, GLenum type, GLsizei stride,
void
__indirect_glSecondaryColorPointerEXT(GLint size, GLenum type, GLsizei stride,
__indirect_glSecondaryColorPointer(GLint size, GLenum type, GLsizei stride,
const GLvoid * pointer)
{
uint16_t opcode;
@ -1522,7 +1522,7 @@ __indirect_glSecondaryColorPointerEXT(GLint size, GLenum type, GLsizei stride,
void
__indirect_glFogCoordPointerEXT(GLenum type, GLsizei stride,
__indirect_glFogCoordPointer(GLenum type, GLsizei stride,
const GLvoid * pointer)
{
uint16_t opcode;
@ -1564,7 +1564,7 @@ __indirect_glFogCoordPointerEXT(GLenum type, GLsizei stride,
void
__indirect_glVertexAttribPointerARB(GLuint index, GLint size,
__indirect_glVertexAttribPointer(GLuint index, GLint size,
GLenum type, GLboolean normalized,
GLsizei stride, const GLvoid * pointer)
{
@ -1701,7 +1701,7 @@ __indirect_glVertexAttribPointerNV(GLuint index, GLint size,
case GL_SHORT:
case GL_FLOAT:
case GL_DOUBLE:
__indirect_glVertexAttribPointerARB(index, size, type,
__indirect_glVertexAttribPointer(index, size, type,
normalized, stride, pointer);
return;
default:
@ -1712,7 +1712,7 @@ __indirect_glVertexAttribPointerNV(GLuint index, GLint size,
void
__indirect_glClientActiveTextureARB(GLenum texture)
__indirect_glClientActiveTexture(GLenum texture)
{
struct glx_context *const gc = __glXGetCurrentContext();
__GLXattribute *const state =
@ -1961,13 +1961,13 @@ __glXPopArrayState(__GLXattribute * state)
stack[i].user_stride, stack[i].data);
break;
case GL_SECONDARY_COLOR_ARRAY:
__indirect_glSecondaryColorPointerEXT(stack[i].count,
__indirect_glSecondaryColorPointer(stack[i].count,
stack[i].data_type,
stack[i].user_stride,
stack[i].data);
break;
case GL_FOG_COORDINATE_ARRAY:
__indirect_glFogCoordPointerEXT(stack[i].data_type,
__indirect_glFogCoordPointer(stack[i].data_type,
stack[i].user_stride, stack[i].data);
break;

View file

@ -48,14 +48,14 @@ do_vertex_attrib_enable(GLuint index, GLboolean val)
void
__indirect_glEnableVertexAttribArrayARB(GLuint index)
__indirect_glEnableVertexAttribArray(GLuint index)
{
do_vertex_attrib_enable(index, GL_TRUE);
}
void
__indirect_glDisableVertexAttribArrayARB(GLuint index)
__indirect_glDisableVertexAttribArray(GLuint index)
{
do_vertex_attrib_enable(index, GL_FALSE);
}
@ -119,7 +119,7 @@ __indirect_glGetProgramLocalParameterdvARB(GLenum target, GLuint index,
void
__indirect_glGetVertexAttribPointervNV(GLuint index, GLenum pname,
__indirect_glGetVertexAttribPointerv(GLuint index, GLenum pname,
GLvoid ** pointer)
{
struct glx_context *const gc = __glXGetCurrentContext();
@ -193,7 +193,7 @@ get_vertex_attrib(struct glx_context * gc, unsigned vop,
void
__indirect_glGetVertexAttribivARB(GLuint index, GLenum pname, GLint * params)
__indirect_glGetVertexAttribiv(GLuint index, GLenum pname, GLint * params)
{
struct glx_context *const gc = __glXGetCurrentContext();
Display *const dpy = gc->currentDpy;
@ -226,7 +226,7 @@ __indirect_glGetVertexAttribivARB(GLuint index, GLenum pname, GLint * params)
void
__indirect_glGetVertexAttribfvARB(GLuint index, GLenum pname,
__indirect_glGetVertexAttribfv(GLuint index, GLenum pname,
GLfloat * params)
{
struct glx_context *const gc = __glXGetCurrentContext();
@ -260,7 +260,7 @@ __indirect_glGetVertexAttribfvARB(GLuint index, GLenum pname,
void
__indirect_glGetVertexAttribdvARB(GLuint index, GLenum pname,
__indirect_glGetVertexAttribdv(GLuint index, GLenum pname,
GLdouble * params)
{
struct glx_context *const gc = __glXGetCurrentContext();

View file

@ -28,85 +28,85 @@
#include "indirect.h"
void
__indirect_glWindowPos2dMESA(GLdouble x, GLdouble y)
__indirect_glWindowPos2d(GLdouble x, GLdouble y)
{
__indirect_glWindowPos3fMESA(x, y, 0.0);
__indirect_glWindowPos3f(x, y, 0.0);
}
void
__indirect_glWindowPos2iMESA(GLint x, GLint y)
__indirect_glWindowPos2i(GLint x, GLint y)
{
__indirect_glWindowPos3fMESA(x, y, 0.0);
__indirect_glWindowPos3f(x, y, 0.0);
}
void
__indirect_glWindowPos2fMESA(GLfloat x, GLfloat y)
__indirect_glWindowPos2f(GLfloat x, GLfloat y)
{
__indirect_glWindowPos3fMESA(x, y, 0.0);
__indirect_glWindowPos3f(x, y, 0.0);
}
void
__indirect_glWindowPos2sMESA(GLshort x, GLshort y)
__indirect_glWindowPos2s(GLshort x, GLshort y)
{
__indirect_glWindowPos3fMESA(x, y, 0.0);
__indirect_glWindowPos3f(x, y, 0.0);
}
void
__indirect_glWindowPos2dvMESA(const GLdouble * p)
__indirect_glWindowPos2dv(const GLdouble * p)
{
__indirect_glWindowPos3fMESA(p[0], p[1], 0.0);
__indirect_glWindowPos3f(p[0], p[1], 0.0);
}
void
__indirect_glWindowPos2fvMESA(const GLfloat * p)
__indirect_glWindowPos2fv(const GLfloat * p)
{
__indirect_glWindowPos3fMESA(p[0], p[1], 0.0);
__indirect_glWindowPos3f(p[0], p[1], 0.0);
}
void
__indirect_glWindowPos2ivMESA(const GLint * p)
__indirect_glWindowPos2iv(const GLint * p)
{
__indirect_glWindowPos3fMESA(p[0], p[1], 0.0);
__indirect_glWindowPos3f(p[0], p[1], 0.0);
}
void
__indirect_glWindowPos2svMESA(const GLshort * p)
__indirect_glWindowPos2sv(const GLshort * p)
{
__indirect_glWindowPos3fMESA(p[0], p[1], 0.0);
__indirect_glWindowPos3f(p[0], p[1], 0.0);
}
void
__indirect_glWindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z)
__indirect_glWindowPos3d(GLdouble x, GLdouble y, GLdouble z)
{
__indirect_glWindowPos3fMESA(x, y, z);
__indirect_glWindowPos3f(x, y, z);
}
void
__indirect_glWindowPos3iMESA(GLint x, GLint y, GLint z)
__indirect_glWindowPos3i(GLint x, GLint y, GLint z)
{
__indirect_glWindowPos3fMESA(x, y, z);
__indirect_glWindowPos3f(x, y, z);
}
void
__indirect_glWindowPos3sMESA(GLshort x, GLshort y, GLshort z)
__indirect_glWindowPos3s(GLshort x, GLshort y, GLshort z)
{
__indirect_glWindowPos3fMESA(x, y, z);
__indirect_glWindowPos3f(x, y, z);
}
void
__indirect_glWindowPos3dvMESA(const GLdouble * p)
__indirect_glWindowPos3dv(const GLdouble * p)
{
__indirect_glWindowPos3fMESA(p[0], p[1], p[2]);
__indirect_glWindowPos3f(p[0], p[1], p[2]);
}
void
__indirect_glWindowPos3ivMESA(const GLint * p)
__indirect_glWindowPos3iv(const GLint * p)
{
__indirect_glWindowPos3fMESA(p[0], p[1], p[2]);
__indirect_glWindowPos3f(p[0], p[1], p[2]);
}
void
__indirect_glWindowPos3svMESA(const GLshort * p)
__indirect_glWindowPos3sv(const GLshort * p)
{
__indirect_glWindowPos3fMESA(p[0], p[1], p[2]);
__indirect_glWindowPos3f(p[0], p[1], p[2]);
}

View file

@ -515,19 +515,19 @@ TEST(InvalidEnumSizes, ConvolutionParameterfv)
TEST(ValidEnumSizes, PointParameterfv)
{
EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SIZE_MIN));
EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SIZE_MIN_ARB));
EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SIZE_MIN_SGIS));
EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SIZE_MAX));
EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SIZE_MAX_ARB));
EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SIZE_MAX_SGIS));
EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_FADE_THRESHOLD_SIZE));
EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_FADE_THRESHOLD_SIZE_ARB));
EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_FADE_THRESHOLD_SIZE_SGIS));
EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SPRITE_R_MODE_NV));
EXPECT_EQ(1, __glPointParameterfvEXT_size(GL_POINT_SPRITE_COORD_ORIGIN));
EXPECT_EQ(3, __glPointParameterfvEXT_size(GL_POINT_DISTANCE_ATTENUATION));
EXPECT_EQ(3, __glPointParameterfvEXT_size(GL_POINT_DISTANCE_ATTENUATION_ARB));
EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SIZE_MIN));
EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SIZE_MIN_ARB));
EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SIZE_MIN_SGIS));
EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SIZE_MAX));
EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SIZE_MAX_ARB));
EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SIZE_MAX_SGIS));
EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_FADE_THRESHOLD_SIZE));
EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_FADE_THRESHOLD_SIZE_ARB));
EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_FADE_THRESHOLD_SIZE_SGIS));
EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SPRITE_R_MODE_NV));
EXPECT_EQ(1, __glPointParameterfv_size(GL_POINT_SPRITE_COORD_ORIGIN));
EXPECT_EQ(3, __glPointParameterfv_size(GL_POINT_DISTANCE_ATTENUATION));
EXPECT_EQ(3, __glPointParameterfv_size(GL_POINT_DISTANCE_ATTENUATION_ARB));
}
TEST(InvalidEnumSizes, PointParameterfv)
@ -549,7 +549,7 @@ TEST(InvalidEnumSizes, PointParameterfv)
/* case GL_POINT_DISTANCE_ATTENUATION_ARB:*/
break;
default:
EXPECT_EQ(0, __glPointParameterfvEXT_size(i)) << "i = 0x" <<
EXPECT_EQ(0, __glPointParameterfv_size(i)) << "i = 0x" <<
std::setw(4) << std::setfill('0') << std::hex << i;
}
}

View file

@ -448,63 +448,63 @@ void __indirect_glResetMinmax(void) { }
void __indirect_glSeparableFilter2D(void) { }
void __indirect_glTexImage3D(void) { }
void __indirect_glTexSubImage3D(void) { }
void __indirect_glActiveTextureARB(void) { }
void __indirect_glClientActiveTextureARB(void) { }
void __indirect_glMultiTexCoord1dARB(void) { }
void __indirect_glMultiTexCoord1dvARB(void) { }
void __indirect_glActiveTexture(void) { }
void __indirect_glClientActiveTexture(void) { }
void __indirect_glMultiTexCoord1d(void) { }
void __indirect_glMultiTexCoord1dv(void) { }
void __indirect_glMultiTexCoord1fARB(void) { }
void __indirect_glMultiTexCoord1fvARB(void) { }
void __indirect_glMultiTexCoord1iARB(void) { }
void __indirect_glMultiTexCoord1ivARB(void) { }
void __indirect_glMultiTexCoord1sARB(void) { }
void __indirect_glMultiTexCoord1svARB(void) { }
void __indirect_glMultiTexCoord2dARB(void) { }
void __indirect_glMultiTexCoord2dvARB(void) { }
void __indirect_glMultiTexCoord1i(void) { }
void __indirect_glMultiTexCoord1iv(void) { }
void __indirect_glMultiTexCoord1s(void) { }
void __indirect_glMultiTexCoord1sv(void) { }
void __indirect_glMultiTexCoord2d(void) { }
void __indirect_glMultiTexCoord2dv(void) { }
void __indirect_glMultiTexCoord2fARB(void) { }
void __indirect_glMultiTexCoord2fvARB(void) { }
void __indirect_glMultiTexCoord2iARB(void) { }
void __indirect_glMultiTexCoord2ivARB(void) { }
void __indirect_glMultiTexCoord2sARB(void) { }
void __indirect_glMultiTexCoord2svARB(void) { }
void __indirect_glMultiTexCoord3dARB(void) { }
void __indirect_glMultiTexCoord3dvARB(void) { }
void __indirect_glMultiTexCoord2i(void) { }
void __indirect_glMultiTexCoord2iv(void) { }
void __indirect_glMultiTexCoord2s(void) { }
void __indirect_glMultiTexCoord2sv(void) { }
void __indirect_glMultiTexCoord3d(void) { }
void __indirect_glMultiTexCoord3dv(void) { }
void __indirect_glMultiTexCoord3fARB(void) { }
void __indirect_glMultiTexCoord3fvARB(void) { }
void __indirect_glMultiTexCoord3iARB(void) { }
void __indirect_glMultiTexCoord3ivARB(void) { }
void __indirect_glMultiTexCoord3sARB(void) { }
void __indirect_glMultiTexCoord3svARB(void) { }
void __indirect_glMultiTexCoord4dARB(void) { }
void __indirect_glMultiTexCoord4dvARB(void) { }
void __indirect_glMultiTexCoord3i(void) { }
void __indirect_glMultiTexCoord3iv(void) { }
void __indirect_glMultiTexCoord3s(void) { }
void __indirect_glMultiTexCoord3sv(void) { }
void __indirect_glMultiTexCoord4d(void) { }
void __indirect_glMultiTexCoord4dv(void) { }
void __indirect_glMultiTexCoord4fARB(void) { }
void __indirect_glMultiTexCoord4fvARB(void) { }
void __indirect_glMultiTexCoord4iARB(void) { }
void __indirect_glMultiTexCoord4ivARB(void) { }
void __indirect_glMultiTexCoord4sARB(void) { }
void __indirect_glMultiTexCoord4svARB(void) { }
void __indirect_glLoadTransposeMatrixdARB(void) { }
void __indirect_glLoadTransposeMatrixfARB(void) { }
void __indirect_glMultTransposeMatrixdARB(void) { }
void __indirect_glMultTransposeMatrixfARB(void) { }
void __indirect_glSampleCoverageARB(void) { }
void __indirect_glCompressedTexImage1DARB(void) { }
void __indirect_glCompressedTexImage2DARB(void) { }
void __indirect_glCompressedTexImage3DARB(void) { }
void __indirect_glCompressedTexSubImage1DARB(void) { }
void __indirect_glCompressedTexSubImage2DARB(void) { }
void __indirect_glCompressedTexSubImage3DARB(void) { }
void __indirect_glGetCompressedTexImageARB(void) { }
void __indirect_glDisableVertexAttribArrayARB(void) { }
void __indirect_glEnableVertexAttribArrayARB(void) { }
void __indirect_glMultiTexCoord4i(void) { }
void __indirect_glMultiTexCoord4iv(void) { }
void __indirect_glMultiTexCoord4s(void) { }
void __indirect_glMultiTexCoord4sv(void) { }
void __indirect_glLoadTransposeMatrixd(void) { }
void __indirect_glLoadTransposeMatrixf(void) { }
void __indirect_glMultTransposeMatrixd(void) { }
void __indirect_glMultTransposeMatrixf(void) { }
void __indirect_glSampleCoverage(void) { }
void __indirect_glCompressedTexImage1D(void) { }
void __indirect_glCompressedTexImage2D(void) { }
void __indirect_glCompressedTexImage3D(void) { }
void __indirect_glCompressedTexSubImage1D(void) { }
void __indirect_glCompressedTexSubImage2D(void) { }
void __indirect_glCompressedTexSubImage3D(void) { }
void __indirect_glGetCompressedTexImage(void) { }
void __indirect_glDisableVertexAttribArray(void) { }
void __indirect_glEnableVertexAttribArray(void) { }
void __indirect_glGetProgramEnvParameterdvARB(void) { }
void __indirect_glGetProgramEnvParameterfvARB(void) { }
void __indirect_glGetProgramLocalParameterdvARB(void) { }
void __indirect_glGetProgramLocalParameterfvARB(void) { }
void __indirect_glGetProgramStringARB(void) { }
void __indirect_glGetProgramivARB(void) { }
void __indirect_glGetVertexAttribdvARB(void) { }
void __indirect_glGetVertexAttribfvARB(void) { }
void __indirect_glGetVertexAttribivARB(void) { }
void __indirect_glGetVertexAttribdv(void) { }
void __indirect_glGetVertexAttribfv(void) { }
void __indirect_glGetVertexAttribiv(void) { }
void __indirect_glProgramEnvParameter4dARB(void) { }
void __indirect_glProgramEnvParameter4dvARB(void) { }
void __indirect_glProgramEnvParameter4fARB(void) { }
@ -514,53 +514,53 @@ void __indirect_glProgramLocalParameter4dvARB(void) { }
void __indirect_glProgramLocalParameter4fARB(void) { }
void __indirect_glProgramLocalParameter4fvARB(void) { }
void __indirect_glProgramStringARB(void) { }
void __indirect_glVertexAttrib1dARB(void) { }
void __indirect_glVertexAttrib1dvARB(void) { }
void __indirect_glVertexAttrib1d(void) { }
void __indirect_glVertexAttrib1dv(void) { }
void __indirect_glVertexAttrib1fARB(void) { }
void __indirect_glVertexAttrib1fvARB(void) { }
void __indirect_glVertexAttrib1sARB(void) { }
void __indirect_glVertexAttrib1svARB(void) { }
void __indirect_glVertexAttrib2dARB(void) { }
void __indirect_glVertexAttrib2dvARB(void) { }
void __indirect_glVertexAttrib1s(void) { }
void __indirect_glVertexAttrib1sv(void) { }
void __indirect_glVertexAttrib2d(void) { }
void __indirect_glVertexAttrib2dv(void) { }
void __indirect_glVertexAttrib2fARB(void) { }
void __indirect_glVertexAttrib2fvARB(void) { }
void __indirect_glVertexAttrib2sARB(void) { }
void __indirect_glVertexAttrib2svARB(void) { }
void __indirect_glVertexAttrib3dARB(void) { }
void __indirect_glVertexAttrib3dvARB(void) { }
void __indirect_glVertexAttrib2s(void) { }
void __indirect_glVertexAttrib2sv(void) { }
void __indirect_glVertexAttrib3d(void) { }
void __indirect_glVertexAttrib3dv(void) { }
void __indirect_glVertexAttrib3fARB(void) { }
void __indirect_glVertexAttrib3fvARB(void) { }
void __indirect_glVertexAttrib3sARB(void) { }
void __indirect_glVertexAttrib3svARB(void) { }
void __indirect_glVertexAttrib4NbvARB(void) { }
void __indirect_glVertexAttrib4NivARB(void) { }
void __indirect_glVertexAttrib4NsvARB(void) { }
void __indirect_glVertexAttrib4NubARB(void) { }
void __indirect_glVertexAttrib4NubvARB(void) { }
void __indirect_glVertexAttrib4NuivARB(void) { }
void __indirect_glVertexAttrib4NusvARB(void) { }
void __indirect_glVertexAttrib4bvARB(void) { }
void __indirect_glVertexAttrib4dARB(void) { }
void __indirect_glVertexAttrib4dvARB(void) { }
void __indirect_glVertexAttrib3s(void) { }
void __indirect_glVertexAttrib3sv(void) { }
void __indirect_glVertexAttrib4Nbv(void) { }
void __indirect_glVertexAttrib4Niv(void) { }
void __indirect_glVertexAttrib4Nsv(void) { }
void __indirect_glVertexAttrib4Nub(void) { }
void __indirect_glVertexAttrib4Nubv(void) { }
void __indirect_glVertexAttrib4Nuiv(void) { }
void __indirect_glVertexAttrib4Nusv(void) { }
void __indirect_glVertexAttrib4bv(void) { }
void __indirect_glVertexAttrib4d(void) { }
void __indirect_glVertexAttrib4dv(void) { }
void __indirect_glVertexAttrib4fARB(void) { }
void __indirect_glVertexAttrib4fvARB(void) { }
void __indirect_glVertexAttrib4ivARB(void) { }
void __indirect_glVertexAttrib4sARB(void) { }
void __indirect_glVertexAttrib4svARB(void) { }
void __indirect_glVertexAttrib4ubvARB(void) { }
void __indirect_glVertexAttrib4uivARB(void) { }
void __indirect_glVertexAttrib4usvARB(void) { }
void __indirect_glVertexAttribPointerARB(void) { }
void __indirect_glBeginQueryARB(void) { }
void __indirect_glDeleteQueriesARB(void) { }
void __indirect_glEndQueryARB(void) { }
void __indirect_glGenQueriesARB(void) { }
void __indirect_glGetQueryObjectivARB(void) { }
void __indirect_glGetQueryObjectuivARB(void) { }
void __indirect_glGetQueryivARB(void) { }
void __indirect_glIsQueryARB(void) { }
void __indirect_glDrawBuffersARB(void) { }
void __indirect_glClampColorARB(void) { }
void __indirect_glVertexAttrib4iv(void) { }
void __indirect_glVertexAttrib4s(void) { }
void __indirect_glVertexAttrib4sv(void) { }
void __indirect_glVertexAttrib4ubv(void) { }
void __indirect_glVertexAttrib4uiv(void) { }
void __indirect_glVertexAttrib4usv(void) { }
void __indirect_glVertexAttribPointer(void) { }
void __indirect_glBeginQuery(void) { }
void __indirect_glDeleteQueries(void) { }
void __indirect_glEndQuery(void) { }
void __indirect_glGenQueries(void) { }
void __indirect_glGetQueryObjectiv(void) { }
void __indirect_glGetQueryObjectuiv(void) { }
void __indirect_glGetQueryiv(void) { }
void __indirect_glIsQuery(void) { }
void __indirect_glDrawBuffers(void) { }
void __indirect_glClampColor(void) { }
void __indirect_glRenderbufferStorageMultisample(void) { }
void __indirect_glSampleMaskSGIS(void) { }
void __indirect_glSamplePatternSGIS(void) { }
@ -570,64 +570,64 @@ void __indirect_glIndexPointerEXT(void) { }
void __indirect_glNormalPointerEXT(void) { }
void __indirect_glTexCoordPointerEXT(void) { }
void __indirect_glVertexPointerEXT(void) { }
void __indirect_glPointParameterfEXT(void) { }
void __indirect_glPointParameterfvEXT(void) { }
void __indirect_glSecondaryColor3bEXT(void) { }
void __indirect_glSecondaryColor3bvEXT(void) { }
void __indirect_glSecondaryColor3dEXT(void) { }
void __indirect_glSecondaryColor3dvEXT(void) { }
void __indirect_glPointParameterf(void) { }
void __indirect_glPointParameterfv(void) { }
void __indirect_glSecondaryColor3b(void) { }
void __indirect_glSecondaryColor3bv(void) { }
void __indirect_glSecondaryColor3d(void) { }
void __indirect_glSecondaryColor3dv(void) { }
void __indirect_glSecondaryColor3fEXT(void) { }
void __indirect_glSecondaryColor3fvEXT(void) { }
void __indirect_glSecondaryColor3iEXT(void) { }
void __indirect_glSecondaryColor3ivEXT(void) { }
void __indirect_glSecondaryColor3sEXT(void) { }
void __indirect_glSecondaryColor3svEXT(void) { }
void __indirect_glSecondaryColor3ubEXT(void) { }
void __indirect_glSecondaryColor3ubvEXT(void) { }
void __indirect_glSecondaryColor3uiEXT(void) { }
void __indirect_glSecondaryColor3uivEXT(void) { }
void __indirect_glSecondaryColor3usEXT(void) { }
void __indirect_glSecondaryColor3usvEXT(void) { }
void __indirect_glSecondaryColorPointerEXT(void) { }
void __indirect_glMultiDrawArraysEXT(void) { }
void __indirect_glSecondaryColor3i(void) { }
void __indirect_glSecondaryColor3iv(void) { }
void __indirect_glSecondaryColor3s(void) { }
void __indirect_glSecondaryColor3sv(void) { }
void __indirect_glSecondaryColor3ub(void) { }
void __indirect_glSecondaryColor3ubv(void) { }
void __indirect_glSecondaryColor3ui(void) { }
void __indirect_glSecondaryColor3uiv(void) { }
void __indirect_glSecondaryColor3us(void) { }
void __indirect_glSecondaryColor3usv(void) { }
void __indirect_glSecondaryColorPointer(void) { }
void __indirect_glMultiDrawArrays(void) { }
void __indirect_glMultiDrawElementsEXT(void) { }
void __indirect_glFogCoordPointerEXT(void) { }
void __indirect_glFogCoorddEXT(void) { }
void __indirect_glFogCoorddvEXT(void) { }
void __indirect_glFogCoordPointer(void) { }
void __indirect_glFogCoordd(void) { }
void __indirect_glFogCoorddv(void) { }
void __indirect_glFogCoordfEXT(void) { }
void __indirect_glFogCoordfvEXT(void) { }
void __indirect_glBlendFuncSeparateEXT(void) { }
void __indirect_glWindowPos2dMESA(void) { }
void __indirect_glWindowPos2dvMESA(void) { }
void __indirect_glWindowPos2fMESA(void) { }
void __indirect_glWindowPos2fvMESA(void) { }
void __indirect_glWindowPos2iMESA(void) { }
void __indirect_glWindowPos2ivMESA(void) { }
void __indirect_glWindowPos2sMESA(void) { }
void __indirect_glWindowPos2svMESA(void) { }
void __indirect_glWindowPos3dMESA(void) { }
void __indirect_glWindowPos3dvMESA(void) { }
void __indirect_glWindowPos3fMESA(void) { }
void __indirect_glWindowPos3fvMESA(void) { }
void __indirect_glWindowPos3iMESA(void) { }
void __indirect_glWindowPos3ivMESA(void) { }
void __indirect_glWindowPos3sMESA(void) { }
void __indirect_glWindowPos3svMESA(void) { }
void __indirect_glBlendFuncSeparate(void) { }
void __indirect_glWindowPos2d(void) { }
void __indirect_glWindowPos2dv(void) { }
void __indirect_glWindowPos2f(void) { }
void __indirect_glWindowPos2fv(void) { }
void __indirect_glWindowPos2i(void) { }
void __indirect_glWindowPos2iv(void) { }
void __indirect_glWindowPos2s(void) { }
void __indirect_glWindowPos2sv(void) { }
void __indirect_glWindowPos3d(void) { }
void __indirect_glWindowPos3dv(void) { }
void __indirect_glWindowPos3f(void) { }
void __indirect_glWindowPos3fv(void) { }
void __indirect_glWindowPos3i(void) { }
void __indirect_glWindowPos3iv(void) { }
void __indirect_glWindowPos3s(void) { }
void __indirect_glWindowPos3sv(void) { }
void __indirect_glAreProgramsResidentNV(void) { }
void __indirect_glBindProgramNV(void) { }
void __indirect_glDeleteProgramsNV(void) { }
void __indirect_glBindProgramARB(void) { }
void __indirect_glDeleteProgramsARB(void) { }
void __indirect_glExecuteProgramNV(void) { }
void __indirect_glGenProgramsNV(void) { }
void __indirect_glGenProgramsARB(void) { }
void __indirect_glGetProgramParameterdvNV(void) { }
void __indirect_glGetProgramParameterfvNV(void) { }
void __indirect_glGetProgramStringNV(void) { }
void __indirect_glGetProgramivNV(void) { }
void __indirect_glGetTrackMatrixivNV(void) { }
void __indirect_glGetVertexAttribPointervNV(void) { }
void __indirect_glGetVertexAttribPointerv(void) { }
void __indirect_glGetVertexAttribdvNV(void) { }
void __indirect_glGetVertexAttribfvNV(void) { }
void __indirect_glGetVertexAttribivNV(void) { }
void __indirect_glIsProgramNV(void) { }
void __indirect_glIsProgramARB(void) { }
void __indirect_glLoadProgramNV(void) { }
void __indirect_glProgramParameters4dvNV(void) { }
void __indirect_glProgramParameters4fvNV(void) { }
@ -673,8 +673,8 @@ void __indirect_glVertexAttribs4dvNV(void) { }
void __indirect_glVertexAttribs4fvNV(void) { }
void __indirect_glVertexAttribs4svNV(void) { }
void __indirect_glVertexAttribs4ubvNV(void) { }
void __indirect_glPointParameteriNV(void) { }
void __indirect_glPointParameterivNV(void) { }
void __indirect_glPointParameteri(void) { }
void __indirect_glPointParameteriv(void) { }
void __indirect_glActiveStencilFaceEXT(void) { }
void __indirect_glGetProgramNamedParameterdvNV(void) { }
void __indirect_glGetProgramNamedParameterfvNV(void) { }
@ -682,26 +682,26 @@ void __indirect_glProgramNamedParameter4dNV(void) { }
void __indirect_glProgramNamedParameter4dvNV(void) { }
void __indirect_glProgramNamedParameter4fNV(void) { }
void __indirect_glProgramNamedParameter4fvNV(void) { }
void __indirect_glBlendEquationSeparateEXT(void) { }
void __indirect_glBindFramebufferEXT(void) { }
void __indirect_glBindRenderbufferEXT(void) { }
void __indirect_glCheckFramebufferStatusEXT(void) { }
void __indirect_glDeleteFramebuffersEXT(void) { }
void __indirect_glDeleteRenderbuffersEXT(void) { }
void __indirect_glFramebufferRenderbufferEXT(void) { }
void __indirect_glFramebufferTexture1DEXT(void) { }
void __indirect_glFramebufferTexture2DEXT(void) { }
void __indirect_glFramebufferTexture3DEXT(void) { }
void __indirect_glGenFramebuffersEXT(void) { }
void __indirect_glGenRenderbuffersEXT(void) { }
void __indirect_glGenerateMipmapEXT(void) { }
void __indirect_glGetFramebufferAttachmentParameterivEXT(void) { }
void __indirect_glGetRenderbufferParameterivEXT(void) { }
void __indirect_glIsFramebufferEXT(void) { }
void __indirect_glIsRenderbufferEXT(void) { }
void __indirect_glRenderbufferStorageEXT(void) { }
void __indirect_glBlitFramebufferEXT(void) { }
void __indirect_glFramebufferTextureLayerEXT(void) { }
void __indirect_glBlendEquationSeparate(void) { }
void __indirect_glBindFramebuffer(void) { }
void __indirect_glBindRenderbuffer(void) { }
void __indirect_glCheckFramebufferStatus(void) { }
void __indirect_glDeleteFramebuffers(void) { }
void __indirect_glDeleteRenderbuffers(void) { }
void __indirect_glFramebufferRenderbuffer(void) { }
void __indirect_glFramebufferTexture1D(void) { }
void __indirect_glFramebufferTexture2D(void) { }
void __indirect_glFramebufferTexture3D(void) { }
void __indirect_glGenFramebuffers(void) { }
void __indirect_glGenRenderbuffers(void) { }
void __indirect_glGenerateMipmap(void) { }
void __indirect_glGetFramebufferAttachmentParameteriv(void) { }
void __indirect_glGetRenderbufferParameteriv(void) { }
void __indirect_glIsFramebuffer(void) { }
void __indirect_glIsRenderbuffer(void) { }
void __indirect_glRenderbufferStorage(void) { }
void __indirect_glBlitFramebuffer(void) { }
void __indirect_glFramebufferTextureLayer(void) { }
}
/*@}*/
@ -1165,79 +1165,79 @@ TEST_F(IndirectAPI, OpenGL_20_is_nop)
TEST_F(IndirectAPI, ARB_multitexture)
{
EXPECT_EQ((_glapi_proc) __indirect_glActiveTextureARB, table[_gloffset_ActiveTextureARB]);
EXPECT_EQ((_glapi_proc) __indirect_glClientActiveTextureARB, table[_gloffset_ClientActiveTextureARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1dARB, table[_gloffset_MultiTexCoord1dARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1dvARB, table[_gloffset_MultiTexCoord1dvARB]);
EXPECT_EQ((_glapi_proc) __indirect_glActiveTexture, table[_gloffset_ActiveTexture]);
EXPECT_EQ((_glapi_proc) __indirect_glClientActiveTexture, table[_gloffset_ClientActiveTexture]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1d, table[_gloffset_MultiTexCoord1d]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1dv, table[_gloffset_MultiTexCoord1dv]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1fARB, table[_gloffset_MultiTexCoord1fARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1fvARB, table[_gloffset_MultiTexCoord1fvARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1iARB, table[_gloffset_MultiTexCoord1iARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1ivARB, table[_gloffset_MultiTexCoord1ivARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1sARB, table[_gloffset_MultiTexCoord1sARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1svARB, table[_gloffset_MultiTexCoord1svARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2dARB, table[_gloffset_MultiTexCoord2dARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2dvARB, table[_gloffset_MultiTexCoord2dvARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1i, table[_gloffset_MultiTexCoord1i]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1iv, table[_gloffset_MultiTexCoord1iv]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1s, table[_gloffset_MultiTexCoord1s]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord1sv, table[_gloffset_MultiTexCoord1sv]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2d, table[_gloffset_MultiTexCoord2d]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2dv, table[_gloffset_MultiTexCoord2dv]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2fARB, table[_gloffset_MultiTexCoord2fARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2fvARB, table[_gloffset_MultiTexCoord2fvARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2iARB, table[_gloffset_MultiTexCoord2iARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2ivARB, table[_gloffset_MultiTexCoord2ivARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2sARB, table[_gloffset_MultiTexCoord2sARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2svARB, table[_gloffset_MultiTexCoord2svARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3dARB, table[_gloffset_MultiTexCoord3dARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3dvARB, table[_gloffset_MultiTexCoord3dvARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2i, table[_gloffset_MultiTexCoord2i]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2iv, table[_gloffset_MultiTexCoord2iv]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2s, table[_gloffset_MultiTexCoord2s]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord2sv, table[_gloffset_MultiTexCoord2sv]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3d, table[_gloffset_MultiTexCoord3d]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3dv, table[_gloffset_MultiTexCoord3dv]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3fARB, table[_gloffset_MultiTexCoord3fARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3fvARB, table[_gloffset_MultiTexCoord3fvARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3iARB, table[_gloffset_MultiTexCoord3iARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3ivARB, table[_gloffset_MultiTexCoord3ivARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3sARB, table[_gloffset_MultiTexCoord3sARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3svARB, table[_gloffset_MultiTexCoord3svARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4dARB, table[_gloffset_MultiTexCoord4dARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4dvARB, table[_gloffset_MultiTexCoord4dvARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3i, table[_gloffset_MultiTexCoord3i]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3iv, table[_gloffset_MultiTexCoord3iv]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3s, table[_gloffset_MultiTexCoord3s]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord3sv, table[_gloffset_MultiTexCoord3sv]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4d, table[_gloffset_MultiTexCoord4d]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4dv, table[_gloffset_MultiTexCoord4dv]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4fARB, table[_gloffset_MultiTexCoord4fARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4fvARB, table[_gloffset_MultiTexCoord4fvARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4iARB, table[_gloffset_MultiTexCoord4iARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4ivARB, table[_gloffset_MultiTexCoord4ivARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4sARB, table[_gloffset_MultiTexCoord4sARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4svARB, table[_gloffset_MultiTexCoord4svARB]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4i, table[_gloffset_MultiTexCoord4i]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4iv, table[_gloffset_MultiTexCoord4iv]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4s, table[_gloffset_MultiTexCoord4s]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiTexCoord4sv, table[_gloffset_MultiTexCoord4sv]);
}
TEST_F(IndirectAPI, ARB_transpose_matrix)
{
EXPECT_EQ((_glapi_proc) __indirect_glLoadTransposeMatrixdARB, table[_glapi_get_proc_offset("glLoadTransposeMatrixdARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glLoadTransposeMatrixfARB, table[_glapi_get_proc_offset("glLoadTransposeMatrixfARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glMultTransposeMatrixdARB, table[_glapi_get_proc_offset("glMultTransposeMatrixdARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glMultTransposeMatrixfARB, table[_glapi_get_proc_offset("glMultTransposeMatrixfARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glLoadTransposeMatrixd, table[_glapi_get_proc_offset("glLoadTransposeMatrixdARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glLoadTransposeMatrixf, table[_glapi_get_proc_offset("glLoadTransposeMatrixfARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glMultTransposeMatrixd, table[_glapi_get_proc_offset("glMultTransposeMatrixdARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glMultTransposeMatrixf, table[_glapi_get_proc_offset("glMultTransposeMatrixfARB")]);
}
TEST_F(IndirectAPI, ARB_multisample)
{
EXPECT_EQ((_glapi_proc) __indirect_glSampleCoverageARB, table[_glapi_get_proc_offset("glSampleCoverageARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glSampleCoverage, table[_glapi_get_proc_offset("glSampleCoverageARB")]);
}
TEST_F(IndirectAPI, ARB_texture_compression)
{
EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexImage1DARB, table[_glapi_get_proc_offset("glCompressedTexImage1DARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexImage2DARB, table[_glapi_get_proc_offset("glCompressedTexImage2DARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexImage3DARB, table[_glapi_get_proc_offset("glCompressedTexImage3DARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexSubImage1DARB, table[_glapi_get_proc_offset("glCompressedTexSubImage1DARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexSubImage2DARB, table[_glapi_get_proc_offset("glCompressedTexSubImage2DARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexSubImage3DARB, table[_glapi_get_proc_offset("glCompressedTexSubImage3DARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetCompressedTexImageARB, table[_glapi_get_proc_offset("glGetCompressedTexImageARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexImage1D, table[_glapi_get_proc_offset("glCompressedTexImage1DARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexImage2D, table[_glapi_get_proc_offset("glCompressedTexImage2DARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexImage3D, table[_glapi_get_proc_offset("glCompressedTexImage3DARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexSubImage1D, table[_glapi_get_proc_offset("glCompressedTexSubImage1DARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexSubImage2D, table[_glapi_get_proc_offset("glCompressedTexSubImage2DARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glCompressedTexSubImage3D, table[_glapi_get_proc_offset("glCompressedTexSubImage3DARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetCompressedTexImage, table[_glapi_get_proc_offset("glGetCompressedTexImageARB")]);
}
TEST_F(IndirectAPI, ARB_vertex_program)
{
EXPECT_EQ((_glapi_proc) __indirect_glDisableVertexAttribArrayARB, table[_glapi_get_proc_offset("glDisableVertexAttribArrayARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glEnableVertexAttribArrayARB, table[_glapi_get_proc_offset("glEnableVertexAttribArrayARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glDisableVertexAttribArray, table[_glapi_get_proc_offset("glDisableVertexAttribArrayARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glEnableVertexAttribArray, table[_glapi_get_proc_offset("glEnableVertexAttribArrayARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetProgramEnvParameterdvARB, table[_glapi_get_proc_offset("glGetProgramEnvParameterdvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetProgramEnvParameterfvARB, table[_glapi_get_proc_offset("glGetProgramEnvParameterfvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetProgramLocalParameterdvARB, table[_glapi_get_proc_offset("glGetProgramLocalParameterdvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetProgramLocalParameterfvARB, table[_glapi_get_proc_offset("glGetProgramLocalParameterfvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetProgramStringARB, table[_glapi_get_proc_offset("glGetProgramStringARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetProgramivARB, table[_glapi_get_proc_offset("glGetProgramivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribdvARB, table[_glapi_get_proc_offset("glGetVertexAttribdvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribfvARB, table[_glapi_get_proc_offset("glGetVertexAttribfvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribivARB, table[_glapi_get_proc_offset("glGetVertexAttribivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribdv, table[_glapi_get_proc_offset("glGetVertexAttribdvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribfv, table[_glapi_get_proc_offset("glGetVertexAttribfvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribiv, table[_glapi_get_proc_offset("glGetVertexAttribivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glProgramEnvParameter4dARB, table[_glapi_get_proc_offset("glProgramEnvParameter4dARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glProgramEnvParameter4dvARB, table[_glapi_get_proc_offset("glProgramEnvParameter4dvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glProgramEnvParameter4fARB, table[_glapi_get_proc_offset("glProgramEnvParameter4fARB")]);
@ -1247,65 +1247,65 @@ TEST_F(IndirectAPI, ARB_vertex_program)
EXPECT_EQ((_glapi_proc) __indirect_glProgramLocalParameter4fARB, table[_glapi_get_proc_offset("glProgramLocalParameter4fARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glProgramLocalParameter4fvARB, table[_glapi_get_proc_offset("glProgramLocalParameter4fvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glProgramStringARB, table[_glapi_get_proc_offset("glProgramStringARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1dARB, table[_glapi_get_proc_offset("glVertexAttrib1dARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1dvARB, table[_glapi_get_proc_offset("glVertexAttrib1dvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1d, table[_glapi_get_proc_offset("glVertexAttrib1dARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1dv, table[_glapi_get_proc_offset("glVertexAttrib1dvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1fARB, table[_glapi_get_proc_offset("glVertexAttrib1fARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1fvARB, table[_glapi_get_proc_offset("glVertexAttrib1fvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1sARB, table[_glapi_get_proc_offset("glVertexAttrib1sARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1svARB, table[_glapi_get_proc_offset("glVertexAttrib1svARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2dARB, table[_glapi_get_proc_offset("glVertexAttrib2dARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2dvARB, table[_glapi_get_proc_offset("glVertexAttrib2dvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1s, table[_glapi_get_proc_offset("glVertexAttrib1sARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib1sv, table[_glapi_get_proc_offset("glVertexAttrib1svARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2d, table[_glapi_get_proc_offset("glVertexAttrib2dARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2dv, table[_glapi_get_proc_offset("glVertexAttrib2dvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2fARB, table[_glapi_get_proc_offset("glVertexAttrib2fARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2fvARB, table[_glapi_get_proc_offset("glVertexAttrib2fvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2sARB, table[_glapi_get_proc_offset("glVertexAttrib2sARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2svARB, table[_glapi_get_proc_offset("glVertexAttrib2svARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3dARB, table[_glapi_get_proc_offset("glVertexAttrib3dARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3dvARB, table[_glapi_get_proc_offset("glVertexAttrib3dvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2s, table[_glapi_get_proc_offset("glVertexAttrib2sARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib2sv, table[_glapi_get_proc_offset("glVertexAttrib2svARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3d, table[_glapi_get_proc_offset("glVertexAttrib3dARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3dv, table[_glapi_get_proc_offset("glVertexAttrib3dvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3fARB, table[_glapi_get_proc_offset("glVertexAttrib3fARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3fvARB, table[_glapi_get_proc_offset("glVertexAttrib3fvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3sARB, table[_glapi_get_proc_offset("glVertexAttrib3sARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3svARB, table[_glapi_get_proc_offset("glVertexAttrib3svARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4NbvARB, table[_glapi_get_proc_offset("glVertexAttrib4NbvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4NivARB, table[_glapi_get_proc_offset("glVertexAttrib4NivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4NsvARB, table[_glapi_get_proc_offset("glVertexAttrib4NsvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4NubARB, table[_glapi_get_proc_offset("glVertexAttrib4NubARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4NubvARB, table[_glapi_get_proc_offset("glVertexAttrib4NubvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4NuivARB, table[_glapi_get_proc_offset("glVertexAttrib4NuivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4NusvARB, table[_glapi_get_proc_offset("glVertexAttrib4NusvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4bvARB, table[_glapi_get_proc_offset("glVertexAttrib4bvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4dARB, table[_glapi_get_proc_offset("glVertexAttrib4dARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4dvARB, table[_glapi_get_proc_offset("glVertexAttrib4dvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3s, table[_glapi_get_proc_offset("glVertexAttrib3sARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib3sv, table[_glapi_get_proc_offset("glVertexAttrib3svARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4Nbv, table[_glapi_get_proc_offset("glVertexAttrib4NbvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4Niv, table[_glapi_get_proc_offset("glVertexAttrib4NivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4Nsv, table[_glapi_get_proc_offset("glVertexAttrib4NsvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4Nub, table[_glapi_get_proc_offset("glVertexAttrib4NubARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4Nubv, table[_glapi_get_proc_offset("glVertexAttrib4NubvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4Nuiv, table[_glapi_get_proc_offset("glVertexAttrib4NuivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4Nusv, table[_glapi_get_proc_offset("glVertexAttrib4NusvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4bv, table[_glapi_get_proc_offset("glVertexAttrib4bvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4d, table[_glapi_get_proc_offset("glVertexAttrib4dARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4dv, table[_glapi_get_proc_offset("glVertexAttrib4dvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4fARB, table[_glapi_get_proc_offset("glVertexAttrib4fARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4fvARB, table[_glapi_get_proc_offset("glVertexAttrib4fvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4ivARB, table[_glapi_get_proc_offset("glVertexAttrib4ivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4sARB, table[_glapi_get_proc_offset("glVertexAttrib4sARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4svARB, table[_glapi_get_proc_offset("glVertexAttrib4svARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4ubvARB, table[_glapi_get_proc_offset("glVertexAttrib4ubvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4uivARB, table[_glapi_get_proc_offset("glVertexAttrib4uivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4usvARB, table[_glapi_get_proc_offset("glVertexAttrib4usvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttribPointerARB, table[_glapi_get_proc_offset("glVertexAttribPointerARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4iv, table[_glapi_get_proc_offset("glVertexAttrib4ivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4s, table[_glapi_get_proc_offset("glVertexAttrib4sARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4sv, table[_glapi_get_proc_offset("glVertexAttrib4svARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4ubv, table[_glapi_get_proc_offset("glVertexAttrib4ubvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4uiv, table[_glapi_get_proc_offset("glVertexAttrib4uivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttrib4usv, table[_glapi_get_proc_offset("glVertexAttrib4usvARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glVertexAttribPointer, table[_glapi_get_proc_offset("glVertexAttribPointerARB")]);
}
TEST_F(IndirectAPI, ARB_occlusion_query)
{
EXPECT_EQ((_glapi_proc) __indirect_glBeginQueryARB, table[_glapi_get_proc_offset("glBeginQueryARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glDeleteQueriesARB, table[_glapi_get_proc_offset("glDeleteQueriesARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glEndQueryARB, table[_glapi_get_proc_offset("glEndQueryARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGenQueriesARB, table[_glapi_get_proc_offset("glGenQueriesARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetQueryObjectivARB, table[_glapi_get_proc_offset("glGetQueryObjectivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetQueryObjectuivARB, table[_glapi_get_proc_offset("glGetQueryObjectuivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetQueryivARB, table[_glapi_get_proc_offset("glGetQueryivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glIsQueryARB, table[_glapi_get_proc_offset("glIsQueryARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glBeginQuery, table[_glapi_get_proc_offset("glBeginQueryARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glDeleteQueries, table[_glapi_get_proc_offset("glDeleteQueriesARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glEndQuery, table[_glapi_get_proc_offset("glEndQueryARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGenQueries, table[_glapi_get_proc_offset("glGenQueriesARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetQueryObjectiv, table[_glapi_get_proc_offset("glGetQueryObjectivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetQueryObjectuiv, table[_glapi_get_proc_offset("glGetQueryObjectuivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetQueryiv, table[_glapi_get_proc_offset("glGetQueryivARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glIsQuery, table[_glapi_get_proc_offset("glIsQueryARB")]);
}
TEST_F(IndirectAPI, ARB_draw_buffers)
{
EXPECT_EQ((_glapi_proc) __indirect_glDrawBuffersARB, table[_glapi_get_proc_offset("glDrawBuffersARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glDrawBuffers, table[_glapi_get_proc_offset("glDrawBuffersARB")]);
}
TEST_F(IndirectAPI, ARB_color_buffer_float)
{
EXPECT_EQ((_glapi_proc) __indirect_glClampColorARB, table[_glapi_get_proc_offset("glClampColorARB")]);
EXPECT_EQ((_glapi_proc) __indirect_glClampColor, table[_glapi_get_proc_offset("glClampColorARB")]);
}
TEST_F(IndirectAPI, ARB_framebuffer_object)
@ -1331,88 +1331,88 @@ TEST_F(IndirectAPI, EXT_vertex_array)
TEST_F(IndirectAPI, EXT_point_parameters)
{
EXPECT_EQ((_glapi_proc) __indirect_glPointParameterfEXT, table[_glapi_get_proc_offset("glPointParameterfEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glPointParameterfvEXT, table[_glapi_get_proc_offset("glPointParameterfvEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glPointParameterf, table[_glapi_get_proc_offset("glPointParameterfEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glPointParameterfv, table[_glapi_get_proc_offset("glPointParameterfvEXT")]);
}
TEST_F(IndirectAPI, EXT_secondary_color)
{
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3bEXT, table[_glapi_get_proc_offset("glSecondaryColor3bEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3bvEXT, table[_glapi_get_proc_offset("glSecondaryColor3bvEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3dEXT, table[_glapi_get_proc_offset("glSecondaryColor3dEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3dvEXT, table[_glapi_get_proc_offset("glSecondaryColor3dvEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3b, table[_glapi_get_proc_offset("glSecondaryColor3bEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3bv, table[_glapi_get_proc_offset("glSecondaryColor3bvEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3d, table[_glapi_get_proc_offset("glSecondaryColor3dEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3dv, table[_glapi_get_proc_offset("glSecondaryColor3dvEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3fEXT, table[_glapi_get_proc_offset("glSecondaryColor3fEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3fvEXT, table[_glapi_get_proc_offset("glSecondaryColor3fvEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3iEXT, table[_glapi_get_proc_offset("glSecondaryColor3iEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3ivEXT, table[_glapi_get_proc_offset("glSecondaryColor3ivEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3sEXT, table[_glapi_get_proc_offset("glSecondaryColor3sEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3svEXT, table[_glapi_get_proc_offset("glSecondaryColor3svEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3ubEXT, table[_glapi_get_proc_offset("glSecondaryColor3ubEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3ubvEXT, table[_glapi_get_proc_offset("glSecondaryColor3ubvEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3uiEXT, table[_glapi_get_proc_offset("glSecondaryColor3uiEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3uivEXT, table[_glapi_get_proc_offset("glSecondaryColor3uivEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3usEXT, table[_glapi_get_proc_offset("glSecondaryColor3usEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3usvEXT, table[_glapi_get_proc_offset("glSecondaryColor3usvEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColorPointerEXT, table[_glapi_get_proc_offset("glSecondaryColorPointerEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3i, table[_glapi_get_proc_offset("glSecondaryColor3iEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3iv, table[_glapi_get_proc_offset("glSecondaryColor3ivEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3s, table[_glapi_get_proc_offset("glSecondaryColor3sEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3sv, table[_glapi_get_proc_offset("glSecondaryColor3svEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3ub, table[_glapi_get_proc_offset("glSecondaryColor3ubEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3ubv, table[_glapi_get_proc_offset("glSecondaryColor3ubvEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3ui, table[_glapi_get_proc_offset("glSecondaryColor3uiEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3uiv, table[_glapi_get_proc_offset("glSecondaryColor3uivEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3us, table[_glapi_get_proc_offset("glSecondaryColor3usEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColor3usv, table[_glapi_get_proc_offset("glSecondaryColor3usvEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glSecondaryColorPointer, table[_glapi_get_proc_offset("glSecondaryColorPointerEXT")]);
}
TEST_F(IndirectAPI, EXT_multi_draw_arrays)
{
EXPECT_EQ((_glapi_proc) __indirect_glMultiDrawArraysEXT, table[_glapi_get_proc_offset("glMultiDrawArraysEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiDrawArrays, table[_glapi_get_proc_offset("glMultiDrawArraysEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glMultiDrawElementsEXT, table[_glapi_get_proc_offset("glMultiDrawElementsEXT")]);
}
TEST_F(IndirectAPI, EXT_fog_coord)
{
EXPECT_EQ((_glapi_proc) __indirect_glFogCoordPointerEXT, table[_glapi_get_proc_offset("glFogCoordPointerEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFogCoorddEXT, table[_glapi_get_proc_offset("glFogCoorddEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFogCoorddvEXT, table[_glapi_get_proc_offset("glFogCoorddvEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFogCoordPointer, table[_glapi_get_proc_offset("glFogCoordPointerEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFogCoordd, table[_glapi_get_proc_offset("glFogCoorddEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFogCoorddv, table[_glapi_get_proc_offset("glFogCoorddvEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFogCoordfEXT, table[_glapi_get_proc_offset("glFogCoordfEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFogCoordfvEXT, table[_glapi_get_proc_offset("glFogCoordfvEXT")]);
}
TEST_F(IndirectAPI, EXT_blend_func_separate)
{
EXPECT_EQ((_glapi_proc) __indirect_glBlendFuncSeparateEXT, table[_glapi_get_proc_offset("glBlendFuncSeparateEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glBlendFuncSeparate, table[_glapi_get_proc_offset("glBlendFuncSeparateEXT")]);
}
TEST_F(IndirectAPI, MESA_window_pos)
{
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2dMESA, table[_glapi_get_proc_offset("glWindowPos2dMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2dvMESA, table[_glapi_get_proc_offset("glWindowPos2dvMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2fMESA, table[_glapi_get_proc_offset("glWindowPos2fMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2fvMESA, table[_glapi_get_proc_offset("glWindowPos2fvMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2iMESA, table[_glapi_get_proc_offset("glWindowPos2iMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2ivMESA, table[_glapi_get_proc_offset("glWindowPos2ivMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2sMESA, table[_glapi_get_proc_offset("glWindowPos2sMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2svMESA, table[_glapi_get_proc_offset("glWindowPos2svMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3dMESA, table[_glapi_get_proc_offset("glWindowPos3dMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3dvMESA, table[_glapi_get_proc_offset("glWindowPos3dvMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3fMESA, table[_glapi_get_proc_offset("glWindowPos3fMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3fvMESA, table[_glapi_get_proc_offset("glWindowPos3fvMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3iMESA, table[_glapi_get_proc_offset("glWindowPos3iMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3ivMESA, table[_glapi_get_proc_offset("glWindowPos3ivMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3sMESA, table[_glapi_get_proc_offset("glWindowPos3sMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3svMESA, table[_glapi_get_proc_offset("glWindowPos3svMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2d, table[_glapi_get_proc_offset("glWindowPos2dMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2dv, table[_glapi_get_proc_offset("glWindowPos2dvMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2f, table[_glapi_get_proc_offset("glWindowPos2fMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2fv, table[_glapi_get_proc_offset("glWindowPos2fvMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2i, table[_glapi_get_proc_offset("glWindowPos2iMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2iv, table[_glapi_get_proc_offset("glWindowPos2ivMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2s, table[_glapi_get_proc_offset("glWindowPos2sMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos2sv, table[_glapi_get_proc_offset("glWindowPos2svMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3d, table[_glapi_get_proc_offset("glWindowPos3dMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3dv, table[_glapi_get_proc_offset("glWindowPos3dvMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3f, table[_glapi_get_proc_offset("glWindowPos3fMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3fv, table[_glapi_get_proc_offset("glWindowPos3fvMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3i, table[_glapi_get_proc_offset("glWindowPos3iMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3iv, table[_glapi_get_proc_offset("glWindowPos3ivMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3s, table[_glapi_get_proc_offset("glWindowPos3sMESA")]);
EXPECT_EQ((_glapi_proc) __indirect_glWindowPos3sv, table[_glapi_get_proc_offset("glWindowPos3svMESA")]);
}
TEST_F(IndirectAPI, NV_vertex_program)
{
EXPECT_EQ((_glapi_proc) __indirect_glAreProgramsResidentNV, table[_glapi_get_proc_offset("glAreProgramsResidentNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glBindProgramNV, table[_glapi_get_proc_offset("glBindProgramNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glDeleteProgramsNV, table[_glapi_get_proc_offset("glDeleteProgramsNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glBindProgramARB, table[_glapi_get_proc_offset("glBindProgramNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glDeleteProgramsARB, table[_glapi_get_proc_offset("glDeleteProgramsNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glExecuteProgramNV, table[_glapi_get_proc_offset("glExecuteProgramNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glGenProgramsNV, table[_glapi_get_proc_offset("glGenProgramsNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glGenProgramsARB, table[_glapi_get_proc_offset("glGenProgramsNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetProgramParameterdvNV, table[_glapi_get_proc_offset("glGetProgramParameterdvNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetProgramParameterfvNV, table[_glapi_get_proc_offset("glGetProgramParameterfvNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetProgramStringNV, table[_glapi_get_proc_offset("glGetProgramStringNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetProgramivNV, table[_glapi_get_proc_offset("glGetProgramivNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetTrackMatrixivNV, table[_glapi_get_proc_offset("glGetTrackMatrixivNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribPointervNV, table[_glapi_get_proc_offset("glGetVertexAttribPointervNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribPointerv, table[_glapi_get_proc_offset("glGetVertexAttribPointervNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribdvNV, table[_glapi_get_proc_offset("glGetVertexAttribdvNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribfvNV, table[_glapi_get_proc_offset("glGetVertexAttribfvNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetVertexAttribivNV, table[_glapi_get_proc_offset("glGetVertexAttribivNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glIsProgramNV, table[_glapi_get_proc_offset("glIsProgramNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glIsProgramARB, table[_glapi_get_proc_offset("glIsProgramNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glLoadProgramNV, table[_glapi_get_proc_offset("glLoadProgramNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glProgramParameters4dvNV, table[_glapi_get_proc_offset("glProgramParameters4dvNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glProgramParameters4fvNV, table[_glapi_get_proc_offset("glProgramParameters4fvNV")]);
@ -1462,8 +1462,8 @@ TEST_F(IndirectAPI, NV_vertex_program)
TEST_F(IndirectAPI, NV_point_sprite)
{
EXPECT_EQ((_glapi_proc) __indirect_glPointParameteriNV, table[_glapi_get_proc_offset("glPointParameteriNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glPointParameterivNV, table[_glapi_get_proc_offset("glPointParameterivNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glPointParameteri, table[_glapi_get_proc_offset("glPointParameteriNV")]);
EXPECT_EQ((_glapi_proc) __indirect_glPointParameteriv, table[_glapi_get_proc_offset("glPointParameterivNV")]);
}
TEST_F(IndirectAPI, EXT_stencil_two_side)
@ -1483,36 +1483,36 @@ TEST_F(IndirectAPI, NV_fragment_program)
TEST_F(IndirectAPI, EXT_blend_equation_separate)
{
EXPECT_EQ((_glapi_proc) __indirect_glBlendEquationSeparateEXT, table[_glapi_get_proc_offset("glBlendEquationSeparateEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glBlendEquationSeparate, table[_glapi_get_proc_offset("glBlendEquationSeparateEXT")]);
}
TEST_F(IndirectAPI, EXT_framebuffer_object)
{
EXPECT_EQ((_glapi_proc) __indirect_glBindFramebufferEXT, table[_glapi_get_proc_offset("glBindFramebufferEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glBindRenderbufferEXT, table[_glapi_get_proc_offset("glBindRenderbufferEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glCheckFramebufferStatusEXT, table[_glapi_get_proc_offset("glCheckFramebufferStatusEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glDeleteFramebuffersEXT, table[_glapi_get_proc_offset("glDeleteFramebuffersEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glDeleteRenderbuffersEXT, table[_glapi_get_proc_offset("glDeleteRenderbuffersEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFramebufferRenderbufferEXT, table[_glapi_get_proc_offset("glFramebufferRenderbufferEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTexture1DEXT, table[_glapi_get_proc_offset("glFramebufferTexture1DEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTexture2DEXT, table[_glapi_get_proc_offset("glFramebufferTexture2DEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTexture3DEXT, table[_glapi_get_proc_offset("glFramebufferTexture3DEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glGenFramebuffersEXT, table[_glapi_get_proc_offset("glGenFramebuffersEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glGenRenderbuffersEXT, table[_glapi_get_proc_offset("glGenRenderbuffersEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glGenerateMipmapEXT, table[_glapi_get_proc_offset("glGenerateMipmapEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetFramebufferAttachmentParameterivEXT, table[_glapi_get_proc_offset("glGetFramebufferAttachmentParameterivEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetRenderbufferParameterivEXT, table[_glapi_get_proc_offset("glGetRenderbufferParameterivEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glIsFramebufferEXT, table[_glapi_get_proc_offset("glIsFramebufferEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glIsRenderbufferEXT, table[_glapi_get_proc_offset("glIsRenderbufferEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glRenderbufferStorageEXT, table[_glapi_get_proc_offset("glRenderbufferStorageEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glBindFramebuffer, table[_glapi_get_proc_offset("glBindFramebufferEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glBindRenderbuffer, table[_glapi_get_proc_offset("glBindRenderbufferEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glCheckFramebufferStatus, table[_glapi_get_proc_offset("glCheckFramebufferStatusEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glDeleteFramebuffers, table[_glapi_get_proc_offset("glDeleteFramebuffersEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glDeleteRenderbuffers, table[_glapi_get_proc_offset("glDeleteRenderbuffersEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFramebufferRenderbuffer, table[_glapi_get_proc_offset("glFramebufferRenderbufferEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTexture1D, table[_glapi_get_proc_offset("glFramebufferTexture1DEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTexture2D, table[_glapi_get_proc_offset("glFramebufferTexture2DEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTexture3D, table[_glapi_get_proc_offset("glFramebufferTexture3DEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glGenFramebuffers, table[_glapi_get_proc_offset("glGenFramebuffersEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glGenRenderbuffers, table[_glapi_get_proc_offset("glGenRenderbuffersEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glGenerateMipmap, table[_glapi_get_proc_offset("glGenerateMipmapEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetFramebufferAttachmentParameteriv, table[_glapi_get_proc_offset("glGetFramebufferAttachmentParameterivEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glGetRenderbufferParameteriv, table[_glapi_get_proc_offset("glGetRenderbufferParameterivEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glIsFramebuffer, table[_glapi_get_proc_offset("glIsFramebufferEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glIsRenderbuffer, table[_glapi_get_proc_offset("glIsRenderbufferEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glRenderbufferStorage, table[_glapi_get_proc_offset("glRenderbufferStorageEXT")]);
}
TEST_F(IndirectAPI, EXT_framebuffer_blit)
{
EXPECT_EQ((_glapi_proc) __indirect_glBlitFramebufferEXT, table[_glapi_get_proc_offset("glBlitFramebufferEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glBlitFramebuffer, table[_glapi_get_proc_offset("glBlitFramebufferEXT")]);
}
TEST_F(IndirectAPI, EXT_texture_array)
{
EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTextureLayerEXT, table[_glapi_get_proc_offset("glFramebufferTextureLayerEXT")]);
EXPECT_EQ((_glapi_proc) __indirect_glFramebufferTextureLayer, table[_glapi_get_proc_offset("glFramebufferTextureLayerEXT")]);
}

View file

@ -10,9 +10,9 @@
<param name="array" type="GLuint"/>
</function>
<function name="DeleteVertexArraysAPPLE" offset="assign" static_dispatch="false">
<function name="DeleteVertexArraysAPPLE" static_dispatch="false" alias="DeleteVertexArrays">
<param name="n" type="GLsizei"/>
<param name="arrays" type="const GLuint *" count="n"/>
<param name="arrays" type="const GLuint *"/>
</function>
<function name="GenVertexArraysAPPLE" offset="assign"
@ -21,7 +21,7 @@
<param name="arrays" type="GLuint *" count="n" output="true"/>
</function>
<function name="IsVertexArrayAPPLE" offset="assign" static_dispatch="false">
<function name="IsVertexArrayAPPLE" static_dispatch="false" alias="IsVertexArray">
<param name="array" type="GLuint"/>
<return type="GLboolean"/>
</function>

View file

@ -14,10 +14,9 @@
<enum name="CLAMP_READ_COLOR_ARB" value="0x891C"/>
<enum name="FIXED_ONLY_ARB" value="0x891D"/>
<function name="ClampColorARB" offset="assign">
<function name="ClampColorARB" alias="ClampColor">
<param name="target" type="GLenum"/>
<param name="clamp" type="GLenum"/>
<glx rop="234"/>
</function>
</category>

View file

@ -55,10 +55,9 @@
<size name="Get" mode="get"/>
</enum>
<function name="DrawBuffersARB" offset="assign">
<param name="n" type="GLsizei" counter="true"/>
<param name="bufs" type="const GLenum *" count="n"/>
<glx rop="233" large="true"/>
<function name="DrawBuffersARB" alias="DrawBuffers">
<param name="n" type="GLsizei"/>
<param name="bufs" type="const GLenum *"/>
</function>
</category>
@ -115,7 +114,7 @@
<size name="Get" mode="get"/>
</enum>
<function name="DrawBuffersATI" alias="DrawBuffersARB">
<function name="DrawBuffersATI" alias="DrawBuffers">
<param name="n" type="GLsizei" counter="true"/>
<param name="bufs" type="const GLenum *" count="n"/>
</function>

View file

@ -8,25 +8,24 @@
<category name="GL_ARB_draw_buffers_blend" number="69">
<function name="BlendEquationiARB" offset="assign" mesa_name="-ARB">
<function name="BlendEquationiARB" offset="assign">
<param name="buf" type="GLuint"/>
<param name="mode" type="GLenum"/>
</function>
<function name="BlendEquationSeparateiARB" offset="assign"
mesa_name="-ARB">
<function name="BlendEquationSeparateiARB" offset="assign">
<param name="buf" type="GLuint"/>
<param name="modeRGB" type="GLenum"/>
<param name="modeA" type="GLenum"/>
</function>
<function name="BlendFunciARB" offset="assign" mesa_name="-ARB">
<function name="BlendFunciARB" offset="assign">
<param name="buf" type="GLuint"/>
<param name="src" type="GLenum"/>
<param name="dst" type="GLenum"/>
</function>
<function name="BlendFuncSeparateiARB" offset="assign" mesa_name="-ARB">
<function name="BlendFuncSeparateiARB" offset="assign">
<param name="buf" type="GLuint"/>
<param name="srcRGB" type="GLenum"/>
<param name="dstRGB" type="GLenum"/>

View file

@ -140,33 +140,38 @@
<function name="IsRenderbuffer" alias="IsRenderbufferEXT" es2="2.0">
<function name="IsRenderbuffer" es2="2.0" offset="assign">
<param name="renderbuffer" type="GLuint"/>
<return type="GLboolean"/>
<glx vendorpriv="1422"/>
</function>
<function name="BindRenderbuffer" alias="BindRenderbufferEXT" es2="2.0">
<function name="BindRenderbuffer" es2="2.0" offset="assign">
<param name="target" type="GLenum"/>
<param name="renderbuffer" type="GLuint"/>
<glx rop="4316"/>
</function>
<function name="DeleteRenderbuffers" alias="DeleteRenderbuffersEXT"
es2="2.0">
<function name="DeleteRenderbuffers"
es2="2.0" offset="assign">
<param name="n" type="GLsizei" counter="true"/>
<param name="renderbuffers" type="const GLuint *" count="n"/>
<glx rop="4317"/>
</function>
<function name="GenRenderbuffers" alias="GenRenderbuffersEXT" es2="2.0">
<function name="GenRenderbuffers" es2="2.0" offset="assign">
<param name="n" type="GLsizei" counter="true"/>
<param name="renderbuffers" type="GLuint *" count="n" output="true"/>
<glx vendorpriv="1423" always_array="true"/>
</function>
<function name="RenderbufferStorage" alias="RenderbufferStorageEXT"
es2="2.0">
<function name="RenderbufferStorage"
es2="2.0" offset="assign">
<param name="target" type="GLenum"/>
<param name="internalformat" type="GLenum"/>
<param name="width" type="GLsizei"/>
<param name="height" type="GLsizei"/>
<glx rop="4318"/>
</function>
<function name="RenderbufferStorageMultisample" offset="assign" es2="3.0">
@ -178,91 +183,101 @@
<glx rop="4331"/>
</function>
<function name="GetRenderbufferParameteriv"
alias="GetRenderbufferParameterivEXT" es2="2.0">
<function name="GetRenderbufferParameteriv" es2="2.0" offset="assign">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLint *" output="true"/>
<glx vendorpriv="1424"/>
</function>
<function name="IsFramebuffer" alias="IsFramebufferEXT" es2="2.0">
<function name="IsFramebuffer" es2="2.0" offset="assign">
<param name="framebuffer" type="GLuint"/>
<return type="GLboolean"/>
<glx vendorpriv="1425"/>
</function>
<function name="BindFramebuffer" alias="BindFramebufferEXT" es2="2.0">
<function name="BindFramebuffer" es2="2.0" offset="assign">
<param name="target" type="GLenum"/>
<param name="framebuffer" type="GLuint"/>
<glx rop="4319"/>
</function>
<function name="DeleteFramebuffers" alias="DeleteFramebuffersEXT"
es2="2.0">
<function name="DeleteFramebuffers"
es2="2.0" offset="assign">
<param name="n" type="GLsizei" counter="true"/>
<param name="framebuffers" type="const GLuint *" count="n"/>
<glx rop="4320"/>
</function>
<function name="GenFramebuffers" alias="GenFramebuffersEXT" es2="2.0">
<function name="GenFramebuffers" es2="2.0" offset="assign">
<param name="n" type="GLsizei" counter="true"/>
<param name="framebuffers" type="GLuint *" count="n" output="true"/>
<glx vendorpriv="1426" always_array="true"/>
</function>
<function name="CheckFramebufferStatus" alias="CheckFramebufferStatusEXT"
es2="2.0">
<function name="CheckFramebufferStatus"
es2="2.0" offset="assign">
<param name="target" type="GLenum"/>
<return type="GLenum"/>
<glx vendorpriv="1427"/>
</function>
<function name="FramebufferTexture1D" alias="FramebufferTexture1DEXT">
<function name="FramebufferTexture1D" offset="assign">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="textarget" type="GLenum"/>
<param name="texture" type="GLuint"/>
<param name="level" type="GLint"/>
<glx rop="4321"/>
</function>
<function name="FramebufferTexture2D" alias="FramebufferTexture2DEXT"
es2="2.0">
<function name="FramebufferTexture2D"
es2="2.0" offset="assign">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="textarget" type="GLenum"/>
<param name="texture" type="GLuint"/>
<param name="level" type="GLint"/>
<glx rop="4322"/>
</function>
<function name="FramebufferTexture3D" alias="FramebufferTexture3DEXT">
<function name="FramebufferTexture3D" offset="assign">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="textarget" type="GLenum"/>
<param name="texture" type="GLuint"/>
<param name="level" type="GLint"/>
<param name="zoffset" type="GLint"/>
<glx rop="4323"/>
</function>
<function name="FramebufferTextureLayer" alias="FramebufferTextureLayerEXT" es2="3.0">
<function name="FramebufferTextureLayer" es2="3.0" offset="assign">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="texture" type="GLuint"/>
<param name="level" type="GLint"/>
<param name="layer" type="GLint"/>
<glx rop="237"/>
</function>
<function name="FramebufferRenderbuffer" alias="FramebufferRenderbufferEXT"
es2="2.0">
<function name="FramebufferRenderbuffer"
es2="2.0" offset="assign">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="renderbuffertarget" type="GLenum"/>
<param name="renderbuffer" type="GLuint"/>
<glx rop="4324"/>
</function>
<function name="GetFramebufferAttachmentParameteriv"
alias="GetFramebufferAttachmentParameterivEXT" es2="2.0">
<function name="GetFramebufferAttachmentParameteriv" es2="2.0" offset="assign">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLint *" output="true"/>
<glx vendorpriv="1428"/>
</function>
<function name="BlitFramebuffer" alias="BlitFramebufferEXT" es2="3.0">
<function name="BlitFramebuffer" es2="3.0" offset="assign">
<param name="srcX0" type="GLint"/>
<param name="srcY0" type="GLint"/>
<param name="srcX1" type="GLint"/>
@ -273,10 +288,12 @@
<param name="dstY1" type="GLint"/>
<param name="mask" type="GLbitfield"/>
<param name="filter" type="GLenum"/>
<glx rop="4330"/>
</function>
<function name="GenerateMipmap" alias="GenerateMipmapEXT" es2="2.0">
<function name="GenerateMipmap" es2="2.0" offset="assign">
<param name="target" type="GLenum"/>
<glx rop="4325"/>
</function>
</category>

View file

@ -38,7 +38,7 @@
<param name="texture" type="GLuint"/>
<param name="level" type="GLint"/>
</function>
<function name="FramebufferTextureLayerARB" alias="FramebufferTextureLayerEXT">
<function name="FramebufferTextureLayerARB" alias="FramebufferTextureLayer">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="texture" type="GLuint"/>

View file

@ -10,7 +10,7 @@
<enum name="VERTEX_ATTRIB_ARRAY_DIVISOR_ARB" value="0x88FE"/>
<function name="VertexAttribDivisorARB" offset="assign" mesa_name="-ARB">
<function name="VertexAttribDivisorARB" alias="VertexAttribDivisor">
<param name="index" type="GLuint"/>
<param name="divisor" type="GLuint"/>
</function>

View file

@ -11,7 +11,7 @@
<enum name="TEXTURE_BUFFER_DATA_STORE_BINDING_ARB" value="0x8C2D"/>
<enum name="TEXTURE_BUFFER_FORMAT_ARB" value="0x8C2E"/>
<function name="TexBufferARB" offset="assign" mesa_name="-ARB">
<function name="TexBufferARB" alias="TexBuffer">
<param name="target" type="GLenum"/>
<param name="internalFormat" type="GLenum"/>
<param name="buffer" type="GLuint"/>

View file

@ -14,9 +14,9 @@
<param name="array" type="GLuint"/>
</function>
<function name="DeleteVertexArrays" alias="DeleteVertexArraysAPPLE" es2="3.0">
<function name="DeleteVertexArrays" es2="3.0" offset="assign">
<param name="n" type="GLsizei"/>
<param name="arrays" type="const GLuint *"/>
<param name="arrays" type="const GLuint *" count="n"/>
</function>
<function name="GenVertexArrays" offset="assign" es2="3.0">
@ -24,7 +24,7 @@
<param name="arrays" type="GLuint *"/>
</function>
<function name="IsVertexArray" alias="IsVertexArrayAPPLE" es2="3.0">
<function name="IsVertexArray" es2="3.0" offset="assign">
<param name="array" type="GLuint"/>
<return type="GLboolean"/>
</function>

View file

@ -8,7 +8,7 @@
<category name="GL_EXT_draw_buffers2" number="340">
<function name="ColorMaskIndexedEXT" offset="assign" mesa_name="-EXT">
<function name="ColorMaskIndexedEXT" alias="ColorMaski">
<param name="buf" type="GLuint"/>
<param name="r" type="GLboolean"/>
<param name="g" type="GLboolean"/>
@ -16,29 +16,29 @@
<param name="a" type="GLboolean"/>
</function>
<function name="GetBooleanIndexedvEXT" offset="assign" mesa_name="-EXT">
<function name="GetBooleanIndexedvEXT" alias="GetBooleani_v">
<param name="value" type="GLenum"/>
<param name="index" type="GLuint"/>
<param name="data" type="GLboolean *"/>
</function>
<function name="GetIntegerIndexedvEXT" offset="assign" mesa_name="-EXT">
<function name="GetIntegerIndexedvEXT" alias="GetIntegeri_v">
<param name="value" type="GLenum"/>
<param name="index" type="GLuint"/>
<param name="data" type="GLint *"/>
</function>
<function name="EnableIndexedEXT" offset="assign" mesa_name="-EXT">
<function name="EnableIndexedEXT" alias="Enablei">
<param name="target" type="GLenum"/>
<param name="index" type="GLuint"/>
</function>
<function name="DisableIndexedEXT" offset="assign" mesa_name="-EXT">
<function name="DisableIndexedEXT" alias="Disablei">
<param name="target" type="GLenum"/>
<param name="index" type="GLuint"/>
</function>
<function name ="IsEnabledIndexedEXT" offset="assign" mesa_name="-EXT">
<function name ="IsEnabledIndexedEXT" alias="IsEnabledi">
<param name="target" type="GLenum"/>
<param name="index" type="GLuint"/>
<return type="GLboolean"/>

View file

@ -15,19 +15,19 @@
<enum name="STENCIL_INDEX16_EXT" value="0x8D49"/>
<enum name="FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT" count="1" value="0x8CD0">
<size name="GetFramebufferAttachmentParameterivEXT" mode="get"/>
<size name="GetFramebufferAttachmentParameteriv" mode="get"/>
</enum>
<enum name="FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT" count="1" value="0x8CD1">
<size name="GetFramebufferAttachmentParameterivEXT" mode="get"/>
<size name="GetFramebufferAttachmentParameteriv" mode="get"/>
</enum>
<enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT" count="1" value="0x8CD2">
<size name="GetFramebufferAttachmentParameterivEXT" mode="get"/>
<size name="GetFramebufferAttachmentParameteriv" mode="get"/>
</enum>
<enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT" count="1" value="0x8CD3">
<size name="GetFramebufferAttachmentParameterivEXT" mode="get"/>
<size name="GetFramebufferAttachmentParameteriv" mode="get"/>
</enum>
<enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT" count="1" value="0x8CD4">
<size name="GetFramebufferAttachmentParameterivEXT" mode="get"/>
<size name="GetFramebufferAttachmentParameteriv" mode="get"/>
</enum>
<enum name="COLOR_ATTACHMENT0_EXT" value="0x8CE0"/>
@ -73,122 +73,105 @@
</enum>
<enum name="INVALID_FRAMEBUFFER_OPERATION_EXT" value="0x0506"/>
<function name="IsRenderbufferEXT" offset="assign">
<function name="IsRenderbufferEXT" alias="IsRenderbuffer">
<param name="renderbuffer" type="GLuint"/>
<return type="GLboolean"/>
<glx vendorpriv="1422"/>
</function>
<function name="BindRenderbufferEXT" offset="assign">
<function name="BindRenderbufferEXT" alias="BindRenderbuffer">
<param name="target" type="GLenum"/>
<param name="renderbuffer" type="GLuint"/>
<glx rop="4316"/>
</function>
<function name="DeleteRenderbuffersEXT" offset="assign">
<param name="n" type="GLsizei" counter="true"/>
<param name="renderbuffers" type="const GLuint *" count="n"/>
<glx rop="4317"/>
<function name="DeleteRenderbuffersEXT" alias="DeleteRenderbuffers">
<param name="n" type="GLsizei"/>
<param name="renderbuffers" type="const GLuint *"/>
</function>
<function name="GenRenderbuffersEXT" offset="assign">
<param name="n" type="GLsizei" counter="true"/>
<param name="renderbuffers" type="GLuint *" count="n" output="true"/>
<glx vendorpriv="1423" always_array="true"/>
<function name="GenRenderbuffersEXT" alias="GenRenderbuffers">
<param name="n" type="GLsizei"/>
<param name="renderbuffers" type="GLuint *"/>
</function>
<function name="RenderbufferStorageEXT" offset="assign">
<function name="RenderbufferStorageEXT" alias="RenderbufferStorage">
<param name="target" type="GLenum"/>
<param name="internalformat" type="GLenum"/>
<param name="width" type="GLsizei"/>
<param name="height" type="GLsizei"/>
<glx rop="4318"/>
</function>
<function name="GetRenderbufferParameterivEXT" offset="assign">
<function name="GetRenderbufferParameterivEXT" alias="GetRenderbufferParameteriv">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLint *" output="true"/>
<glx vendorpriv="1424"/>
<param name="params" type="GLint *"/>
</function>
<function name="IsFramebufferEXT" offset="assign">
<function name="IsFramebufferEXT" alias="IsFramebuffer">
<param name="framebuffer" type="GLuint"/>
<return type="GLboolean"/>
<glx vendorpriv="1425"/>
</function>
<function name="BindFramebufferEXT" offset="assign">
<function name="BindFramebufferEXT" alias="BindFramebuffer">
<param name="target" type="GLenum"/>
<param name="framebuffer" type="GLuint"/>
<glx rop="4319"/>
</function>
<function name="DeleteFramebuffersEXT" offset="assign">
<param name="n" type="GLsizei" counter="true"/>
<param name="framebuffers" type="const GLuint *" count="n"/>
<glx rop="4320"/>
<function name="DeleteFramebuffersEXT" alias="DeleteFramebuffers">
<param name="n" type="GLsizei"/>
<param name="framebuffers" type="const GLuint *"/>
</function>
<function name="GenFramebuffersEXT" offset="assign">
<param name="n" type="GLsizei" counter="true"/>
<param name="framebuffers" type="GLuint *" count="n" output="true"/>
<glx vendorpriv="1426" always_array="true"/>
<function name="GenFramebuffersEXT" alias="GenFramebuffers">
<param name="n" type="GLsizei"/>
<param name="framebuffers" type="GLuint *"/>
</function>
<function name="CheckFramebufferStatusEXT" offset="assign">
<function name="CheckFramebufferStatusEXT" alias="CheckFramebufferStatus">
<param name="target" type="GLenum"/>
<return type="GLenum"/>
<glx vendorpriv="1427"/>
</function>
<function name="FramebufferTexture1DEXT" offset="assign">
<function name="FramebufferTexture1DEXT" alias="FramebufferTexture1D">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="textarget" type="GLenum"/>
<param name="texture" type="GLuint"/>
<param name="level" type="GLint"/>
<glx rop="4321"/>
</function>
<function name="FramebufferTexture2DEXT" offset="assign">
<function name="FramebufferTexture2DEXT" alias="FramebufferTexture2D">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="textarget" type="GLenum"/>
<param name="texture" type="GLuint"/>
<param name="level" type="GLint"/>
<glx rop="4322"/>
</function>
<function name="FramebufferTexture3DEXT" offset="assign">
<function name="FramebufferTexture3DEXT" alias="FramebufferTexture3D">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="textarget" type="GLenum"/>
<param name="texture" type="GLuint"/>
<param name="level" type="GLint"/>
<param name="zoffset" type="GLint"/>
<glx rop="4323"/>
</function>
<function name="FramebufferRenderbufferEXT" offset="assign">
<function name="FramebufferRenderbufferEXT" alias="FramebufferRenderbuffer">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="renderbuffertarget" type="GLenum"/>
<param name="renderbuffer" type="GLuint"/>
<glx rop="4324"/>
</function>
<function name="GetFramebufferAttachmentParameterivEXT" offset="assign">
<function name="GetFramebufferAttachmentParameterivEXT" alias="GetFramebufferAttachmentParameteriv">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLint *" output="true"/>
<glx vendorpriv="1428"/>
<param name="params" type="GLint *"/>
</function>
<function name="GenerateMipmapEXT" offset="assign">
<function name="GenerateMipmapEXT" alias="GenerateMipmap">
<param name="target" type="GLenum"/>
<glx rop="4325"/>
</function>
</category>
@ -201,7 +184,7 @@
<enum name="READ_FRAMEBUFFER_BINDING_EXT" count="1" value="0x8CAA">
<size name="Get" mode="get"/>
</enum>
<function name="BlitFramebufferEXT" offset="assign" static_dispatch="false">
<function name="BlitFramebufferEXT" static_dispatch="false" alias="BlitFramebuffer">
<param name="srcX0" type="GLint"/>
<param name="srcY0" type="GLint"/>
<param name="srcX1" type="GLint"/>
@ -212,7 +195,6 @@
<param name="dstY1" type="GLint"/>
<param name="mask" type="GLbitfield"/>
<param name="filter" type="GLenum"/>
<glx rop="4330"/>
</function>
</category>

View file

@ -96,8 +96,7 @@
<param name="w" type="GLuint"/>
</function>
<function name="VertexAttribI1ivEXT" offset="assign" exec="loopback"
mesa_name="-EXT">
<function name="VertexAttribI1ivEXT" alias="VertexAttribI1iv">
<param name="index" type="GLuint"/>
<param name="v" type="const GLint *"/>
</function>
@ -117,8 +116,7 @@
<param name="v" type="const GLint *"/>
</function>
<function name="VertexAttribI1uivEXT" offset="assign" exec="loopback"
mesa_name="-EXT">
<function name="VertexAttribI1uivEXT" alias="VertexAttribI1uiv">
<param name="index" type="GLuint"/>
<param name="v" type="const GLuint *"/>
</function>
@ -138,31 +136,27 @@
<param name="v" type="const GLuint *"/>
</function>
<function name="VertexAttribI4bvEXT" offset="assign" exec="loopback"
mesa_name="-EXT">
<function name="VertexAttribI4bvEXT" alias="VertexAttribI4bv">
<param name="index" type="GLuint"/>
<param name="v" type="const GLbyte *"/>
</function>
<function name="VertexAttribI4svEXT" offset="assign" exec="loopback"
mesa_name="-EXT">
<function name="VertexAttribI4svEXT" alias="VertexAttribI4sv">
<param name="index" type="GLuint"/>
<param name="v" type="const GLshort *"/>
</function>
<function name="VertexAttribI4ubvEXT" offset="assign" exec="loopback"
mesa_name="-EXT">
<function name="VertexAttribI4ubvEXT" alias="VertexAttribI4ubv">
<param name="index" type="GLuint"/>
<param name="v" type="const GLubyte *"/>
</function>
<function name="VertexAttribI4usvEXT" offset="assign" exec="loopback"
mesa_name="-EXT">
<function name="VertexAttribI4usvEXT" alias="VertexAttribI4usv">
<param name="index" type="GLuint"/>
<param name="v" type="const GLushort *"/>
</function>
<function name="VertexAttribIPointerEXT" offset="assign" mesa_name="-EXT">
<function name="VertexAttribIPointerEXT" alias="VertexAttribIPointer">
<param name="index" type="GLuint"/>
<param name="size" type="GLint"/>
<param name="type" type="GLenum"/>
@ -170,37 +164,37 @@
<param name="pointer" type="const GLvoid *"/>
</function>
<function name="GetVertexAttribIivEXT" offset="assign" mesa_name="-EXT">
<function name="GetVertexAttribIivEXT" alias="GetVertexAttribIiv">
<param name="index" type="GLuint"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLint *"/>
</function>
<function name="GetVertexAttribIuivEXT" offset="assign" mesa_name="-EXT">
<function name="GetVertexAttribIuivEXT" alias="GetVertexAttribIuiv">
<param name="index" type="GLuint"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLuint *"/>
</function>
<function name="Uniform1uiEXT" offset="assign" mesa_name="-EXT">
<function name="Uniform1uiEXT" alias="Uniform1ui">
<param name="location" type="GLint"/>
<param name="x" type="GLuint"/>
</function>
<function name="Uniform2uiEXT" offset="assign" mesa_name="-EXT">
<function name="Uniform2uiEXT" alias="Uniform2ui">
<param name="location" type="GLint"/>
<param name="x" type="GLuint"/>
<param name="y" type="GLuint"/>
</function>
<function name="Uniform3uiEXT" offset="assign" mesa_name="-EXT">
<function name="Uniform3uiEXT" alias="Uniform3ui">
<param name="location" type="GLint"/>
<param name="x" type="GLuint"/>
<param name="y" type="GLuint"/>
<param name="z" type="GLuint"/>
</function>
<function name="Uniform4uiEXT" offset="assign" mesa_name="-EXT">
<function name="Uniform4uiEXT" alias="Uniform4ui">
<param name="location" type="GLint"/>
<param name="x" type="GLuint"/>
<param name="y" type="GLuint"/>
@ -208,43 +202,43 @@
<param name="w" type="GLuint"/>
</function>
<function name="Uniform1uivEXT" offset="assign" mesa_name="-EXT">
<function name="Uniform1uivEXT" alias="Uniform1uiv">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLuint *"/>
</function>
<function name="Uniform2uivEXT" offset="assign" mesa_name="-EXT">
<function name="Uniform2uivEXT" alias="Uniform2uiv">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLuint *"/>
</function>
<function name="Uniform3uivEXT" offset="assign" mesa_name="-EXT">
<function name="Uniform3uivEXT" alias="Uniform3uiv">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLuint *"/>
</function>
<function name="Uniform4uivEXT" offset="assign" mesa_name="-EXT">
<function name="Uniform4uivEXT" alias="Uniform4uiv">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLuint *"/>
</function>
<function name="GetUniformuivEXT" offset="assign" mesa_name="-EXT">
<function name="GetUniformuivEXT" alias="GetUniformuiv">
<param name="program" type="GLuint"/>
<param name="location" type="GLint"/>
<param name="params" type="GLuint *"/>
</function>
<function name="BindFragDataLocationEXT" offset="assign" mesa_name="-EXT">
<function name="BindFragDataLocationEXT" alias="BindFragDataLocation">
<param name="program" type="GLuint"/>
<param name="colorNumber" type="GLuint"/>
<param name="name" type="const GLchar *"/>
</function>
<function name="GetFragDataLocationEXT" offset="assign" mesa_name="-EXT">
<function name="GetFragDataLocationEXT" alias="GetFragDataLocation">
<return type="GLint"/>
<param name="program" type="GLuint"/>
<param name="name" type="const GLchar *"/>

View file

@ -13,7 +13,7 @@
<enum name="PROVOKING_VERTEX_EXT" value="0x8E4F"/>
<enum name="QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION_EXT" value="0x8E4C"/>
<function name="ProvokingVertexEXT" offset="assign">
<function name="ProvokingVertexEXT" alias="ProvokingVertex">
<param name="mode" type="GLenum"/>
</function>
@ -26,7 +26,7 @@
<enum name="PROVOKING_VERTEX" value="0x8E4F"/>
<enum name="QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION" value="0x8E4C"/>
<function name="ProvokingVertex" alias="ProvokingVertexEXT">
<function name="ProvokingVertex" offset="assign">
<param name="mode" type="GLenum"/>
</function>

View file

@ -26,16 +26,15 @@
</enum>
<enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT" count="1" value="0x8CD4">
<size name="GetFramebufferAttachmentParameterivEXT" mode="get"/>
<size name="GetFramebufferAttachmentParameteriv" mode="get"/>
</enum>
<function name="FramebufferTextureLayerEXT" offset="assign">
<function name="FramebufferTextureLayerEXT" alias="FramebufferTextureLayer">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
<param name="texture" type="GLuint"/>
<param name="level" type="GLint"/>
<param name="layer" type="GLint"/>
<glx rop="237"/>
</function>
</category>

View file

@ -69,25 +69,25 @@
<param name="a" type="GLuint"/>
</function>
<function name="TexParameterIivEXT" offset="assign" mesa_name="-EXT">
<function name="TexParameterIivEXT" alias="TexParameterIiv">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLint *"/>
</function>
<function name="TexParameterIuivEXT" offset="assign" mesa_name="-EXT">
<function name="TexParameterIuivEXT" alias="TexParameterIuiv">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLuint *"/>
</function>
<function name="GetTexParameterIivEXT" offset="assign" mesa_name="-EXT">
<function name="GetTexParameterIivEXT" alias="GetTexParameterIiv">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLint *"/>
</function>
<function name="GetTexParameterIuivEXT" offset="assign" mesa_name="-EXT">
<function name="GetTexParameterIuivEXT" alias="GetTexParameterIuiv">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLuint *"/>

View file

@ -24,7 +24,7 @@
<enum name="TRANSFORM_FEEDBACK_BUFFER_MODE_EXT" value="0x8C7F"/>
<enum name="TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH_EXT" value="0x8C76"/>
<function name="BindBufferRangeEXT" offset="assign" mesa_name="-EXT">
<function name="BindBufferRangeEXT" alias="BindBufferRange">
<param name="target" type="GLenum"/>
<param name="index" type="GLuint"/>
<param name="buffer" type="GLuint"/>
@ -39,29 +39,27 @@
<param name="offset" type="GLintptr"/>
</function>
<function name="BindBufferBaseEXT" offset="assign" mesa_name="-EXT">
<function name="BindBufferBaseEXT" alias="BindBufferBase">
<param name="target" type="GLenum"/>
<param name="index" type="GLuint"/>
<param name="buffer" type="GLuint"/>
</function>
<function name="BeginTransformFeedbackEXT" offset="assign" mesa_name="-EXT">
<function name="BeginTransformFeedbackEXT" alias="BeginTransformFeedback">
<param name="mode" type="GLenum"/>
</function>
<function name="EndTransformFeedbackEXT" offset="assign" mesa_name="-EXT">
<function name="EndTransformFeedbackEXT" alias="EndTransformFeedback">
</function>
<function name="TransformFeedbackVaryingsEXT" offset="assign"
mesa_name="-EXT">
<function name="TransformFeedbackVaryingsEXT" alias="TransformFeedbackVaryings">
<param name="program" type="GLuint"/>
<param name="count" type="GLsizei"/>
<param name="varyings" type="const char **"/>
<param name="bufferMode" type="GLenum"/>
</function>
<function name="GetTransformFeedbackVaryingEXT" offset="assign"
mesa_name="-EXT">
<function name="GetTransformFeedbackVaryingEXT" alias="GetTransformFeedbackVarying">
<param name="program" type="GLuint"/>
<param name="index" type="GLuint"/>
<param name="bufSize" type="GLsizei"/>

View file

@ -150,14 +150,15 @@
<return type="const GLubyte *"/>
</function>
<function name="ClampColor" alias="ClampColorARB">
<function name="ClampColor" offset="assign">
<param name="target" type="GLenum"/>
<param name="clamp" type="GLenum"/>
<glx rop="234"/>
</function>
<!-- These functions alias ones form GL_ARB_draw_buffers2 -->
<function name="ColorMaski" alias="ColorMaskIndexedEXT">
<function name="ColorMaski" offset="assign">
<param name="buf" type="GLuint"/>
<param name="r" type="GLboolean"/>
<param name="g" type="GLboolean"/>
@ -165,29 +166,29 @@
<param name="a" type="GLboolean"/>
</function>
<function name="GetBooleani_v" alias="GetBooleanIndexedvEXT">
<function name="GetBooleani_v" offset="assign">
<param name="value" type="GLenum"/>
<param name="index" type="GLuint"/>
<param name="data" type="GLboolean *"/>
</function>
<function name="GetIntegeri_v" alias="GetIntegerIndexedvEXT" es2="3.0">
<function name="GetIntegeri_v" es2="3.0" offset="assign">
<param name="value" type="GLenum"/>
<param name="index" type="GLuint"/>
<param name="data" type="GLint *"/>
</function>
<function name="Enablei" alias="EnableIndexedEXT">
<function name="Enablei" offset="assign">
<param name="target" type="GLenum"/>
<param name="index" type="GLuint"/>
</function>
<function name="Disablei" alias="DisableIndexedEXT">
<function name="Disablei" offset="assign">
<param name="target" type="GLenum"/>
<param name="index" type="GLuint"/>
</function>
<function name="IsEnabledi" alias="IsEnabledIndexedEXT">
<function name="IsEnabledi" offset="assign">
<param name="target" type="GLenum"/>
<param name="index" type="GLuint"/>
<return type="GLboolean"/>
@ -195,26 +196,26 @@
<!-- These functions alias ones form GL_EXT_transform_feedback -->
<function name="GetFragDataLocation" alias="GetFragDataLocationEXT" es2="3.0">
<function name="GetFragDataLocation" es2="3.0" offset="assign">
<param name="program" type="GLuint"/>
<param name="name" type="const GLchar *"/>
<return type="GLint"/>
</function>
<function name="BindFragDataLocation" alias="BindFragDataLocationEXT">
<function name="BindFragDataLocation" offset="assign">
<param name="program" type="GLuint"/>
<param name="colorNumber" type="GLuint"/>
<param name="name" type="const GLchar *"/>
</function>
<function name="BeginTransformFeedback" alias="BeginTransformFeedbackEXT" es2="3.0">
<function name="BeginTransformFeedback" es2="3.0" offset="assign">
<param name="mode" type="GLenum"/>
</function>
<function name="EndTransformFeedback" alias="EndTransformFeedbackEXT" es2="3.0">
<function name="EndTransformFeedback" es2="3.0" offset="assign">
</function>
<function name="BindBufferRange" alias="BindBufferRangeEXT" es2="3.0">
<function name="BindBufferRange" es2="3.0" offset="assign">
<param name="target" type="GLenum"/>
<param name="index" type="GLuint"/>
<param name="buffer" type="GLuint"/>
@ -222,20 +223,20 @@
<param name="size" type="GLsizeiptr"/>
</function>
<function name="BindBufferBase" alias="BindBufferBaseEXT" es2="3.0">
<function name="BindBufferBase" es2="3.0" offset="assign">
<param name="target" type="GLenum"/>
<param name="index" type="GLuint"/>
<param name="buffer" type="GLuint"/>
</function>
<function name="TransformFeedbackVaryings" alias="TransformFeedbackVaryingsEXT" es2="3.0">
<function name="TransformFeedbackVaryings" es2="3.0" offset="assign">
<param name="program" type="GLuint"/>
<param name="count" type="GLsizei"/>
<param name="varyings" type="const GLchar * const *"/>
<param name="bufferMode" type="GLenum"/>
</function>
<function name="GetTransformFeedbackVarying" alias="GetTransformFeedbackVaryingEXT" es2="3.0">
<function name="GetTransformFeedbackVarying" es2="3.0" offset="assign">
<param name="program" type="GLuint"/>
<param name="index" type="GLuint"/>
<param name="bufSize" type="GLsizei"/>
@ -247,17 +248,17 @@
<!-- These functions alias ones from GL_NV_conditional_render -->
<function name="BeginConditionalRender" alias="BeginConditionalRenderNV">
<function name="BeginConditionalRender" offset="assign">
<param name="query" type="GLuint"/>
<param name="mode" type="GLenum"/>
</function>
<function name="EndConditionalRender" alias="EndConditionalRenderNV">
<function name="EndConditionalRender" offset="assign">
</function>
<!-- These functions alias ones from GL_EXT_gpu_shader4 -->
<function name="VertexAttribIPointer" alias="VertexAttribIPointerEXT" es2="3.0">
<function name="VertexAttribIPointer" es2="3.0" offset="assign">
<param name="index" type="GLuint"/>
<param name="size" type="GLint"/>
<param name="type" type="GLenum"/>
@ -265,13 +266,13 @@
<param name="pointer" type="const GLvoid *"/>
</function>
<function name="GetVertexAttribIiv" alias="GetVertexAttribIivEXT" es2="3.0">
<function name="GetVertexAttribIiv" es2="3.0" offset="assign">
<param name="index" type="GLuint"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLint *"/>
</function>
<function name="GetVertexAttribIuiv" alias="GetVertexAttribIuivEXT" es2="3.0">
<function name="GetVertexAttribIuiv" es2="3.0" offset="assign">
<param name="index" type="GLuint"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLuint *"/>
@ -329,7 +330,7 @@
<param name="w" type="GLuint"/>
</function>
<function name="VertexAttribI1iv" alias="VertexAttribI1ivEXT">
<function name="VertexAttribI1iv" offset="assign">
<param name="index" type="GLuint"/>
<param name="v" type="const GLint *"/>
</function>
@ -349,7 +350,7 @@
<param name="v" type="const GLint *"/>
</function>
<function name="VertexAttribI1uiv" alias="VertexAttribI1uivEXT">
<function name="VertexAttribI1uiv" offset="assign">
<param name="index" type="GLuint"/>
<param name="v" type="const GLuint *"/>
</function>
@ -369,51 +370,51 @@
<param name="v" type="const GLuint *"/>
</function>
<function name="VertexAttribI4bv" alias="VertexAttribI4bvEXT">
<function name="VertexAttribI4bv" offset="assign">
<param name="index" type="GLuint"/>
<param name="v" type="const GLbyte *"/>
</function>
<function name="VertexAttribI4sv" alias="VertexAttribI4svEXT">
<function name="VertexAttribI4sv" offset="assign">
<param name="index" type="GLuint"/>
<param name="v" type="const GLshort *"/>
</function>
<function name="VertexAttribI4ubv" alias="VertexAttribI4ubvEXT">
<function name="VertexAttribI4ubv" offset="assign">
<param name="index" type="GLuint"/>
<param name="v" type="const GLubyte *"/>
</function>
<function name="VertexAttribI4usv" alias="VertexAttribI4usvEXT">
<function name="VertexAttribI4usv" offset="assign">
<param name="index" type="GLuint"/>
<param name="v" type="const GLushort *"/>
</function>
<function name="GetUniformuiv" alias="GetUniformuivEXT" es2="3.0">
<function name="GetUniformuiv" es2="3.0" offset="assign">
<param name="program" type="GLuint"/>
<param name="location" type="GLint"/>
<param name="params" type="GLuint *"/>
</function>
<function name="Uniform1ui" alias="Uniform1uiEXT" es2="3.0">
<function name="Uniform1ui" es2="3.0" offset="assign">
<param name="location" type="GLint"/>
<param name="x" type="GLuint"/>
</function>
<function name="Uniform2ui" alias="Uniform2uiEXT" es2="3.0">
<function name="Uniform2ui" es2="3.0" offset="assign">
<param name="location" type="GLint"/>
<param name="x" type="GLuint"/>
<param name="y" type="GLuint"/>
</function>
<function name="Uniform3ui" alias="Uniform3uiEXT" es2="3.0">
<function name="Uniform3ui" es2="3.0" offset="assign">
<param name="location" type="GLint"/>
<param name="x" type="GLuint"/>
<param name="y" type="GLuint"/>
<param name="z" type="GLuint"/>
</function>
<function name="Uniform4ui" alias="Uniform4uiEXT" es2="3.0">
<function name="Uniform4ui" es2="3.0" offset="assign">
<param name="location" type="GLint"/>
<param name="x" type="GLuint"/>
<param name="y" type="GLuint"/>
@ -421,25 +422,25 @@
<param name="w" type="GLuint"/>
</function>
<function name="Uniform1uiv" alias="Uniform1uivEXT" es2="3.0">
<function name="Uniform1uiv" es2="3.0" offset="assign">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLuint *"/>
</function>
<function name="Uniform2uiv" alias="Uniform2uivEXT" es2="3.0">
<function name="Uniform2uiv" es2="3.0" offset="assign">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLuint *"/>
</function>
<function name="Uniform3uiv" alias="Uniform3uivEXT" es2="3.0">
<function name="Uniform3uiv" es2="3.0" offset="assign">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLuint *"/>
</function>
<function name="Uniform4uiv" alias="Uniform4uivEXT" es2="3.0">
<function name="Uniform4uiv" es2="3.0" offset="assign">
<param name="location" type="GLint"/>
<param name="count" type="GLsizei"/>
<param name="value" type="const GLuint *"/>
@ -447,25 +448,25 @@
<!-- These functions alias ones from GL_EXT_texture_integer -->
<function name="TexParameterIiv" alias="TexParameterIivEXT">
<function name="TexParameterIiv" offset="assign">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLint *"/>
</function>
<function name="TexParameterIuiv" alias="TexParameterIuivEXT">
<function name="TexParameterIuiv" offset="assign">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLuint *"/>
</function>
<function name="GetTexParameterIiv" alias="GetTexParameterIivEXT">
<function name="GetTexParameterIiv" offset="assign">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLint *"/>
</function>
<function name="GetTexParameterIuiv" alias="GetTexParameterIuivEXT">
<function name="GetTexParameterIuiv" offset="assign">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLuint *"/>
@ -556,13 +557,13 @@
<param name="primcount" type="GLsizei"/>
</function>
<function name="TexBuffer" offset="assign" alias="TexBufferARB">
<function name="TexBuffer" offset="assign">
<param name="target" type="GLenum"/>
<param name="internalFormat" type="GLenum"/>
<param name="buffer" type="GLuint"/>
</function>
<function name="PrimitiveRestartIndex" alias="PrimitiveRestartIndexNV">
<function name="PrimitiveRestartIndex" offset="assign">
<param name="index" type="GLuint"/>
</function>
@ -625,8 +626,7 @@
<enum name="TEXTURE_SWIZZLE_A" value="0x8E45"/>
<enum name="TEXTURE_SWIZZLE_RGBA" value="0x8E46"/>
<function name="VertexAttribDivisor" offset="assign" es2="3.0"
alias="VertexAttribDivisorARB">
<function name="VertexAttribDivisor" offset="assign" es2="3.0">
<param name="index" type="GLuint"/>
<param name="divisor" type="GLuint"/>
</function>

View file

@ -13,12 +13,12 @@
<enum name="QUERY_BY_REGION_WAIT_NV" value="0x8E15"/>
<enum name="QUERY_BY_REGION_NO_WAIT_NV" value="0x8E16"/>
<function name="BeginConditionalRenderNV" offset="assign" mesa_name="-NV">
<function name="BeginConditionalRenderNV" alias="BeginConditionalRender">
<param name="query" type="GLuint"/>
<param name="mode" type="GLenum"/>
</function>
<function name="EndConditionalRenderNV" offset="assign" mesa_name="-NV">
<function name="EndConditionalRenderNV" alias="EndConditionalRender">
</function>
</category>

View file

@ -15,7 +15,7 @@
exec="dynamic">
</function>
<function name="PrimitiveRestartIndexNV" offset="assign" mesa_name="-NV">
<function name="PrimitiveRestartIndexNV" alias="PrimitiveRestartIndex">
<param name="index" type="GLuint"/>
</function>

View file

@ -13,53 +13,52 @@
<type name="clampx" size="4" />
<!-- OpenGL ES 1.0 -->
<function name="AlphaFuncxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="AlphaFuncxOES" static_dispatch="false"
es1="1.0" alias="AlphaFuncx">
<param name="func" type="GLenum"/>
<param name="ref" type="GLclampx"/>
</function>
<function name="ClearColorxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="ClearColorxOES" static_dispatch="false"
es1="1.0" alias="ClearColorx">
<param name="red" type="GLclampx"/>
<param name="green" type="GLclampx"/>
<param name="blue" type="GLclampx"/>
<param name="alpha" type="GLclampx"/>
</function>
<function name="ClearDepthxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="ClearDepthxOES" static_dispatch="false"
es1="1.0" alias="ClearDepthx">
<param name="depth" type="GLclampx"/>
</function>
<function name="Color4xOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="Color4xOES" static_dispatch="false"
es1="1.0" alias="Color4x">
<param name="red" type="GLfixed"/>
<param name="green" type="GLfixed"/>
<param name="blue" type="GLfixed"/>
<param name="alpha" type="GLfixed"/>
</function>
<function name="DepthRangexOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="DepthRangexOES" static_dispatch="false"
es1="1.0" alias="DepthRangex">
<param name="zNear" type="GLclampx"/>
<param name="zFar" type="GLclampx"/>
</function>
<function name="FogxOES" offset="assign" static_dispatch="false" es1="1.0"
exec="es" mesa_name="-OES">
<function name="FogxOES" static_dispatch="false" es1="1.0" alias="Fogx">
<param name="pname" type="GLenum"/>
<param name="param" type="GLfixed"/>
</function>
<function name="FogxvOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="FogxvOES" static_dispatch="false"
es1="1.0" alias="Fogxv">
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *" variable_param="pname"/>
<param name="params" type="const GLfixed *"/>
</function>
<function name="FrustumxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="FrustumxOES" static_dispatch="false"
es1="1.0" alias="Frustumx">
<param name="left" type="GLfixed"/>
<param name="right" type="GLfixed"/>
<param name="bottom" type="GLfixed"/>
@ -68,63 +67,63 @@
<param name="zFar" type="GLfixed"/>
</function>
<function name="LightModelxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="LightModelxOES" static_dispatch="false"
es1="1.0" alias="LightModelx">
<param name="pname" type="GLenum"/>
<param name="param" type="GLfixed"/>
</function>
<function name="LightModelxvOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="LightModelxvOES" static_dispatch="false"
es1="1.0" alias="LightModelxv">
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *" variable_param="pname"/>
<param name="params" type="const GLfixed *"/>
</function>
<function name="LightxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="LightxOES" static_dispatch="false"
es1="1.0" alias="Lightx">
<param name="light" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="param" type="GLfixed"/>
</function>
<function name="LightxvOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="LightxvOES" static_dispatch="false"
es1="1.0" alias="Lightxv">
<param name="light" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *" variable_param="pname"/>
<param name="params" type="const GLfixed *"/>
</function>
<function name="LineWidthxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="LineWidthxOES" static_dispatch="false"
es1="1.0" alias="LineWidthx">
<param name="width" type="GLfixed"/>
</function>
<function name="LoadMatrixxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<param name="m" type="const GLfixed *" count="16"/>
<function name="LoadMatrixxOES" static_dispatch="false"
es1="1.0" alias="LoadMatrixx">
<param name="m" type="const GLfixed *"/>
</function>
<function name="MaterialxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="MaterialxOES" static_dispatch="false"
es1="1.0" alias="Materialx">
<param name="face" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="param" type="GLfixed"/>
</function>
<function name="MaterialxvOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="MaterialxvOES" static_dispatch="false"
es1="1.0" alias="Materialxv">
<param name="face" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *" variable_param="pname"/>
<param name="params" type="const GLfixed *"/>
</function>
<function name="MultMatrixxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<param name="m" type="const GLfixed *" count="16"/>
<function name="MultMatrixxOES" static_dispatch="false"
es1="1.0" alias="MultMatrixx">
<param name="m" type="const GLfixed *"/>
</function>
<function name="MultiTexCoord4xOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="MultiTexCoord4xOES" static_dispatch="false"
es1="1.0" alias="MultiTexCoord4x">
<param name="target" type="GLenum"/>
<param name="s" type="GLfixed"/>
<param name="t" type="GLfixed"/>
@ -132,15 +131,15 @@
<param name="q" type="GLfixed"/>
</function>
<function name="Normal3xOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="Normal3xOES" static_dispatch="false"
es1="1.0" alias="Normal3x">
<param name="nx" type="GLfixed"/>
<param name="ny" type="GLfixed"/>
<param name="nz" type="GLfixed"/>
</function>
<function name="OrthoxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="OrthoxOES" static_dispatch="false"
es1="1.0" alias="Orthox">
<param name="left" type="GLfixed"/>
<param name="right" type="GLfixed"/>
<param name="bottom" type="GLfixed"/>
@ -149,149 +148,149 @@
<param name="zFar" type="GLfixed"/>
</function>
<function name="PointSizexOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="PointSizexOES" static_dispatch="false"
es1="1.0" alias="PointSizex">
<param name="size" type="GLfixed"/>
</function>
<function name="PolygonOffsetxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="PolygonOffsetxOES" static_dispatch="false"
es1="1.0" alias="PolygonOffsetx">
<param name="factor" type="GLfixed"/>
<param name="units" type="GLfixed"/>
</function>
<function name="RotatexOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="RotatexOES" static_dispatch="false"
es1="1.0" alias="Rotatex">
<param name="angle" type="GLfixed"/>
<param name="x" type="GLfixed"/>
<param name="y" type="GLfixed"/>
<param name="z" type="GLfixed"/>
</function>
<function name="SampleCoveragexOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="SampleCoveragexOES" static_dispatch="false"
es1="1.0" alias="SampleCoveragex">
<param name="value" type="GLclampx"/>
<param name="invert" type="GLboolean"/>
</function>
<function name="ScalexOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="ScalexOES" static_dispatch="false"
es1="1.0" alias="Scalex">
<param name="x" type="GLfixed"/>
<param name="y" type="GLfixed"/>
<param name="z" type="GLfixed"/>
</function>
<function name="TexEnvxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="TexEnvxOES" static_dispatch="false"
es1="1.0" alias="TexEnvx">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="param" type="GLfixed"/>
</function>
<function name="TexEnvxvOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="TexEnvxvOES" static_dispatch="false"
es1="1.0" alias="TexEnvxv">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *" variable_param="pname"/>
<param name="params" type="const GLfixed *"/>
</function>
<function name="TexParameterxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="TexParameterxOES" static_dispatch="false"
es1="1.0" alias="TexParameterx">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="param" type="GLfixed"/>
</function>
<function name="TranslatexOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="TranslatexOES" static_dispatch="false"
es1="1.0" alias="Translatex">
<param name="x" type="GLfixed"/>
<param name="y" type="GLfixed"/>
<param name="z" type="GLfixed"/>
</function>
<!-- OpenGL ES 1.1 -->
<function name="ClipPlanexOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="ClipPlanexOES" static_dispatch="false"
es1="1.0" alias="ClipPlanex">
<param name="plane" type="GLenum"/>
<param name="equation" type="const GLfixed *" count="4"/>
<param name="equation" type="const GLfixed *"/>
</function>
<function name="GetClipPlanexOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" desktop="false" mesa_name="-OES">
<function name="GetClipPlanexOES" static_dispatch="false"
es1="1.0" desktop="false" alias="GetClipPlanex">
<param name="plane" type="GLenum"/>
<param name="equation" type="GLfixed *" output="true" count="4"/>
<param name="equation" type="GLfixed *"/>
</function>
<function name="GetFixedvOES" offset="assign" static_dispatch="false"
es1="1.0" mesa_name="-OES">
<function name="GetFixedvOES" static_dispatch="false"
es1="1.0" alias="GetFixedv">
<param name="pname" type="GLenum"/>
<param name="params" type="GLfixed *" output="true" variable_param="pname"/>
<param name="params" type="GLfixed *"/>
</function>
<function name="GetLightxvOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="GetLightxvOES" static_dispatch="false"
es1="1.0" alias="GetLightxv">
<param name="light" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLfixed *" output="true" variable_param="pname"/>
<param name="params" type="GLfixed *"/>
</function>
<function name="GetMaterialxvOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="GetMaterialxvOES" static_dispatch="false"
es1="1.0" alias="GetMaterialxv">
<param name="face" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLfixed *" output="true" variable_param="pname"/>
<param name="params" type="GLfixed *"/>
</function>
<function name="GetTexEnvxvOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="GetTexEnvxvOES" static_dispatch="false"
es1="1.0" alias="GetTexEnvxv">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLfixed *" output="true" variable_param="pname"/>
<param name="params" type="GLfixed *"/>
</function>
<function name="GetTexParameterxvOES" offset="assign"
static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES">
<function name="GetTexParameterxvOES"
static_dispatch="false" es1="1.0" alias="GetTexParameterxv">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLfixed *" output="true" variable_param="pname"/>
<param name="params" type="GLfixed *"/>
</function>
<function name="PointParameterxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="PointParameterxOES" static_dispatch="false"
es1="1.0" alias="PointParameterx">
<param name="pname" type="GLenum"/>
<param name="param" type="GLfixed"/>
</function>
<function name="PointParameterxvOES" offset="assign"
static_dispatch="false" es1="1.0" exec="es" mesa_name="-OES">
<function name="PointParameterxvOES"
static_dispatch="false" es1="1.0" alias="PointParameterxv">
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *"/>
</function>
<function name="TexParameterxvOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="TexParameterxvOES" static_dispatch="false"
es1="1.0" alias="TexParameterxv">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *" variable_param="pname"/>
<param name="params" type="const GLfixed *"/>
</function>
<!-- texgen -->
<function name="GetTexGenxvOES" offset="assign" static_dispatch="false"
es1="1.0" exec="check" desktop="false">
es1="1.0" desktop="false">
<param name="coord" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLfixed *" output="true" variable_param="pname"/>
</function>
<function name="TexGenxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="check" desktop="false">
es1="1.0" desktop="false">
<param name="coord" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="param" type="GLint"/>
</function>
<function name="TexGenxvOES" offset="assign" static_dispatch="false"
es1="1.0" exec="check" desktop="false">
es1="1.0" desktop="false">
<param name="coord" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *" variable_param="pname"/>

View file

@ -11,10 +11,10 @@
<param name="depth" type="GLclampf"/>
</function>
<function name="ClipPlanefOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="ClipPlanefOES" static_dispatch="false"
es1="1.0" alias="ClipPlanef">
<param name="plane" type="GLenum"/>
<param name="equation" type="const GLfloat *" count="4"/>
<param name="equation" type="const GLfloat *"/>
</function>
<function name="DepthRangefOES" alias="DepthRangef" static_dispatch="false"
@ -23,14 +23,14 @@
<param name="zFar" type="GLclampf"/>
</function>
<function name="GetClipPlanefOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" desktop="false" mesa_name="-OES">
<function name="GetClipPlanefOES" static_dispatch="false"
es1="1.0" desktop="false" alias="GetClipPlanef">
<param name="plane" type="GLenum"/>
<param name="equation" type="GLfloat *" output="true" count="4"/>
<param name="equation" type="GLfloat *"/>
</function>
<function name="FrustumfOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="FrustumfOES" static_dispatch="false"
es1="1.0" alias="Frustumf">
<param name="left" type="GLfloat"/>
<param name="right" type="GLfloat"/>
<param name="bottom" type="GLfloat"/>
@ -39,8 +39,8 @@
<param name="zFar" type="GLfloat"/>
</function>
<function name="OrthofOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" mesa_name="-OES">
<function name="OrthofOES" static_dispatch="false"
es1="1.0" alias="Orthof">
<param name="left" type="GLfloat"/>
<param name="right" type="GLfloat"/>
<param name="bottom" type="GLfloat"/>

View file

@ -10,7 +10,7 @@
<enum name="BLEND_EQUATION_RGB_OES" value="0x8009"/>
<enum name="BLEND_EQUATION_ALPHA_OES" value="0x883D"/>
<function name="BlendEquationSeparateOES" alias="BlendEquationSeparateEXT"
<function name="BlendEquationSeparateOES" alias="BlendEquationSeparate"
static_dispatch="false" es1="1.0">
<param name="modeRGB" type="GLenum"/>
<param name="modeA" type="GLenum"/>
@ -24,7 +24,7 @@
<enum name="BLEND_DST_ALPHA_OES" value="0x80CA"/>
<enum name="BLEND_SRC_ALPHA_OES" value="0x80CB"/>
<function name="BlendFuncSeparateOES" alias="BlendFuncSeparateEXT"
<function name="BlendFuncSeparateOES" alias="BlendFuncSeparate"
static_dispatch="false" es1="1.0">
<param name="sfactorRGB" type="GLenum"/>
<param name="dfactorRGB" type="GLenum"/>
@ -73,7 +73,7 @@
<enum name="TEXTURE_CROP_RECT_OES" value="0x8B9D"/>
<function name="DrawTexiOES" offset="assign" static_dispatch="false"
es1="1.0" desktop="false" mesa_name="-OES">
es1="1.0" desktop="false">
<param name="x" type="GLint"/>
<param name="y" type="GLint"/>
<param name="z" type="GLint"/>
@ -82,12 +82,12 @@
</function>
<function name="DrawTexivOES" offset="assign" static_dispatch="false"
es1="1.0" desktop="false" mesa_name="-OES">
es1="1.0" desktop="false">
<param name="coords" type="const GLint *" count="5"/>
</function>
<function name="DrawTexfOES" offset="assign" static_dispatch="false"
es1="1.0" desktop="false" mesa_name="-OES">
es1="1.0" desktop="false">
<param name="x" type="GLfloat"/>
<param name="y" type="GLfloat"/>
<param name="z" type="GLfloat"/>
@ -96,12 +96,12 @@
</function>
<function name="DrawTexfvOES" offset="assign" static_dispatch="false"
es1="1.0" desktop="false" mesa_name="-OES">
es1="1.0" desktop="false">
<param name="coords" type="const GLfloat *" count="5"/>
</function>
<function name="DrawTexsOES" offset="assign" static_dispatch="false"
es1="1.0" desktop="false" mesa_name="-OES">
es1="1.0" desktop="false">
<param name="x" type="GLshort"/>
<param name="y" type="GLshort"/>
<param name="z" type="GLshort"/>
@ -110,12 +110,12 @@
</function>
<function name="DrawTexsvOES" offset="assign" static_dispatch="false"
es1="1.0" desktop="false" mesa_name="-OES">
es1="1.0" desktop="false">
<param name="coords" type="const GLshort *" count="5"/>
</function>
<function name="DrawTexxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" desktop="false">
es1="1.0" desktop="false">
<param name="x" type="GLfixed"/>
<param name="y" type="GLfixed"/>
<param name="z" type="GLfixed"/>
@ -124,7 +124,7 @@
</function>
<function name="DrawTexxvOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" desktop="false">
es1="1.0" desktop="false">
<param name="coords" type="const GLfixed *" count="5"/>
</function>
@ -177,39 +177,39 @@
<enum name="RENDERBUFFER_STENCIL_SIZE_OES" value="0x8D55"/>
<enum name="RGB565_OES" value="0x8D62"/>
<function name="BindFramebufferOES" alias="BindFramebufferEXT"
<function name="BindFramebufferOES" alias="BindFramebuffer"
static_dispatch="false" es1="1.0">
<param name="target" type="GLenum"/>
<param name="framebuffer" type="GLuint"/>
</function>
<function name="BindRenderbufferOES" alias="BindRenderbufferEXT"
<function name="BindRenderbufferOES" alias="BindRenderbuffer"
static_dispatch="false" es1="1.0">
<param name="target" type="GLenum"/>
<param name="renderbuffer" type="GLuint"/>
</function>
<function name="CheckFramebufferStatusOES"
alias="CheckFramebufferStatusEXT" static_dispatch="false"
alias="CheckFramebufferStatus" static_dispatch="false"
es1="1.0">
<param name="target" type="GLenum"/>
<return type="GLenum"/>
</function>
<function name="DeleteFramebuffersOES" alias="DeleteFramebuffersEXT"
<function name="DeleteFramebuffersOES" alias="DeleteFramebuffers"
static_dispatch="false" es1="1.0">
<param name="n" type="GLsizei" counter="true"/>
<param name="framebuffers" type="const GLuint *" count="n"/>
</function>
<function name="DeleteRenderbuffersOES" alias="DeleteRenderbuffersEXT"
<function name="DeleteRenderbuffersOES" alias="DeleteRenderbuffers"
static_dispatch="false" es1="1.0">
<param name="n" type="GLsizei" counter="true"/>
<param name="renderbuffers" type="const GLuint *" count="n"/>
</function>
<function name="FramebufferRenderbufferOES"
alias="FramebufferRenderbufferEXT" static_dispatch="false"
alias="FramebufferRenderbuffer" static_dispatch="false"
es1="1.0">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
@ -217,7 +217,7 @@
<param name="renderbuffer" type="GLuint"/>
</function>
<function name="FramebufferTexture2DOES" alias="FramebufferTexture2DEXT"
<function name="FramebufferTexture2DOES" alias="FramebufferTexture2D"
static_dispatch="false" es1="1.0">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
@ -226,25 +226,25 @@
<param name="level" type="GLint"/>
</function>
<function name="GenerateMipmapOES" alias="GenerateMipmapEXT"
<function name="GenerateMipmapOES" alias="GenerateMipmap"
static_dispatch="false" es1="1.0">
<param name="target" type="GLenum"/>
</function>
<function name="GenFramebuffersOES" alias="GenFramebuffersEXT"
<function name="GenFramebuffersOES" alias="GenFramebuffers"
static_dispatch="false" es1="1.0">
<param name="n" type="GLsizei" counter="true"/>
<param name="framebuffers" type="GLuint *" count="n" output="true"/>
</function>
<function name="GenRenderbuffersOES" alias="GenRenderbuffersEXT"
<function name="GenRenderbuffersOES" alias="GenRenderbuffers"
static_dispatch="false" es1="1.0">
<param name="n" type="GLsizei" counter="true"/>
<param name="renderbuffers" type="GLuint *" count="n" output="true"/>
</function>
<function name="GetFramebufferAttachmentParameterivOES"
alias="GetFramebufferAttachmentParameterivEXT"
alias="GetFramebufferAttachmentParameteriv"
static_dispatch="false" es1="1.0">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
@ -253,26 +253,26 @@
</function>
<function name="GetRenderbufferParameterivOES"
alias="GetRenderbufferParameterivEXT" static_dispatch="false"
alias="GetRenderbufferParameteriv" static_dispatch="false"
es1="1.0">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLint *" output="true"/>
</function>
<function name="IsFramebufferOES" alias="IsFramebufferEXT"
<function name="IsFramebufferOES" alias="IsFramebuffer"
static_dispatch="false" es1="1.0">
<param name="framebuffer" type="GLuint"/>
<return type="GLboolean"/>
</function>
<function name="IsRenderbufferOES" alias="IsRenderbufferEXT"
<function name="IsRenderbufferOES" alias="IsRenderbuffer"
static_dispatch="false" es1="1.0">
<param name="renderbuffer" type="GLuint"/>
<return type="GLboolean"/>
</function>
<function name="RenderbufferStorageOES" alias="RenderbufferStorageEXT"
<function name="RenderbufferStorageOES" alias="RenderbufferStorage"
static_dispatch="false" es1="1.0">
<param name="target" type="GLenum"/>
<param name="internalformat" type="GLenum"/>
@ -343,8 +343,7 @@
<enum name="POINT_SIZE_ARRAY_BUFFER_BINDING_OES" value="0x8B9F"/>
<function name="PointSizePointerOES" offset="assign"
static_dispatch="false" es1="1.0" desktop="false"
mesa_name="-OES">
static_dispatch="false" es1="1.0" desktop="false">
<param name="type" type="GLenum"/>
<param name="stride" type="GLsizei"/>
<param name="pointer" type="const GLvoid *"/>
@ -360,7 +359,7 @@
<!-- optional for es1.0 -->
<category name="GL_OES_query_matrix" number="16">
<function name="QueryMatrixxOES" offset="assign" static_dispatch="false"
es1="1.0" exec="es" desktop="false">
es1="1.0" desktop="false">
<param name="mantissa" type="GLfixed *" count="16" />
<param name="exponent" type="GLint *" count="16" />
<return type="GLbitfield"/>
@ -460,21 +459,21 @@
<enum name="BUFFER_MAPPED_OES" value="0x88BC"/>
<enum name="BUFFER_MAP_POINTER_OES" value="0x88BD"/>
<function name="GetBufferPointervOES" alias="GetBufferPointervARB"
<function name="GetBufferPointervOES" alias="GetBufferPointerv"
static_dispatch="false" es1="1.0" es2="2.0">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLvoid **"/>
</function>
<function name="MapBufferOES" alias="MapBufferARB" static_dispatch="false"
<function name="MapBufferOES" alias="MapBuffer" static_dispatch="false"
es1="1.0" es2="2.0">
<param name="target" type="GLenum"/>
<param name="access" type="GLenum"/>
<return type="GLvoid *"/>
</function>
<function name="UnmapBufferOES" alias="UnmapBufferARB"
<function name="UnmapBufferOES" alias="UnmapBuffer"
static_dispatch="false" es1="1.0" es2="2.0">
<param name="target" type="GLenum"/>
<return type="GLboolean"/>
@ -506,7 +505,7 @@
<enum name="SAMPLER_3D_OES" value="0x8B5F"/>
<enum name="FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_OES" value="0x8CD4"/>
<function name="CompressedTexImage3DOES" alias="CompressedTexImage3DARB"
<function name="CompressedTexImage3DOES" alias="CompressedTexImage3D"
static_dispatch="false" es2="2.0">
<param name="target" type="GLenum"/>
<param name="level" type="GLint"/>
@ -520,7 +519,7 @@
</function>
<function name="CompressedTexSubImage3DOES"
alias="CompressedTexSubImage3DARB" static_dispatch="false"
alias="CompressedTexSubImage3D" static_dispatch="false"
es2="2.0">
<param name="target" type="GLenum"/>
<param name="level" type="GLint"/>
@ -548,7 +547,7 @@
<param name="height" type="GLsizei"/>
</function>
<function name="FramebufferTexture3DOES" alias="FramebufferTexture3DEXT"
<function name="FramebufferTexture3DOES" alias="FramebufferTexture3D"
static_dispatch="false" es2="2.0">
<param name="target" type="GLenum"/>
<param name="attachment" type="GLenum"/>
@ -680,7 +679,7 @@
<param name="array" type="GLuint"/>
</function>
<function name="DeleteVertexArraysOES" alias="DeleteVertexArraysAPPLE"
<function name="DeleteVertexArraysOES" alias="DeleteVertexArrays"
es2="2.0">
<param name="n" type="GLsizei"/>
<param name="arrays" type="const GLuint *" count="n"/>
@ -691,7 +690,7 @@
<param name="arrays" type="GLuint *" output="true" count="n"/>
</function>
<function name="IsVertexArrayOES" alias="IsVertexArrayAPPLE" es2="2.0">
<function name="IsVertexArrayOES" alias="IsVertexArray" es2="2.0">
<param name="array" type="GLuint"/>
<return type="GLboolean"/>
</function>
@ -766,7 +765,7 @@
<size name="Get" mode="get"/>
</enum>
<function name="DrawBuffersNV" alias="DrawBuffersARB" es2="2.0">
<function name="DrawBuffersNV" alias="DrawBuffers" es2="2.0">
<param name="n" type="GLsizei" counter="true"/>
<param name="bufs" type="const GLenum *" count="n"/>
</function>

File diff suppressed because it is too large Load diff

View file

@ -18,53 +18,53 @@
<type name="fixed" size="4" />
<type name="clampx" size="4" />
<function name="AlphaFuncx" alias="AlphaFuncxOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="AlphaFuncx" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="func" type="GLenum"/>
<param name="ref" type="GLclampx"/>
</function>
<function name="ClearColorx" alias="ClearColorxOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="ClearColorx" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="red" type="GLclampx"/>
<param name="green" type="GLclampx"/>
<param name="blue" type="GLclampx"/>
<param name="alpha" type="GLclampx"/>
</function>
<function name="ClearDepthx" alias="ClearDepthxOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="ClearDepthx" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="depth" type="GLclampx"/>
</function>
<function name="Color4x" alias="Color4xOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="Color4x" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="red" type="GLfixed"/>
<param name="green" type="GLfixed"/>
<param name="blue" type="GLfixed"/>
<param name="alpha" type="GLfixed"/>
</function>
<function name="DepthRangex" alias="DepthRangexOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="DepthRangex" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="zNear" type="GLclampx"/>
<param name="zFar" type="GLclampx"/>
</function>
<function name="Fogx" alias="FogxOES" static_dispatch="false" es1="1.0"
desktop="false">
<function name="Fogx" static_dispatch="false" es1="1.0"
desktop="false" offset="assign">
<param name="pname" type="GLenum"/>
<param name="param" type="GLfixed"/>
</function>
<function name="Fogxv" alias="FogxvOES" static_dispatch="false" es1="1.0"
desktop="false">
<function name="Fogxv" static_dispatch="false" es1="1.0"
desktop="false" offset="assign">
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *" variable_param="pname"/>
</function>
<function name="Frustumx" alias="FrustumxOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="Frustumx" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="left" type="GLfixed"/>
<param name="right" type="GLfixed"/>
<param name="bottom" type="GLfixed"/>
@ -73,63 +73,63 @@
<param name="zFar" type="GLfixed"/>
</function>
<function name="LightModelx" alias="LightModelxOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="LightModelx" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="pname" type="GLenum"/>
<param name="param" type="GLfixed"/>
</function>
<function name="LightModelxv" alias="LightModelxvOES"
static_dispatch="false" es1="1.0" desktop="false">
<function name="LightModelxv"
static_dispatch="false" es1="1.0" desktop="false" offset="assign">
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *" variable_param="pname"/>
</function>
<function name="Lightx" alias="LightxOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="Lightx" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="light" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="param" type="GLfixed"/>
</function>
<function name="Lightxv" alias="LightxvOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="Lightxv" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="light" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *" variable_param="pname"/>
</function>
<function name="LineWidthx" alias="LineWidthxOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="LineWidthx" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="width" type="GLfixed"/>
</function>
<function name="LoadMatrixx" alias="LoadMatrixxOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="LoadMatrixx" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="m" type="const GLfixed *" count="16"/>
</function>
<function name="Materialx" alias="MaterialxOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="Materialx" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="face" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="param" type="GLfixed"/>
</function>
<function name="Materialxv" alias="MaterialxvOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="Materialxv" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="face" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *" variable_param="pname"/>
</function>
<function name="MultMatrixx" alias="MultMatrixxOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="MultMatrixx" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="m" type="const GLfixed *" count="16"/>
</function>
<function name="MultiTexCoord4x" alias="MultiTexCoord4xOES"
static_dispatch="false" es1="1.0" desktop="false">
<function name="MultiTexCoord4x"
static_dispatch="false" es1="1.0" desktop="false" offset="assign">
<param name="target" type="GLenum"/>
<param name="s" type="GLfixed"/>
<param name="t" type="GLfixed"/>
@ -137,15 +137,15 @@
<param name="q" type="GLfixed"/>
</function>
<function name="Normal3x" alias="Normal3xOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="Normal3x" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="nx" type="GLfixed"/>
<param name="ny" type="GLfixed"/>
<param name="nz" type="GLfixed"/>
</function>
<function name="Orthox" alias="OrthoxOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="Orthox" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="left" type="GLfixed"/>
<param name="right" type="GLfixed"/>
<param name="bottom" type="GLfixed"/>
@ -154,69 +154,69 @@
<param name="zFar" type="GLfixed"/>
</function>
<function name="PointSizex" alias="PointSizexOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="PointSizex" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="size" type="GLfixed"/>
</function>
<function name="PolygonOffsetx" alias="PolygonOffsetxOES"
static_dispatch="false" es1="1.0" desktop="false">
<function name="PolygonOffsetx"
static_dispatch="false" es1="1.0" desktop="false" offset="assign">
<param name="factor" type="GLfixed"/>
<param name="units" type="GLfixed"/>
</function>
<function name="Rotatex" alias="RotatexOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="Rotatex" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="angle" type="GLfixed"/>
<param name="x" type="GLfixed"/>
<param name="y" type="GLfixed"/>
<param name="z" type="GLfixed"/>
</function>
<function name="SampleCoveragex" alias="SampleCoveragexOES"
static_dispatch="false" es1="1.0" desktop="false">
<function name="SampleCoveragex"
static_dispatch="false" es1="1.0" desktop="false" offset="assign">
<param name="value" type="GLclampx"/>
<param name="invert" type="GLboolean"/>
</function>
<function name="Scalex" alias="ScalexOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="Scalex" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="x" type="GLfixed"/>
<param name="y" type="GLfixed"/>
<param name="z" type="GLfixed"/>
</function>
<function name="TexEnvx" alias="TexEnvxOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="TexEnvx" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="param" type="GLfixed"/>
</function>
<function name="TexEnvxv" alias="TexEnvxvOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="TexEnvxv" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *" variable_param="pname"/>
</function>
<function name="TexParameterx" alias="TexParameterxOES"
static_dispatch="false" es1="1.0" desktop="false">
<function name="TexParameterx"
static_dispatch="false" es1="1.0" desktop="false" offset="assign">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="param" type="GLfixed"/>
</function>
<function name="Translatex" alias="TranslatexOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="Translatex" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="x" type="GLfixed"/>
<param name="y" type="GLfixed"/>
<param name="z" type="GLfixed"/>
</function>
<!-- from GL_OES_single_precision -->
<function name="Frustumf" alias="FrustumfOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="Frustumf" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="left" type="GLfloat"/>
<param name="right" type="GLfloat"/>
<param name="bottom" type="GLfloat"/>
@ -225,8 +225,8 @@
<param name="zFar" type="GLfloat"/>
</function>
<function name="Orthof" alias="OrthofOES" static_dispatch="false"
es1="1.0" desktop="false">
<function name="Orthof" static_dispatch="false"
es1="1.0" desktop="false" offset="assign">
<param name="left" type="GLfloat"/>
<param name="right" type="GLfloat"/>
<param name="bottom" type="GLfloat"/>
@ -238,80 +238,80 @@
<category name="es1.1">
<!-- from GL_OES_fixed_point -->
<function name="ClipPlanex" alias="ClipPlanexOES" static_dispatch="false"
es1="1.1" desktop="false">
<function name="ClipPlanex" static_dispatch="false"
es1="1.1" desktop="false" offset="assign">
<param name="plane" type="GLenum"/>
<param name="equation" type="const GLfixed *" count="4"/>
</function>
<function name="GetClipPlanex" alias="GetClipPlanexOES"
static_dispatch="false" es1="1.1">
<function name="GetClipPlanex"
static_dispatch="false" es1="1.1" offset="assign">
<param name="plane" type="GLenum"/>
<param name="equation" type="GLfixed *" output="true" count="4"/>
</function>
<function name="GetFixedv" alias="GetFixedvOES" static_dispatch="false"
es1="1.1" desktop="false">
<function name="GetFixedv" static_dispatch="false"
es1="1.1" desktop="false" offset="assign">
<param name="pname" type="GLenum"/>
<param name="params" type="GLfixed *" output="true" variable_param="pname"/>
</function>
<function name="GetLightxv" alias="GetLightxvOES" static_dispatch="false"
es1="1.1" desktop="false">
<function name="GetLightxv" static_dispatch="false"
es1="1.1" desktop="false" offset="assign">
<param name="light" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLfixed *" output="true" variable_param="pname"/>
</function>
<function name="GetMaterialxv" alias="GetMaterialxvOES"
static_dispatch="false" es1="1.1" desktop="false">
<function name="GetMaterialxv"
static_dispatch="false" es1="1.1" desktop="false" offset="assign">
<param name="face" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLfixed *" output="true" variable_param="pname"/>
</function>
<function name="GetTexEnvxv" alias="GetTexEnvxvOES" static_dispatch="false"
es1="1.1" desktop="false">
<function name="GetTexEnvxv" static_dispatch="false"
es1="1.1" desktop="false" offset="assign">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLfixed *" output="true" variable_param="pname"/>
</function>
<function name="GetTexParameterxv" alias="GetTexParameterxvOES"
static_dispatch="false" es1="1.1" desktop="false">
<function name="GetTexParameterxv"
static_dispatch="false" es1="1.1" desktop="false" offset="assign">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLfixed *" output="true" variable_param="pname"/>
</function>
<function name="PointParameterx" alias="PointParameterxOES"
static_dispatch="false" es1="1.1" desktop="false">
<function name="PointParameterx"
static_dispatch="false" es1="1.1" desktop="false" offset="assign">
<param name="pname" type="GLenum"/>
<param name="param" type="GLfixed"/>
</function>
<function name="PointParameterxv" alias="PointParameterxvOES"
static_dispatch="false" es1="1.1" desktop="false">
<function name="PointParameterxv"
static_dispatch="false" es1="1.1" desktop="false" offset="assign">
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *"/>
</function>
<function name="TexParameterxv" alias="TexParameterxvOES"
static_dispatch="false" es1="1.1" desktop="false">
<function name="TexParameterxv"
static_dispatch="false" es1="1.1" desktop="false" offset="assign">
<param name="target" type="GLenum"/>
<param name="pname" type="GLenum"/>
<param name="params" type="const GLfixed *" variable_param="pname"/>
</function>
<!-- from GL_OES_single_precision -->
<function name="ClipPlanef" alias="ClipPlanefOES" static_dispatch="false"
es1="1.1" desktop="false">
<function name="ClipPlanef" static_dispatch="false"
es1="1.1" desktop="false" offset="assign">
<param name="plane" type="GLenum"/>
<param name="equation" type="const GLfloat *" count="4"/>
</function>
<function name="GetClipPlanef" alias="GetClipPlanefOES"
static_dispatch="false" es1="1.1">
<function name="GetClipPlanef"
static_dispatch="false" es1="1.1" offset="assign">
<param name="plane" type="GLenum"/>
<param name="equation" type="GLfloat *" output="true" count="4"/>
</function>

View file

@ -356,8 +356,8 @@ compile_shader_with_debug(struct gl_context *ctx, GLenum target, const GLcharARB
GLchar *info;
shader = _mesa_CreateShaderObjectARB(target);
_mesa_ShaderSourceARB(shader, 1, &source, NULL);
_mesa_CompileShaderARB(shader);
_mesa_ShaderSource(shader, 1, &source, NULL);
_mesa_CompileShader(shader);
_mesa_GetShaderiv(shader, GL_COMPILE_STATUS, &ok);
if (ok)
@ -393,7 +393,7 @@ link_program_with_debug(struct gl_context *ctx, GLuint program)
GLint ok, size;
GLchar *info;
_mesa_LinkProgramARB(program);
_mesa_LinkProgram(program);
_mesa_GetProgramiv(program, GL_LINK_STATUS, &ok);
if (ok)
@ -604,7 +604,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
_mesa_reference_shader_program(ctx, &save->ActiveShader,
ctx->Shader.ActiveProgram);
_mesa_UseProgramObjectARB(0);
_mesa_UseProgram(0);
}
}
@ -629,7 +629,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
save->TexGenEnabled[u] = ctx->Texture.Unit[u].TexGenEnabled;
if (ctx->Texture.Unit[u].Enabled ||
ctx->Texture.Unit[u].TexGenEnabled) {
_mesa_ActiveTextureARB(GL_TEXTURE0 + u);
_mesa_ActiveTexture(GL_TEXTURE0 + u);
_mesa_set_enable(ctx, GL_TEXTURE_2D, GL_FALSE);
if (ctx->Extensions.ARB_texture_cube_map)
_mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP, GL_FALSE);
@ -659,8 +659,8 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
}
/* set defaults for unit[0] */
_mesa_ActiveTextureARB(GL_TEXTURE0);
_mesa_ClientActiveTextureARB(GL_TEXTURE0);
_mesa_ActiveTexture(GL_TEXTURE0);
_mesa_ClientActiveTexture(GL_TEXTURE0);
if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES) {
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
}
@ -676,10 +676,10 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
16 * sizeof(GLfloat));
save->MatrixMode = ctx->Transform.MatrixMode;
/* set 1:1 vertex:pixel coordinate transform */
_mesa_ActiveTextureARB(GL_TEXTURE0);
_mesa_ActiveTexture(GL_TEXTURE0);
_mesa_MatrixMode(GL_TEXTURE);
_mesa_LoadIdentity();
_mesa_ActiveTextureARB(GL_TEXTURE0 + activeTexture);
_mesa_ActiveTexture(GL_TEXTURE0 + activeTexture);
_mesa_MatrixMode(GL_MODELVIEW);
_mesa_LoadIdentity();
_mesa_MatrixMode(GL_PROJECTION);
@ -737,7 +737,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
* regardless of the internal implementation of the metaops.
*/
if (ctx->Color.ClampFragmentColor != GL_TRUE)
_mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);
_mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);
}
if (state & MESA_META_CLAMP_VERTEX_COLOR) {
@ -746,7 +746,7 @@ _mesa_meta_begin(struct gl_context *ctx, GLbitfield state)
/* Generally in here we never want vertex color clamping --
* result clamping is only dependent on fragment clamping.
*/
_mesa_ClampColorARB(GL_CLAMP_VERTEX_COLOR, GL_FALSE);
_mesa_ClampColor(GL_CLAMP_VERTEX_COLOR, GL_FALSE);
}
if (state & MESA_META_CONDITIONAL_RENDER) {
@ -832,7 +832,7 @@ _mesa_meta_end(struct gl_context *ctx)
save->ColorMask[i][2], save->ColorMask[i][3]);
}
else {
_mesa_ColorMaskIndexed(i,
_mesa_ColorMaski(i,
save->ColorMask[i][0],
save->ColorMask[i][1],
save->ColorMask[i][2],
@ -1001,16 +1001,16 @@ _mesa_meta_end(struct gl_context *ctx)
}
/* restore current unit state */
_mesa_ActiveTextureARB(GL_TEXTURE0 + save->ActiveUnit);
_mesa_ClientActiveTextureARB(GL_TEXTURE0 + save->ClientActiveUnit);
_mesa_ActiveTexture(GL_TEXTURE0 + save->ActiveUnit);
_mesa_ClientActiveTexture(GL_TEXTURE0 + save->ClientActiveUnit);
}
if (state & MESA_META_TRANSFORM) {
GLuint activeTexture = ctx->Texture.CurrentUnit;
_mesa_ActiveTextureARB(GL_TEXTURE0);
_mesa_ActiveTexture(GL_TEXTURE0);
_mesa_MatrixMode(GL_TEXTURE);
_mesa_LoadMatrixf(save->TextureMatrix);
_mesa_ActiveTextureARB(GL_TEXTURE0 + activeTexture);
_mesa_ActiveTexture(GL_TEXTURE0 + activeTexture);
_mesa_MatrixMode(GL_MODELVIEW);
_mesa_LoadMatrixf(save->ModelviewMatrix);
@ -1034,7 +1034,7 @@ _mesa_meta_end(struct gl_context *ctx)
if (state & MESA_META_VERTEX) {
/* restore vertex buffer object */
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, save->ArrayBufferObj->Name);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, save->ArrayBufferObj->Name);
_mesa_reference_buffer_object(ctx, &save->ArrayBufferObj, NULL);
/* restore vertex array object */
@ -1054,11 +1054,11 @@ _mesa_meta_end(struct gl_context *ctx)
}
if (state & MESA_META_CLAMP_FRAGMENT_COLOR) {
_mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, save->ClampFragmentColor);
_mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, save->ClampFragmentColor);
}
if (state & MESA_META_CLAMP_VERTEX_COLOR) {
_mesa_ClampColorARB(GL_CLAMP_VERTEX_COLOR, save->ClampVertexColor);
_mesa_ClampColor(GL_CLAMP_VERTEX_COLOR, save->ClampVertexColor);
}
if (state & MESA_META_CONDITIONAL_RENDER) {
@ -1326,12 +1326,12 @@ setup_drawpix_texture(struct gl_context *ctx,
_mesa_reference_buffer_object(ctx, &save_unpack_obj,
ctx->Unpack.BufferObj);
_mesa_BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
_mesa_BindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
/* create empty texture */
_mesa_TexImage2D(tex->Target, 0, tex->IntFormat,
tex->Width, tex->Height, 0, format, type, NULL);
if (save_unpack_obj != NULL)
_mesa_BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB,
_mesa_BindBuffer(GL_PIXEL_UNPACK_BUFFER_ARB,
save_unpack_obj->Name);
/* load image */
_mesa_TexSubImage2D(tex->Target, 0,
@ -1372,8 +1372,8 @@ init_blit_depth_pixels(struct gl_context *ctx)
texTarget = "2D";
_mesa_snprintf(program2, sizeof(program2), program, texTarget);
_mesa_GenPrograms(1, &blit->DepthFP);
_mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);
_mesa_GenProgramsARB(1, &blit->DepthFP);
_mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);
_mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
strlen(program2), (const GLubyte *) program2);
}
@ -1498,7 +1498,7 @@ blitframebuffer_texture(struct gl_context *ctx,
verts[3].s = s0;
verts[3].t = t1;
_mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
_mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
}
_mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);
@ -1583,9 +1583,9 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx,
_mesa_BindVertexArray(blit->ArrayObj);
/* create vertex array buffer */
_mesa_GenBuffersARB(1, &blit->VBO);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, blit->VBO);
_mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
_mesa_GenBuffers(1, &blit->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, blit->VBO);
_mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
NULL, GL_DYNAMIC_DRAW_ARB);
/* setup vertex arrays */
@ -1596,7 +1596,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx,
}
else {
_mesa_BindVertexArray(blit->ArrayObj);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, blit->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, blit->VBO);
}
/* Try faster, direct texture approach first */
@ -1634,7 +1634,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx,
verts[3].t = tex->Ttop;
/* upload new vertex data */
_mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
_mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
}
_mesa_set_enable(ctx, tex->Target, GL_TRUE);
@ -1661,7 +1661,7 @@ _mesa_meta_BlitFramebuffer(struct gl_context *ctx,
setup_drawpix_texture(ctx, tex, newTex, GL_DEPTH_COMPONENT, srcW, srcH,
GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, tmp);
_mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);
_mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, blit->DepthFP);
_mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE);
_mesa_ColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
_mesa_set_enable(ctx, GL_DEPTH_TEST, GL_TRUE);
@ -1693,13 +1693,13 @@ static void
meta_glsl_blit_cleanup(struct gl_context *ctx, struct blit_state *blit)
{
if (blit->ArrayObj) {
_mesa_DeleteVertexArraysAPPLE(1, &blit->ArrayObj);
_mesa_DeleteVertexArrays(1, &blit->ArrayObj);
blit->ArrayObj = 0;
_mesa_DeleteBuffersARB(1, &blit->VBO);
_mesa_DeleteBuffers(1, &blit->VBO);
blit->VBO = 0;
}
if (blit->DepthFP) {
_mesa_DeletePrograms(1, &blit->DepthFP);
_mesa_DeleteProgramsARB(1, &blit->DepthFP);
blit->DepthFP = 0;
}
}
@ -1739,8 +1739,8 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers)
_mesa_BindVertexArray(clear->ArrayObj);
/* create vertex array buffer */
_mesa_GenBuffersARB(1, &clear->VBO);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO);
_mesa_GenBuffers(1, &clear->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO);
/* setup vertex arrays */
_mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x));
@ -1750,7 +1750,7 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers)
}
else {
_mesa_BindVertexArray(clear->ArrayObj);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO);
}
/* GL_COLOR_BUFFER_BIT */
@ -1758,7 +1758,7 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers)
/* leave colormask, glDrawBuffer state as-is */
/* Clears never have the color clamped. */
_mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);
_mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);
}
else {
ASSERT(metaSave & MESA_META_COLOR_MASK);
@ -1819,7 +1819,7 @@ _mesa_meta_Clear(struct gl_context *ctx, GLbitfield buffers)
}
/* upload new vertex data */
_mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts,
_mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts,
GL_DYNAMIC_DRAW_ARB);
}
@ -1870,30 +1870,30 @@ meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear)
_mesa_BindVertexArray(clear->ArrayObj);
/* create vertex array buffer */
_mesa_GenBuffersARB(1, &clear->VBO);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO);
_mesa_GenBuffers(1, &clear->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO);
/* setup vertex arrays */
_mesa_VertexAttribPointerARB(0, 3, GL_FLOAT, GL_FALSE, 0, (void *)0);
_mesa_EnableVertexAttribArrayARB(0);
_mesa_VertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, 0, (void *)0);
_mesa_EnableVertexAttribArray(0);
vs = _mesa_CreateShaderObjectARB(GL_VERTEX_SHADER);
_mesa_ShaderSourceARB(vs, 1, &vs_source, NULL);
_mesa_CompileShaderARB(vs);
_mesa_ShaderSource(vs, 1, &vs_source, NULL);
_mesa_CompileShader(vs);
fs = _mesa_CreateShaderObjectARB(GL_FRAGMENT_SHADER);
_mesa_ShaderSourceARB(fs, 1, &fs_source, NULL);
_mesa_CompileShaderARB(fs);
_mesa_ShaderSource(fs, 1, &fs_source, NULL);
_mesa_CompileShader(fs);
clear->ShaderProg = _mesa_CreateProgramObjectARB();
_mesa_AttachShader(clear->ShaderProg, fs);
_mesa_DeleteObjectARB(fs);
_mesa_AttachShader(clear->ShaderProg, vs);
_mesa_DeleteObjectARB(vs);
_mesa_BindAttribLocationARB(clear->ShaderProg, 0, "position");
_mesa_LinkProgramARB(clear->ShaderProg);
_mesa_BindAttribLocation(clear->ShaderProg, 0, "position");
_mesa_LinkProgram(clear->ShaderProg);
clear->ColorLocation = _mesa_GetUniformLocationARB(clear->ShaderProg,
clear->ColorLocation = _mesa_GetUniformLocation(clear->ShaderProg,
"color");
if (_mesa_is_desktop_gl(ctx) && ctx->Const.GLSLVersion >= 130) {
@ -1905,7 +1905,7 @@ meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear)
_mesa_DeleteObjectARB(fs);
_mesa_AttachShader(clear->IntegerShaderProg, vs);
_mesa_DeleteObjectARB(vs);
_mesa_BindAttribLocationARB(clear->IntegerShaderProg, 0, "position");
_mesa_BindAttribLocation(clear->IntegerShaderProg, 0, "position");
/* Note that user-defined out attributes get automatically assigned
* locations starting from 0, so we don't need to explicitly
@ -1915,7 +1915,7 @@ meta_glsl_clear_init(struct gl_context *ctx, struct clear_state *clear)
link_program_with_debug(ctx, clear->IntegerShaderProg);
clear->IntegerColorLocation =
_mesa_GetUniformLocationARB(clear->IntegerShaderProg, "color");
_mesa_GetUniformLocation(clear->IntegerShaderProg, "color");
}
}
@ -1924,9 +1924,9 @@ meta_glsl_clear_cleanup(struct gl_context *ctx, struct clear_state *clear)
{
if (clear->ArrayObj == 0)
return;
_mesa_DeleteVertexArraysAPPLE(1, &clear->ArrayObj);
_mesa_DeleteVertexArrays(1, &clear->ArrayObj);
clear->ArrayObj = 0;
_mesa_DeleteBuffersARB(1, &clear->VBO);
_mesa_DeleteBuffers(1, &clear->VBO);
clear->VBO = 0;
_mesa_DeleteObjectARB(clear->ShaderProg);
clear->ShaderProg = 0;
@ -1980,24 +1980,24 @@ _mesa_meta_glsl_Clear(struct gl_context *ctx, GLbitfield buffers)
meta_glsl_clear_init(ctx, clear);
if (fb->_IntegerColor) {
_mesa_UseProgramObjectARB(clear->IntegerShaderProg);
_mesa_Uniform4ivARB(clear->IntegerColorLocation, 1,
_mesa_UseProgram(clear->IntegerShaderProg);
_mesa_Uniform4iv(clear->IntegerColorLocation, 1,
ctx->Color.ClearColor.i);
} else {
_mesa_UseProgramObjectARB(clear->ShaderProg);
_mesa_Uniform4fvARB(clear->ColorLocation, 1,
_mesa_UseProgram(clear->ShaderProg);
_mesa_Uniform4fv(clear->ColorLocation, 1,
ctx->Color.ClearColor.f);
}
_mesa_BindVertexArray(clear->ArrayObj);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, clear->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, clear->VBO);
/* GL_COLOR_BUFFER_BIT */
if (buffers & BUFFER_BITS_COLOR) {
/* leave colormask, glDrawBuffer state as-is */
/* Clears never have the color clamped. */
_mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);
_mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR, GL_FALSE);
}
else {
ASSERT(metaSave & MESA_META_COLOR_MASK);
@ -2042,7 +2042,7 @@ _mesa_meta_glsl_Clear(struct gl_context *ctx, GLbitfield buffers)
verts[3].z = z;
/* upload new vertex data */
_mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts,
_mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts), verts,
GL_DYNAMIC_DRAW_ARB);
/* draw quad */
@ -2098,9 +2098,9 @@ _mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY,
_mesa_BindVertexArray(copypix->ArrayObj);
/* create vertex array buffer */
_mesa_GenBuffersARB(1, &copypix->VBO);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, copypix->VBO);
_mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
_mesa_GenBuffers(1, &copypix->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, copypix->VBO);
_mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
NULL, GL_DYNAMIC_DRAW_ARB);
/* setup vertex arrays */
@ -2111,7 +2111,7 @@ _mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY,
}
else {
_mesa_BindVertexArray(copypix->ArrayObj);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, copypix->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, copypix->VBO);
}
newTex = alloc_texture(tex, width, height, intFormat);
@ -2146,7 +2146,7 @@ _mesa_meta_CopyPixels(struct gl_context *ctx, GLint srcX, GLint srcY,
verts[3].t = tex->Ttop;
/* upload new vertex data */
_mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
_mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
}
/* Alloc/setup texture */
@ -2260,8 +2260,8 @@ init_draw_stencil_pixels(struct gl_context *ctx)
texTarget = "2D";
_mesa_snprintf(program2, sizeof(program2), program, texTarget);
_mesa_GenPrograms(1, &drawpix->StencilFP);
_mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP);
_mesa_GenProgramsARB(1, &drawpix->StencilFP);
_mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP);
_mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
strlen(program2), (const GLubyte *) program2);
}
@ -2294,8 +2294,8 @@ init_draw_depth_pixels(struct gl_context *ctx)
texTarget = "2D";
_mesa_snprintf(program2, sizeof(program2), program, texTarget);
_mesa_GenPrograms(1, &drawpix->DepthFP);
_mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP);
_mesa_GenProgramsARB(1, &drawpix->DepthFP);
_mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP);
_mesa_ProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
strlen(program2), (const GLubyte *) program2);
}
@ -2452,9 +2452,9 @@ _mesa_meta_DrawPixels(struct gl_context *ctx,
_mesa_BindVertexArray(drawpix->ArrayObj);
/* create vertex array buffer */
_mesa_GenBuffersARB(1, &vbo);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, vbo);
_mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
_mesa_GenBuffers(1, &vbo);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, vbo);
_mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
verts, GL_DYNAMIC_DRAW_ARB);
/* setup vertex arrays */
@ -2490,7 +2490,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx,
/* set stencil bits to 1 where needed */
_mesa_StencilOp(GL_KEEP, GL_KEEP, GL_REPLACE);
_mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP);
_mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->StencilFP);
_mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE);
for (bit = 0; bit < ctx->DrawBuffer->Visual.stencilBits; bit++) {
@ -2511,7 +2511,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx,
if (!drawpix->DepthFP)
init_draw_depth_pixels(ctx);
_mesa_BindProgram(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP);
_mesa_BindProgramARB(GL_FRAGMENT_PROGRAM_ARB, drawpix->DepthFP);
_mesa_set_enable(ctx, GL_FRAGMENT_PROGRAM_ARB, GL_TRUE);
/* polygon color = current raster color */
@ -2532,7 +2532,7 @@ _mesa_meta_DrawPixels(struct gl_context *ctx,
_mesa_set_enable(ctx, tex->Target, GL_FALSE);
_mesa_DeleteBuffersARB(1, &vbo);
_mesa_DeleteBuffers(1, &vbo);
/* restore unpack params */
ctx->Unpack = unpackSave;
@ -2629,9 +2629,9 @@ _mesa_meta_Bitmap(struct gl_context *ctx,
_mesa_BindVertexArrayAPPLE(bitmap->ArrayObj);
/* create vertex array buffer */
_mesa_GenBuffersARB(1, &bitmap->VBO);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, bitmap->VBO);
_mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
_mesa_GenBuffers(1, &bitmap->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, bitmap->VBO);
_mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
NULL, GL_DYNAMIC_DRAW_ARB);
/* setup vertex arrays */
@ -2644,7 +2644,7 @@ _mesa_meta_Bitmap(struct gl_context *ctx,
}
else {
_mesa_BindVertexArray(bitmap->ArrayObj);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, bitmap->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, bitmap->VBO);
}
newTex = alloc_texture(tex, width, height, texIntFormat);
@ -2687,7 +2687,7 @@ _mesa_meta_Bitmap(struct gl_context *ctx,
}
/* upload new vertex data */
_mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
_mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
}
/* choose different foreground/background alpha values */
@ -2770,11 +2770,11 @@ _mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target,
* Test that we can actually render in the texture's format.
*/
if (!mipmap->FBO)
_mesa_GenFramebuffersEXT(1, &mipmap->FBO);
_mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mipmap->FBO);
_mesa_GenFramebuffers(1, &mipmap->FBO);
_mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, mipmap->FBO);
if (target == GL_TEXTURE_1D) {
_mesa_FramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT,
_mesa_FramebufferTexture1D(GL_FRAMEBUFFER_EXT,
GL_COLOR_ATTACHMENT0_EXT,
target, texObj->Name, srcLevel);
}
@ -2782,21 +2782,21 @@ _mesa_meta_check_generate_mipmap_fallback(struct gl_context *ctx, GLenum target,
/* other work is needed to enable 3D mipmap generation */
else if (target == GL_TEXTURE_3D) {
GLint zoffset = 0;
_mesa_FramebufferTexture3DEXT(GL_FRAMEBUFFER_EXT,
_mesa_FramebufferTexture3D(GL_FRAMEBUFFER_EXT,
GL_COLOR_ATTACHMENT0_EXT,
target, texObj->Name, srcLevel, zoffset);
}
#endif
else {
/* 2D / cube */
_mesa_FramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
_mesa_FramebufferTexture2D(GL_FRAMEBUFFER_EXT,
GL_COLOR_ATTACHMENT0_EXT,
target, texObj->Name, srcLevel);
}
status = _mesa_CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
status = _mesa_CheckFramebufferStatus(GL_FRAMEBUFFER_EXT);
_mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboSave);
_mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboSave);
if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
return GL_TRUE;
@ -2975,8 +2975,8 @@ setup_ff_generate_mipmap(struct gl_context *ctx,
_mesa_BindVertexArrayAPPLE(mipmap->ArrayObj);
/* create vertex array buffer */
_mesa_GenBuffersARB(1, &mipmap->VBO);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO);
_mesa_GenBuffers(1, &mipmap->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, mipmap->VBO);
/* setup vertex arrays */
_mesa_VertexPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(x));
_mesa_TexCoordPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(tex));
@ -3058,13 +3058,13 @@ setup_glsl_generate_mipmap(struct gl_context *ctx,
_mesa_BindVertexArray(mipmap->ArrayObj);
/* create vertex array buffer */
_mesa_GenBuffersARB(1, &mipmap->VBO);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO);
_mesa_GenBuffers(1, &mipmap->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, mipmap->VBO);
/* setup vertex arrays */
_mesa_VertexAttribPointerARB(0, 2, GL_FLOAT, GL_FALSE,
_mesa_VertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE,
sizeof(struct vertex), OFFSET(x));
_mesa_VertexAttribPointerARB(1, 3, GL_FLOAT, GL_FALSE,
_mesa_VertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE,
sizeof(struct vertex), OFFSET(tex));
}
@ -3133,10 +3133,10 @@ setup_glsl_generate_mipmap(struct gl_context *ctx,
_mesa_DeleteObjectARB(fs);
_mesa_AttachShader(mipmap->ShaderProg, vs);
_mesa_DeleteObjectARB(vs);
_mesa_BindAttribLocationARB(mipmap->ShaderProg, 0, "position");
_mesa_BindAttribLocationARB(mipmap->ShaderProg, 1, "texcoords");
_mesa_EnableVertexAttribArrayARB(0);
_mesa_EnableVertexAttribArrayARB(1);
_mesa_BindAttribLocation(mipmap->ShaderProg, 0, "position");
_mesa_BindAttribLocation(mipmap->ShaderProg, 1, "texcoords");
_mesa_EnableVertexAttribArray(0);
_mesa_EnableVertexAttribArray(1);
link_program_with_debug(ctx, mipmap->ShaderProg);
sampler->shader_prog = mipmap->ShaderProg;
ralloc_free(mem_ctx);
@ -3149,9 +3149,9 @@ meta_glsl_generate_mipmap_cleanup(struct gl_context *ctx,
{
if (mipmap->ArrayObj == 0)
return;
_mesa_DeleteVertexArraysAPPLE(1, &mipmap->ArrayObj);
_mesa_DeleteVertexArrays(1, &mipmap->ArrayObj);
mipmap->ArrayObj = 0;
_mesa_DeleteBuffersARB(1, &mipmap->VBO);
_mesa_DeleteBuffers(1, &mipmap->VBO);
mipmap->VBO = 0;
_mesa_DeleteObjectARB(mipmap->sampler_1d.shader_prog);
@ -3219,7 +3219,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
*/
if (use_glsl_version) {
setup_glsl_generate_mipmap(ctx, mipmap, target);
_mesa_UseProgramObjectARB(mipmap->ShaderProg);
_mesa_UseProgram(mipmap->ShaderProg);
}
else {
setup_ff_generate_mipmap(ctx, mipmap);
@ -3227,7 +3227,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
}
_mesa_BindVertexArray(mipmap->ArrayObj);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, mipmap->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, mipmap->VBO);
samplerSave = ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler ?
ctx->Texture.Unit[ctx->Texture.CurrentUnit].Sampler->Name : 0;
@ -3236,7 +3236,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
_mesa_BindTexture(target, texObj->Name);
if (!mipmap->FBO) {
_mesa_GenFramebuffersEXT(1, &mipmap->FBO);
_mesa_GenFramebuffers(1, &mipmap->FBO);
}
if (!mipmap->Sampler) {
@ -3264,7 +3264,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
_mesa_BindSampler(ctx->Texture.CurrentUnit, mipmap->Sampler);
}
_mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, mipmap->FBO);
_mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, mipmap->FBO);
if (ctx->API == API_OPENGL || ctx->API == API_OPENGLES)
_mesa_TexParameteri(target, GL_GENERATE_MIPMAP, GL_FALSE);
@ -3291,7 +3291,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
verts[3].y = 1.0F;
/* upload vertex data */
_mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
_mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
verts, GL_DYNAMIC_DRAW_ARB);
/* texture is already locked, unlock now */
@ -3345,7 +3345,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
/* Set to draw into the current dstLevel */
if (target == GL_TEXTURE_1D) {
_mesa_FramebufferTexture1DEXT(GL_FRAMEBUFFER_EXT,
_mesa_FramebufferTexture1D(GL_FRAMEBUFFER_EXT,
GL_COLOR_ATTACHMENT0_EXT,
target,
texObj->Name,
@ -3353,7 +3353,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
}
else if (target == GL_TEXTURE_3D) {
GLint zoffset = 0; /* XXX unfinished */
_mesa_FramebufferTexture3DEXT(GL_FRAMEBUFFER_EXT,
_mesa_FramebufferTexture3D(GL_FRAMEBUFFER_EXT,
GL_COLOR_ATTACHMENT0_EXT,
target,
texObj->Name,
@ -3361,7 +3361,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
}
else {
/* 2D / cube */
_mesa_FramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT,
_mesa_FramebufferTexture2D(GL_FRAMEBUFFER_EXT,
GL_COLOR_ATTACHMENT0_EXT,
faceTarget,
texObj->Name,
@ -3371,7 +3371,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
_mesa_DrawBuffer(GL_COLOR_ATTACHMENT0_EXT);
/* sanity check */
status = _mesa_CheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT);
status = _mesa_CheckFramebufferStatus(GL_FRAMEBUFFER_EXT);
if (status != GL_FRAMEBUFFER_COMPLETE_EXT) {
_mesa_problem(ctx, "Unexpected incomplete framebuffer in "
"_mesa_meta_GenerateMipmap()");
@ -3397,7 +3397,7 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target,
if (genMipmapSave)
_mesa_TexParameteri(target, GL_GENERATE_MIPMAP, genMipmapSave);
_mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboSave);
_mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboSave);
}
@ -3574,23 +3574,23 @@ decompress_texture_image(struct gl_context *ctx,
/* Create/bind FBO/renderbuffer */
if (decompress->FBO == 0) {
_mesa_GenFramebuffersEXT(1, &decompress->FBO);
_mesa_GenRenderbuffersEXT(1, &decompress->RBO);
_mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, decompress->FBO);
_mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, decompress->RBO);
_mesa_FramebufferRenderbufferEXT(GL_FRAMEBUFFER_EXT,
_mesa_GenFramebuffers(1, &decompress->FBO);
_mesa_GenRenderbuffers(1, &decompress->RBO);
_mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, decompress->FBO);
_mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, decompress->RBO);
_mesa_FramebufferRenderbuffer(GL_FRAMEBUFFER_EXT,
GL_COLOR_ATTACHMENT0_EXT,
GL_RENDERBUFFER_EXT,
decompress->RBO);
}
else {
_mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, decompress->FBO);
_mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, decompress->FBO);
}
/* alloc dest surface */
if (width > decompress->Width || height > decompress->Height) {
_mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, decompress->RBO);
_mesa_RenderbufferStorageEXT(GL_RENDERBUFFER_EXT, GL_RGBA,
_mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, decompress->RBO);
_mesa_RenderbufferStorage(GL_RENDERBUFFER_EXT, GL_RGBA,
width, height);
decompress->Width = width;
decompress->Height = height;
@ -3603,9 +3603,9 @@ decompress_texture_image(struct gl_context *ctx,
_mesa_BindVertexArray(decompress->ArrayObj);
/* create vertex array buffer */
_mesa_GenBuffersARB(1, &decompress->VBO);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, decompress->VBO);
_mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
_mesa_GenBuffers(1, &decompress->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, decompress->VBO);
_mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
NULL, GL_DYNAMIC_DRAW_ARB);
/* setup vertex arrays */
@ -3616,7 +3616,7 @@ decompress_texture_image(struct gl_context *ctx,
}
else {
_mesa_BindVertexArray(decompress->ArrayObj);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, decompress->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, decompress->VBO);
}
if (!decompress->Sampler) {
@ -3652,7 +3652,7 @@ decompress_texture_image(struct gl_context *ctx,
verts[3].y = height;
/* upload new vertex data */
_mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
_mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
/* setup texture state */
_mesa_BindTexture(target, texObj->Name);
@ -3713,13 +3713,13 @@ decompress_texture_image(struct gl_context *ctx,
/* restore fbo bindings */
if (fboDrawSave == fboReadSave) {
_mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboDrawSave);
_mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, fboDrawSave);
}
else {
_mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, fboDrawSave);
_mesa_BindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, fboReadSave);
_mesa_BindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, fboDrawSave);
_mesa_BindFramebuffer(GL_READ_FRAMEBUFFER_EXT, fboReadSave);
}
_mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, rbSave);
_mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, rbSave);
}
@ -3784,9 +3784,9 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
_mesa_BindVertexArray(drawtex->ArrayObj);
/* create vertex array buffer */
_mesa_GenBuffersARB(1, &drawtex->VBO);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, drawtex->VBO);
_mesa_BufferDataARB(GL_ARRAY_BUFFER_ARB, sizeof(verts),
_mesa_GenBuffers(1, &drawtex->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, drawtex->VBO);
_mesa_BufferData(GL_ARRAY_BUFFER_ARB, sizeof(verts),
NULL, GL_DYNAMIC_DRAW_ARB);
/* client active texture is not part of the array object */
@ -3796,17 +3796,17 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
_mesa_VertexPointer(3, GL_FLOAT, sizeof(struct vertex), OFFSET(x));
_mesa_EnableClientState(GL_VERTEX_ARRAY);
for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
_mesa_ClientActiveTextureARB(GL_TEXTURE0 + i);
_mesa_ClientActiveTexture(GL_TEXTURE0 + i);
_mesa_TexCoordPointer(2, GL_FLOAT, sizeof(struct vertex), OFFSET(st[i]));
_mesa_EnableClientState(GL_TEXTURE_COORD_ARRAY);
}
/* restore client active texture */
_mesa_ClientActiveTextureARB(GL_TEXTURE0 + active_texture);
_mesa_ClientActiveTexture(GL_TEXTURE0 + active_texture);
}
else {
_mesa_BindVertexArray(drawtex->ArrayObj);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, drawtex->VBO);
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB, drawtex->VBO);
}
/* vertex positions, texcoords */
@ -3871,7 +3871,7 @@ _mesa_meta_DrawTex(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
verts[3].st[i][1] = t1;
}
_mesa_BufferSubDataARB(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
_mesa_BufferSubData(GL_ARRAY_BUFFER_ARB, 0, sizeof(verts), verts);
}
_mesa_DrawArrays(GL_TRIANGLE_FAN, 0, 4);

View file

@ -1068,25 +1068,25 @@ VertexAttrib4fvARB(GLuint index, const GLfloat *v)
static void GLAPIENTRY
VertexAttrib1dvARB(GLuint index, const GLdouble *v)
{
CALL_VertexAttrib1dvARB(GET_DISPATCH(), (index, v));
CALL_VertexAttrib1dv(GET_DISPATCH(), (index, v));
}
static void GLAPIENTRY
VertexAttrib2dvARB(GLuint index, const GLdouble *v)
{
CALL_VertexAttrib2dvARB(GET_DISPATCH(), (index, v));
CALL_VertexAttrib2dv(GET_DISPATCH(), (index, v));
}
static void GLAPIENTRY
VertexAttrib3dvARB(GLuint index, const GLdouble *v)
{
CALL_VertexAttrib3dvARB(GET_DISPATCH(), (index, v));
CALL_VertexAttrib3dv(GET_DISPATCH(), (index, v));
}
static void GLAPIENTRY
VertexAttrib4dvARB(GLuint index, const GLdouble *v)
{
CALL_VertexAttrib4dvARB(GET_DISPATCH(), (index, v));
CALL_VertexAttrib4dv(GET_DISPATCH(), (index, v));
}
@ -1114,7 +1114,7 @@ VertexAttribI3bv(GLuint index, const GLbyte *v)
static void GLAPIENTRY
VertexAttribI4bv(GLuint index, const GLbyte *v)
{
CALL_VertexAttribI4bvEXT(GET_DISPATCH(), (index, v));
CALL_VertexAttribI4bv(GET_DISPATCH(), (index, v));
}
@ -1139,7 +1139,7 @@ VertexAttribI3ubv(GLuint index, const GLubyte *v)
static void GLAPIENTRY
VertexAttribI4ubv(GLuint index, const GLubyte *v)
{
CALL_VertexAttribI4ubvEXT(GET_DISPATCH(), (index, v));
CALL_VertexAttribI4ubv(GET_DISPATCH(), (index, v));
}
@ -1165,7 +1165,7 @@ VertexAttribI3sv(GLuint index, const GLshort *v)
static void GLAPIENTRY
VertexAttribI4sv(GLuint index, const GLshort *v)
{
CALL_VertexAttribI4svEXT(GET_DISPATCH(), (index, v));
CALL_VertexAttribI4sv(GET_DISPATCH(), (index, v));
}
@ -1190,7 +1190,7 @@ VertexAttribI3usv(GLuint index, const GLushort *v)
static void GLAPIENTRY
VertexAttribI4usv(GLuint index, const GLushort *v)
{
CALL_VertexAttribI4usvEXT(GET_DISPATCH(), (index, v));
CALL_VertexAttribI4usv(GET_DISPATCH(), (index, v));
}
@ -1405,14 +1405,14 @@ GLboolean _ae_create_context( struct gl_context *ctx )
return GL_TRUE;
/* These _gloffset_* values may not be compile-time constants */
SecondaryColorFuncs[0] = _gloffset_SecondaryColor3bvEXT;
SecondaryColorFuncs[1] = _gloffset_SecondaryColor3ubvEXT;
SecondaryColorFuncs[2] = _gloffset_SecondaryColor3svEXT;
SecondaryColorFuncs[3] = _gloffset_SecondaryColor3usvEXT;
SecondaryColorFuncs[4] = _gloffset_SecondaryColor3ivEXT;
SecondaryColorFuncs[5] = _gloffset_SecondaryColor3uivEXT;
SecondaryColorFuncs[0] = _gloffset_SecondaryColor3bv;
SecondaryColorFuncs[1] = _gloffset_SecondaryColor3ubv;
SecondaryColorFuncs[2] = _gloffset_SecondaryColor3sv;
SecondaryColorFuncs[3] = _gloffset_SecondaryColor3usv;
SecondaryColorFuncs[4] = _gloffset_SecondaryColor3iv;
SecondaryColorFuncs[5] = _gloffset_SecondaryColor3uiv;
SecondaryColorFuncs[6] = _gloffset_SecondaryColor3fvEXT;
SecondaryColorFuncs[7] = _gloffset_SecondaryColor3dvEXT;
SecondaryColorFuncs[7] = _gloffset_SecondaryColor3dv;
FogCoordFuncs[0] = -1;
FogCoordFuncs[1] = -1;
@ -1421,7 +1421,7 @@ GLboolean _ae_create_context( struct gl_context *ctx )
FogCoordFuncs[4] = -1;
FogCoordFuncs[5] = -1;
FogCoordFuncs[6] = _gloffset_FogCoordfvEXT;
FogCoordFuncs[7] = _gloffset_FogCoorddvEXT;
FogCoordFuncs[7] = _gloffset_FogCoorddv;
ctx->aelt_context = calloc(1, sizeof(AEcontext));
if (!ctx->aelt_context)

File diff suppressed because it is too large Load diff

View file

@ -45,433 +45,433 @@ extern void
_mesa_loopback_init_api_table(const struct gl_context *ctx,
struct _glapi_table *dest);
void GLAPIENTRY
loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue );
_mesa_Color3b( GLbyte red, GLbyte green, GLbyte blue );
void GLAPIENTRY
loopback_Color3d_f( GLdouble red, GLdouble green, GLdouble blue );
_mesa_Color3d( GLdouble red, GLdouble green, GLdouble blue );
void GLAPIENTRY
loopback_Color3i_f( GLint red, GLint green, GLint blue );
_mesa_Color3i( GLint red, GLint green, GLint blue );
void GLAPIENTRY
loopback_Color3s_f( GLshort red, GLshort green, GLshort blue );
_mesa_Color3s( GLshort red, GLshort green, GLshort blue );
void GLAPIENTRY
loopback_Color3ui_f( GLuint red, GLuint green, GLuint blue );
_mesa_Color3ui( GLuint red, GLuint green, GLuint blue );
void GLAPIENTRY
loopback_Color3us_f( GLushort red, GLushort green, GLushort blue );
_mesa_Color3us( GLushort red, GLushort green, GLushort blue );
void GLAPIENTRY
loopback_Color3ub_f( GLubyte red, GLubyte green, GLubyte blue );
_mesa_Color3ub( GLubyte red, GLubyte green, GLubyte blue );
void GLAPIENTRY
loopback_Color3bv_f( const GLbyte *v );
_mesa_Color3bv( const GLbyte *v );
void GLAPIENTRY
loopback_Color3dv_f( const GLdouble *v );
_mesa_Color3dv( const GLdouble *v );
void GLAPIENTRY
loopback_Color3iv_f( const GLint *v );
_mesa_Color3iv( const GLint *v );
void GLAPIENTRY
loopback_Color3sv_f( const GLshort *v );
_mesa_Color3sv( const GLshort *v );
void GLAPIENTRY
loopback_Color3uiv_f( const GLuint *v );
_mesa_Color3uiv( const GLuint *v );
void GLAPIENTRY
loopback_Color3usv_f( const GLushort *v );
_mesa_Color3usv( const GLushort *v );
void GLAPIENTRY
loopback_Color3ubv_f( const GLubyte *v );
_mesa_Color3ubv( const GLubyte *v );
void GLAPIENTRY
loopback_Color4b_f( GLbyte red, GLbyte green, GLbyte blue,
_mesa_Color4b( GLbyte red, GLbyte green, GLbyte blue,
GLbyte alpha );
void GLAPIENTRY
loopback_Color4d_f( GLdouble red, GLdouble green, GLdouble blue,
_mesa_Color4d( GLdouble red, GLdouble green, GLdouble blue,
GLdouble alpha );
void GLAPIENTRY
loopback_Color4i_f( GLint red, GLint green, GLint blue, GLint alpha );
_mesa_Color4i( GLint red, GLint green, GLint blue, GLint alpha );
void GLAPIENTRY
loopback_Color4s_f( GLshort red, GLshort green, GLshort blue,
_mesa_Color4s( GLshort red, GLshort green, GLshort blue,
GLshort alpha );
void GLAPIENTRY
loopback_Color4ui_f( GLuint red, GLuint green, GLuint blue, GLuint alpha );
_mesa_Color4ui( GLuint red, GLuint green, GLuint blue, GLuint alpha );
void GLAPIENTRY
loopback_Color4us_f( GLushort red, GLushort green, GLushort blue,
_mesa_Color4us( GLushort red, GLushort green, GLushort blue,
GLushort alpha );
void GLAPIENTRY
loopback_Color4ub_f( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha );
_mesa_Color4ub( GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha );
void GLAPIENTRY
loopback_Color4iv_f( const GLint *v );
_mesa_Color4iv( const GLint *v );
void GLAPIENTRY
loopback_Color4bv_f( const GLbyte *v );
_mesa_Color4bv( const GLbyte *v );
void GLAPIENTRY
loopback_Color4dv_f( const GLdouble *v );
_mesa_Color4dv( const GLdouble *v );
void GLAPIENTRY
loopback_Color4sv_f( const GLshort *v);
_mesa_Color4sv( const GLshort *v);
void GLAPIENTRY
loopback_Color4uiv_f( const GLuint *v);
_mesa_Color4uiv( const GLuint *v);
void GLAPIENTRY
loopback_Color4usv_f( const GLushort *v);
_mesa_Color4usv( const GLushort *v);
void GLAPIENTRY
loopback_Color4ubv_f( const GLubyte *v);
_mesa_Color4ubv( const GLubyte *v);
void GLAPIENTRY
loopback_FogCoorddEXT( GLdouble d );
_mesa_FogCoordd( GLdouble d );
void GLAPIENTRY
loopback_FogCoorddvEXT( const GLdouble *v );
_mesa_FogCoorddv( const GLdouble *v );
void GLAPIENTRY
loopback_Indexd( GLdouble c );
_mesa_Indexd( GLdouble c );
void GLAPIENTRY
loopback_Indexi( GLint c );
_mesa_Indexi( GLint c );
void GLAPIENTRY
loopback_Indexs( GLshort c );
_mesa_Indexs( GLshort c );
void GLAPIENTRY
loopback_Indexub( GLubyte c );
_mesa_Indexub( GLubyte c );
void GLAPIENTRY
loopback_Indexdv( const GLdouble *c );
_mesa_Indexdv( const GLdouble *c );
void GLAPIENTRY
loopback_Indexiv( const GLint *c );
_mesa_Indexiv( const GLint *c );
void GLAPIENTRY
loopback_Indexsv( const GLshort *c );
_mesa_Indexsv( const GLshort *c );
void GLAPIENTRY
loopback_Indexubv( const GLubyte *c );
_mesa_Indexubv( const GLubyte *c );
void GLAPIENTRY
loopback_EdgeFlagv(const GLboolean *flag);
_mesa_EdgeFlagv(const GLboolean *flag);
void GLAPIENTRY
loopback_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz );
_mesa_Normal3b( GLbyte nx, GLbyte ny, GLbyte nz );
void GLAPIENTRY
loopback_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz );
_mesa_Normal3d( GLdouble nx, GLdouble ny, GLdouble nz );
void GLAPIENTRY
loopback_Normal3i( GLint nx, GLint ny, GLint nz );
_mesa_Normal3i( GLint nx, GLint ny, GLint nz );
void GLAPIENTRY
loopback_Normal3s( GLshort nx, GLshort ny, GLshort nz );
_mesa_Normal3s( GLshort nx, GLshort ny, GLshort nz );
void GLAPIENTRY
loopback_Normal3bv( const GLbyte *v );
_mesa_Normal3bv( const GLbyte *v );
void GLAPIENTRY
loopback_Normal3dv( const GLdouble *v );
_mesa_Normal3dv( const GLdouble *v );
void GLAPIENTRY
loopback_Normal3iv( const GLint *v );
_mesa_Normal3iv( const GLint *v );
void GLAPIENTRY
loopback_Normal3sv( const GLshort *v );
_mesa_Normal3sv( const GLshort *v );
void GLAPIENTRY
loopback_TexCoord1d( GLdouble s );
_mesa_TexCoord1d( GLdouble s );
void GLAPIENTRY
loopback_TexCoord1i( GLint s );
_mesa_TexCoord1i( GLint s );
void GLAPIENTRY
loopback_TexCoord1s( GLshort s );
_mesa_TexCoord1s( GLshort s );
void GLAPIENTRY
loopback_TexCoord2d( GLdouble s, GLdouble t );
_mesa_TexCoord2d( GLdouble s, GLdouble t );
void GLAPIENTRY
loopback_TexCoord2s( GLshort s, GLshort t );
_mesa_TexCoord2s( GLshort s, GLshort t );
void GLAPIENTRY
loopback_TexCoord2i( GLint s, GLint t );
_mesa_TexCoord2i( GLint s, GLint t );
void GLAPIENTRY
loopback_TexCoord3d( GLdouble s, GLdouble t, GLdouble r );
_mesa_TexCoord3d( GLdouble s, GLdouble t, GLdouble r );
void GLAPIENTRY
loopback_TexCoord3i( GLint s, GLint t, GLint r );
_mesa_TexCoord3i( GLint s, GLint t, GLint r );
void GLAPIENTRY
loopback_TexCoord3s( GLshort s, GLshort t, GLshort r );
_mesa_TexCoord3s( GLshort s, GLshort t, GLshort r );
void GLAPIENTRY
loopback_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
_mesa_TexCoord4d( GLdouble s, GLdouble t, GLdouble r, GLdouble q );
void GLAPIENTRY
loopback_TexCoord4i( GLint s, GLint t, GLint r, GLint q );
_mesa_TexCoord4i( GLint s, GLint t, GLint r, GLint q );
void GLAPIENTRY
loopback_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q );
_mesa_TexCoord4s( GLshort s, GLshort t, GLshort r, GLshort q );
void GLAPIENTRY
loopback_TexCoord1dv( const GLdouble *v );
_mesa_TexCoord1dv( const GLdouble *v );
void GLAPIENTRY
loopback_TexCoord1iv( const GLint *v );
_mesa_TexCoord1iv( const GLint *v );
void GLAPIENTRY
loopback_TexCoord1sv( const GLshort *v );
_mesa_TexCoord1sv( const GLshort *v );
void GLAPIENTRY
loopback_TexCoord2dv( const GLdouble *v );
_mesa_TexCoord2dv( const GLdouble *v );
void GLAPIENTRY
loopback_TexCoord2iv( const GLint *v );
_mesa_TexCoord2iv( const GLint *v );
void GLAPIENTRY
loopback_TexCoord2sv( const GLshort *v );
_mesa_TexCoord2sv( const GLshort *v );
void GLAPIENTRY
loopback_TexCoord3dv( const GLdouble *v );
_mesa_TexCoord3dv( const GLdouble *v );
void GLAPIENTRY
loopback_TexCoord3iv( const GLint *v );
_mesa_TexCoord3iv( const GLint *v );
void GLAPIENTRY
loopback_TexCoord3sv( const GLshort *v );
_mesa_TexCoord3sv( const GLshort *v );
void GLAPIENTRY
loopback_TexCoord4dv( const GLdouble *v );
_mesa_TexCoord4dv( const GLdouble *v );
void GLAPIENTRY
loopback_TexCoord4iv( const GLint *v );
_mesa_TexCoord4iv( const GLint *v );
void GLAPIENTRY
loopback_TexCoord4sv( const GLshort *v );
_mesa_TexCoord4sv( const GLshort *v );
void GLAPIENTRY
loopback_Vertex2d( GLdouble x, GLdouble y );
_mesa_Vertex2d( GLdouble x, GLdouble y );
void GLAPIENTRY
loopback_Vertex2i( GLint x, GLint y );
_mesa_Vertex2i( GLint x, GLint y );
void GLAPIENTRY
loopback_Vertex2s( GLshort x, GLshort y );
_mesa_Vertex2s( GLshort x, GLshort y );
void GLAPIENTRY
loopback_Vertex3d( GLdouble x, GLdouble y, GLdouble z );
_mesa_Vertex3d( GLdouble x, GLdouble y, GLdouble z );
void GLAPIENTRY
loopback_Vertex3i( GLint x, GLint y, GLint z );
_mesa_Vertex3i( GLint x, GLint y, GLint z );
void GLAPIENTRY
loopback_Vertex3s( GLshort x, GLshort y, GLshort z );
_mesa_Vertex3s( GLshort x, GLshort y, GLshort z );
void GLAPIENTRY
loopback_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
_mesa_Vertex4d( GLdouble x, GLdouble y, GLdouble z, GLdouble w );
void GLAPIENTRY
loopback_Vertex4i( GLint x, GLint y, GLint z, GLint w );
_mesa_Vertex4i( GLint x, GLint y, GLint z, GLint w );
void GLAPIENTRY
loopback_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w );
_mesa_Vertex4s( GLshort x, GLshort y, GLshort z, GLshort w );
void GLAPIENTRY
loopback_Vertex2dv( const GLdouble *v );
_mesa_Vertex2dv( const GLdouble *v );
void GLAPIENTRY
loopback_Vertex2iv( const GLint *v );
_mesa_Vertex2iv( const GLint *v );
void GLAPIENTRY
loopback_Vertex2sv( const GLshort *v );
_mesa_Vertex2sv( const GLshort *v );
void GLAPIENTRY
loopback_Vertex3dv( const GLdouble *v );
_mesa_Vertex3dv( const GLdouble *v );
void GLAPIENTRY
loopback_Vertex3iv( const GLint *v );
_mesa_Vertex3iv( const GLint *v );
void GLAPIENTRY
loopback_Vertex3sv( const GLshort *v );
_mesa_Vertex3sv( const GLshort *v );
void GLAPIENTRY
loopback_Vertex4dv( const GLdouble *v );
_mesa_Vertex4dv( const GLdouble *v );
void GLAPIENTRY
loopback_Vertex4iv( const GLint *v );
_mesa_Vertex4iv( const GLint *v );
void GLAPIENTRY
loopback_Vertex4sv( const GLshort *v );
_mesa_Vertex4sv( const GLshort *v );
void GLAPIENTRY
loopback_MultiTexCoord1dARB(GLenum target, GLdouble s);
_mesa_MultiTexCoord1d(GLenum target, GLdouble s);
void GLAPIENTRY
loopback_MultiTexCoord1dvARB(GLenum target, const GLdouble *v);
_mesa_MultiTexCoord1dv(GLenum target, const GLdouble *v);
void GLAPIENTRY
loopback_MultiTexCoord1iARB(GLenum target, GLint s);
_mesa_MultiTexCoord1i(GLenum target, GLint s);
void GLAPIENTRY
loopback_MultiTexCoord1ivARB(GLenum target, const GLint *v);
_mesa_MultiTexCoord1iv(GLenum target, const GLint *v);
void GLAPIENTRY
loopback_MultiTexCoord1sARB(GLenum target, GLshort s);
_mesa_MultiTexCoord1s(GLenum target, GLshort s);
void GLAPIENTRY
loopback_MultiTexCoord1svARB(GLenum target, const GLshort *v);
_mesa_MultiTexCoord1sv(GLenum target, const GLshort *v);
void GLAPIENTRY
loopback_MultiTexCoord2dARB(GLenum target, GLdouble s, GLdouble t);
_mesa_MultiTexCoord2d(GLenum target, GLdouble s, GLdouble t);
void GLAPIENTRY
loopback_MultiTexCoord2dvARB(GLenum target, const GLdouble *v);
_mesa_MultiTexCoord2dv(GLenum target, const GLdouble *v);
void GLAPIENTRY
loopback_MultiTexCoord2iARB(GLenum target, GLint s, GLint t);
_mesa_MultiTexCoord2i(GLenum target, GLint s, GLint t);
void GLAPIENTRY
loopback_MultiTexCoord2ivARB(GLenum target, const GLint *v);
_mesa_MultiTexCoord2iv(GLenum target, const GLint *v);
void GLAPIENTRY
loopback_MultiTexCoord2sARB(GLenum target, GLshort s, GLshort t);
_mesa_MultiTexCoord2s(GLenum target, GLshort s, GLshort t);
void GLAPIENTRY
loopback_MultiTexCoord2svARB(GLenum target, const GLshort *v);
_mesa_MultiTexCoord2sv(GLenum target, const GLshort *v);
void GLAPIENTRY
loopback_MultiTexCoord3dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r);
_mesa_MultiTexCoord3d(GLenum target, GLdouble s, GLdouble t, GLdouble r);
void GLAPIENTRY
loopback_MultiTexCoord3dvARB(GLenum target, const GLdouble *v);
_mesa_MultiTexCoord3dv(GLenum target, const GLdouble *v);
void GLAPIENTRY
loopback_MultiTexCoord3iARB(GLenum target, GLint s, GLint t, GLint r);
_mesa_MultiTexCoord3i(GLenum target, GLint s, GLint t, GLint r);
void GLAPIENTRY
loopback_MultiTexCoord3ivARB(GLenum target, const GLint *v);
_mesa_MultiTexCoord3iv(GLenum target, const GLint *v);
void GLAPIENTRY
loopback_MultiTexCoord3sARB(GLenum target, GLshort s, GLshort t, GLshort r);
_mesa_MultiTexCoord3s(GLenum target, GLshort s, GLshort t, GLshort r);
void GLAPIENTRY
loopback_MultiTexCoord3svARB(GLenum target, const GLshort *v);
_mesa_MultiTexCoord3sv(GLenum target, const GLshort *v);
void GLAPIENTRY
loopback_MultiTexCoord4dARB(GLenum target, GLdouble s, GLdouble t, GLdouble r,
_mesa_MultiTexCoord4d(GLenum target, GLdouble s, GLdouble t, GLdouble r,
GLdouble q);
void GLAPIENTRY
loopback_MultiTexCoord4dvARB(GLenum target, const GLdouble *v);
_mesa_MultiTexCoord4dv(GLenum target, const GLdouble *v);
void GLAPIENTRY
loopback_MultiTexCoord4iARB(GLenum target, GLint s, GLint t, GLint r, GLint q);
_mesa_MultiTexCoord4i(GLenum target, GLint s, GLint t, GLint r, GLint q);
void GLAPIENTRY
loopback_MultiTexCoord4ivARB(GLenum target, const GLint *v);
_mesa_MultiTexCoord4iv(GLenum target, const GLint *v);
void GLAPIENTRY
loopback_MultiTexCoord4sARB(GLenum target, GLshort s, GLshort t, GLshort r,
_mesa_MultiTexCoord4s(GLenum target, GLshort s, GLshort t, GLshort r,
GLshort q);
void GLAPIENTRY
loopback_MultiTexCoord4svARB(GLenum target, const GLshort *v);
_mesa_MultiTexCoord4sv(GLenum target, const GLshort *v);
void GLAPIENTRY
loopback_EvalCoord2dv( const GLdouble *u );
_mesa_EvalCoord2dv( const GLdouble *u );
void GLAPIENTRY
loopback_EvalCoord2fv( const GLfloat *u );
_mesa_EvalCoord2fv( const GLfloat *u );
void GLAPIENTRY
loopback_EvalCoord2d( GLdouble u, GLdouble v );
_mesa_EvalCoord2d( GLdouble u, GLdouble v );
void GLAPIENTRY
loopback_EvalCoord1dv( const GLdouble *u );
_mesa_EvalCoord1dv( const GLdouble *u );
void GLAPIENTRY
loopback_EvalCoord1fv( const GLfloat *u );
_mesa_EvalCoord1fv( const GLfloat *u );
void GLAPIENTRY
loopback_EvalCoord1d( GLdouble u );
_mesa_EvalCoord1d( GLdouble u );
void GLAPIENTRY
loopback_Materialf( GLenum face, GLenum pname, GLfloat param );
_mesa_Materialf( GLenum face, GLenum pname, GLfloat param );
void GLAPIENTRY
loopback_Materiali(GLenum face, GLenum pname, GLint param );
_mesa_Materiali(GLenum face, GLenum pname, GLint param );
void GLAPIENTRY
loopback_Materialiv(GLenum face, GLenum pname, const GLint *params );
_mesa_Materialiv(GLenum face, GLenum pname, const GLint *params );
void GLAPIENTRY
loopback_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
_mesa_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2);
void GLAPIENTRY
loopback_Rectdv(const GLdouble *v1, const GLdouble *v2);
_mesa_Rectdv(const GLdouble *v1, const GLdouble *v2);
void GLAPIENTRY
loopback_Rectfv(const GLfloat *v1, const GLfloat *v2);
_mesa_Rectfv(const GLfloat *v1, const GLfloat *v2);
void GLAPIENTRY
loopback_Recti(GLint x1, GLint y1, GLint x2, GLint y2);
_mesa_Recti(GLint x1, GLint y1, GLint x2, GLint y2);
void GLAPIENTRY
loopback_Rectiv(const GLint *v1, const GLint *v2);
_mesa_Rectiv(const GLint *v1, const GLint *v2);
void GLAPIENTRY
loopback_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
_mesa_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2);
void GLAPIENTRY
loopback_Rectsv(const GLshort *v1, const GLshort *v2);
_mesa_Rectsv(const GLshort *v1, const GLshort *v2);
void GLAPIENTRY
loopback_SecondaryColor3bEXT_f( GLbyte red, GLbyte green, GLbyte blue );
_mesa_SecondaryColor3b( GLbyte red, GLbyte green, GLbyte blue );
void GLAPIENTRY
loopback_SecondaryColor3dEXT_f( GLdouble red, GLdouble green, GLdouble blue );
_mesa_SecondaryColor3d( GLdouble red, GLdouble green, GLdouble blue );
void GLAPIENTRY
loopback_SecondaryColor3iEXT_f( GLint red, GLint green, GLint blue );
_mesa_SecondaryColor3i( GLint red, GLint green, GLint blue );
void GLAPIENTRY
loopback_SecondaryColor3sEXT_f( GLshort red, GLshort green, GLshort blue );
_mesa_SecondaryColor3s( GLshort red, GLshort green, GLshort blue );
void GLAPIENTRY
loopback_SecondaryColor3uiEXT_f( GLuint red, GLuint green, GLuint blue );
_mesa_SecondaryColor3ui( GLuint red, GLuint green, GLuint blue );
void GLAPIENTRY
loopback_SecondaryColor3usEXT_f( GLushort red, GLushort green, GLushort blue );
_mesa_SecondaryColor3us( GLushort red, GLushort green, GLushort blue );
void GLAPIENTRY
loopback_SecondaryColor3ubEXT_f( GLubyte red, GLubyte green, GLubyte blue );
_mesa_SecondaryColor3ub( GLubyte red, GLubyte green, GLubyte blue );
void GLAPIENTRY
loopback_SecondaryColor3bvEXT_f( const GLbyte *v );
_mesa_SecondaryColor3bv( const GLbyte *v );
void GLAPIENTRY
loopback_SecondaryColor3dvEXT_f( const GLdouble *v );
_mesa_SecondaryColor3dv( const GLdouble *v );
void GLAPIENTRY
loopback_SecondaryColor3ivEXT_f( const GLint *v );
_mesa_SecondaryColor3iv( const GLint *v );
void GLAPIENTRY
loopback_SecondaryColor3svEXT_f( const GLshort *v );
_mesa_SecondaryColor3sv( const GLshort *v );
void GLAPIENTRY
loopback_SecondaryColor3uivEXT_f( const GLuint *v );
_mesa_SecondaryColor3uiv( const GLuint *v );
void GLAPIENTRY
loopback_SecondaryColor3usvEXT_f( const GLushort *v );
_mesa_SecondaryColor3usv( const GLushort *v );
void GLAPIENTRY
loopback_SecondaryColor3ubvEXT_f( const GLubyte *v );
_mesa_SecondaryColor3ubv( const GLubyte *v );
void GLAPIENTRY
loopback_VertexAttrib1sNV(GLuint index, GLshort x);
_mesa_VertexAttrib1sNV(GLuint index, GLshort x);
void GLAPIENTRY
loopback_VertexAttrib1dNV(GLuint index, GLdouble x);
_mesa_VertexAttrib1dNV(GLuint index, GLdouble x);
void GLAPIENTRY
loopback_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y);
_mesa_VertexAttrib2sNV(GLuint index, GLshort x, GLshort y);
void GLAPIENTRY
loopback_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y);
_mesa_VertexAttrib2dNV(GLuint index, GLdouble x, GLdouble y);
void GLAPIENTRY
loopback_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z);
_mesa_VertexAttrib3sNV(GLuint index, GLshort x, GLshort y, GLshort z);
void GLAPIENTRY
loopback_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z);
_mesa_VertexAttrib3dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z);
void GLAPIENTRY
loopback_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z,
_mesa_VertexAttrib4sNV(GLuint index, GLshort x, GLshort y, GLshort z,
GLshort w);
void GLAPIENTRY
loopback_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z,
_mesa_VertexAttrib4dNV(GLuint index, GLdouble x, GLdouble y, GLdouble z,
GLdouble w);
void GLAPIENTRY
loopback_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z,
_mesa_VertexAttrib4ubNV(GLuint index, GLubyte x, GLubyte y, GLubyte z,
GLubyte w);
void GLAPIENTRY
loopback_VertexAttrib1svNV(GLuint index, const GLshort *v);
_mesa_VertexAttrib1svNV(GLuint index, const GLshort *v);
void GLAPIENTRY
loopback_VertexAttrib1dvNV(GLuint index, const GLdouble *v);
_mesa_VertexAttrib1dvNV(GLuint index, const GLdouble *v);
void GLAPIENTRY
loopback_VertexAttrib2svNV(GLuint index, const GLshort *v);
_mesa_VertexAttrib2svNV(GLuint index, const GLshort *v);
void GLAPIENTRY
loopback_VertexAttrib2dvNV(GLuint index, const GLdouble *v);
_mesa_VertexAttrib2dvNV(GLuint index, const GLdouble *v);
void GLAPIENTRY
loopback_VertexAttrib3svNV(GLuint index, const GLshort *v);
_mesa_VertexAttrib3svNV(GLuint index, const GLshort *v);
void GLAPIENTRY
loopback_VertexAttrib3dvNV(GLuint index, const GLdouble *v);
_mesa_VertexAttrib3dvNV(GLuint index, const GLdouble *v);
void GLAPIENTRY
loopback_VertexAttrib4svNV(GLuint index, const GLshort *v);
_mesa_VertexAttrib4svNV(GLuint index, const GLshort *v);
void GLAPIENTRY
loopback_VertexAttrib4dvNV(GLuint index, const GLdouble *v);
_mesa_VertexAttrib4dvNV(GLuint index, const GLdouble *v);
void GLAPIENTRY
loopback_VertexAttrib4ubvNV(GLuint index, const GLubyte *v);
_mesa_VertexAttrib4ubvNV(GLuint index, const GLubyte *v);
void GLAPIENTRY
loopback_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v);
_mesa_VertexAttribs1svNV(GLuint index, GLsizei n, const GLshort *v);
void GLAPIENTRY
loopback_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v);
_mesa_VertexAttribs1fvNV(GLuint index, GLsizei n, const GLfloat *v);
void GLAPIENTRY
loopback_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v);
_mesa_VertexAttribs1dvNV(GLuint index, GLsizei n, const GLdouble *v);
void GLAPIENTRY
loopback_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v);
_mesa_VertexAttribs2svNV(GLuint index, GLsizei n, const GLshort *v);
void GLAPIENTRY
loopback_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v);
_mesa_VertexAttribs2fvNV(GLuint index, GLsizei n, const GLfloat *v);
void GLAPIENTRY
loopback_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v);
_mesa_VertexAttribs2dvNV(GLuint index, GLsizei n, const GLdouble *v);
void GLAPIENTRY
loopback_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v);
_mesa_VertexAttribs3svNV(GLuint index, GLsizei n, const GLshort *v);
void GLAPIENTRY
loopback_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v);
_mesa_VertexAttribs3fvNV(GLuint index, GLsizei n, const GLfloat *v);
void GLAPIENTRY
loopback_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v);
_mesa_VertexAttribs3dvNV(GLuint index, GLsizei n, const GLdouble *v);
void GLAPIENTRY
loopback_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v);
_mesa_VertexAttribs4svNV(GLuint index, GLsizei n, const GLshort *v);
void GLAPIENTRY
loopback_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v);
_mesa_VertexAttribs4fvNV(GLuint index, GLsizei n, const GLfloat *v);
void GLAPIENTRY
loopback_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v);
_mesa_VertexAttribs4dvNV(GLuint index, GLsizei n, const GLdouble *v);
void GLAPIENTRY
loopback_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v);
_mesa_VertexAttribs4ubvNV(GLuint index, GLsizei n, const GLubyte *v);
void GLAPIENTRY
loopback_VertexAttrib1sARB(GLuint index, GLshort x);
_mesa_VertexAttrib1s(GLuint index, GLshort x);
void GLAPIENTRY
loopback_VertexAttrib1dARB(GLuint index, GLdouble x);
_mesa_VertexAttrib1d(GLuint index, GLdouble x);
void GLAPIENTRY
loopback_VertexAttrib2sARB(GLuint index, GLshort x, GLshort y);
_mesa_VertexAttrib2s(GLuint index, GLshort x, GLshort y);
void GLAPIENTRY
loopback_VertexAttrib2dARB(GLuint index, GLdouble x, GLdouble y);
_mesa_VertexAttrib2d(GLuint index, GLdouble x, GLdouble y);
void GLAPIENTRY
loopback_VertexAttrib3sARB(GLuint index, GLshort x, GLshort y, GLshort z);
_mesa_VertexAttrib3s(GLuint index, GLshort x, GLshort y, GLshort z);
void GLAPIENTRY
loopback_VertexAttrib3dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z);
_mesa_VertexAttrib3d(GLuint index, GLdouble x, GLdouble y, GLdouble z);
void GLAPIENTRY
loopback_VertexAttrib4sARB(GLuint index, GLshort x, GLshort y, GLshort z,
_mesa_VertexAttrib4s(GLuint index, GLshort x, GLshort y, GLshort z,
GLshort w);
void GLAPIENTRY
loopback_VertexAttrib4dARB(GLuint index, GLdouble x, GLdouble y, GLdouble z,
_mesa_VertexAttrib4d(GLuint index, GLdouble x, GLdouble y, GLdouble z,
GLdouble w);
void GLAPIENTRY
loopback_VertexAttrib1svARB(GLuint index, const GLshort *v);
_mesa_VertexAttrib1sv(GLuint index, const GLshort *v);
void GLAPIENTRY
loopback_VertexAttrib1dvARB(GLuint index, const GLdouble *v);
_mesa_VertexAttrib1dv(GLuint index, const GLdouble *v);
void GLAPIENTRY
loopback_VertexAttrib2svARB(GLuint index, const GLshort *v);
_mesa_VertexAttrib2sv(GLuint index, const GLshort *v);
void GLAPIENTRY
loopback_VertexAttrib2dvARB(GLuint index, const GLdouble *v);
_mesa_VertexAttrib2dv(GLuint index, const GLdouble *v);
void GLAPIENTRY
loopback_VertexAttrib3svARB(GLuint index, const GLshort *v);
_mesa_VertexAttrib3sv(GLuint index, const GLshort *v);
void GLAPIENTRY
loopback_VertexAttrib3dvARB(GLuint index, const GLdouble *v);
_mesa_VertexAttrib3dv(GLuint index, const GLdouble *v);
void GLAPIENTRY
loopback_VertexAttrib4svARB(GLuint index, const GLshort *v);
_mesa_VertexAttrib4sv(GLuint index, const GLshort *v);
void GLAPIENTRY
loopback_VertexAttrib4dvARB(GLuint index, const GLdouble *v);
_mesa_VertexAttrib4dv(GLuint index, const GLdouble *v);
void GLAPIENTRY
loopback_VertexAttrib4bvARB(GLuint index, const GLbyte * v);
_mesa_VertexAttrib4bv(GLuint index, const GLbyte * v);
void GLAPIENTRY
loopback_VertexAttrib4ivARB(GLuint index, const GLint * v);
_mesa_VertexAttrib4iv(GLuint index, const GLint * v);
void GLAPIENTRY
loopback_VertexAttrib4ubvARB(GLuint index, const GLubyte * v);
_mesa_VertexAttrib4ubv(GLuint index, const GLubyte * v);
void GLAPIENTRY
loopback_VertexAttrib4usvARB(GLuint index, const GLushort * v);
_mesa_VertexAttrib4usv(GLuint index, const GLushort * v);
void GLAPIENTRY
loopback_VertexAttrib4uivARB(GLuint index, const GLuint * v);
_mesa_VertexAttrib4uiv(GLuint index, const GLuint * v);
void GLAPIENTRY
loopback_VertexAttrib4NbvARB(GLuint index, const GLbyte * v);
_mesa_VertexAttrib4Nbv(GLuint index, const GLbyte * v);
void GLAPIENTRY
loopback_VertexAttrib4NsvARB(GLuint index, const GLshort * v);
_mesa_VertexAttrib4Nsv(GLuint index, const GLshort * v);
void GLAPIENTRY
loopback_VertexAttrib4NivARB(GLuint index, const GLint * v);
_mesa_VertexAttrib4Niv(GLuint index, const GLint * v);
void GLAPIENTRY
loopback_VertexAttrib4NubARB(GLuint index, GLubyte x, GLubyte y, GLubyte z,
_mesa_VertexAttrib4Nub(GLuint index, GLubyte x, GLubyte y, GLubyte z,
GLubyte w);
void GLAPIENTRY
loopback_VertexAttrib4NubvARB(GLuint index, const GLubyte * v);
_mesa_VertexAttrib4Nubv(GLuint index, const GLubyte * v);
void GLAPIENTRY
loopback_VertexAttrib4NusvARB(GLuint index, const GLushort * v);
_mesa_VertexAttrib4Nusv(GLuint index, const GLushort * v);
void GLAPIENTRY
loopback_VertexAttrib4NuivARB(GLuint index, const GLuint * v);
_mesa_VertexAttrib4Nuiv(GLuint index, const GLuint * v);
void GLAPIENTRY
loopback_VertexAttribI1iv(GLuint index, const GLint *v);
_mesa_VertexAttribI1iv(GLuint index, const GLint *v);
void GLAPIENTRY
loopback_VertexAttribI1uiv(GLuint index, const GLuint *v);
_mesa_VertexAttribI1uiv(GLuint index, const GLuint *v);
void GLAPIENTRY
loopback_VertexAttribI4bv(GLuint index, const GLbyte *v);
_mesa_VertexAttribI4bv(GLuint index, const GLbyte *v);
void GLAPIENTRY
loopback_VertexAttribI4sv(GLuint index, const GLshort *v);
_mesa_VertexAttribI4sv(GLuint index, const GLshort *v);
void GLAPIENTRY
loopback_VertexAttribI4ubv(GLuint index, const GLubyte *v);
_mesa_VertexAttribI4ubv(GLuint index, const GLubyte *v);
void GLAPIENTRY
loopback_VertexAttribI4usv(GLuint index, const GLushort *v);
_mesa_VertexAttribI4usv(GLuint index, const GLushort *v);
#endif /* API_LOOPBACK_H */

View file

@ -46,7 +46,7 @@
* and glBindProgramARB.
*/
void GLAPIENTRY
_mesa_BindProgram(GLenum target, GLuint id)
_mesa_BindProgramARB(GLenum target, GLuint id)
{
struct gl_program *curProg, *newProg;
GET_CURRENT_CONTEXT(ctx);
@ -132,7 +132,7 @@ _mesa_BindProgram(GLenum target, GLuint id)
* \note Called by both glDeleteProgramsNV and glDeleteProgramsARB.
*/
void GLAPIENTRY
_mesa_DeletePrograms(GLsizei n, const GLuint *ids)
_mesa_DeleteProgramsARB(GLsizei n, const GLuint *ids)
{
GLint i;
GET_CURRENT_CONTEXT(ctx);
@ -156,14 +156,14 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids)
if (ctx->VertexProgram.Current &&
ctx->VertexProgram.Current->Base.Id == ids[i]) {
/* unbind this currently bound program */
_mesa_BindProgram(prog->Target, 0);
_mesa_BindProgramARB(prog->Target, 0);
}
break;
case GL_FRAGMENT_PROGRAM_ARB:
if (ctx->FragmentProgram.Current &&
ctx->FragmentProgram.Current->Base.Id == ids[i]) {
/* unbind this currently bound program */
_mesa_BindProgram(prog->Target, 0);
_mesa_BindProgramARB(prog->Target, 0);
}
break;
default:
@ -185,7 +185,7 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids)
* \note Called by both glGenProgramsNV and glGenProgramsARB.
*/
void GLAPIENTRY
_mesa_GenPrograms(GLsizei n, GLuint *ids)
_mesa_GenProgramsARB(GLsizei n, GLuint *ids)
{
GLuint first;
GLuint i;

View file

@ -31,13 +31,13 @@
extern void GLAPIENTRY
_mesa_BindProgram(GLenum target, GLuint id);
_mesa_BindProgramARB(GLenum target, GLuint id);
extern void GLAPIENTRY
_mesa_DeletePrograms(GLsizei n, const GLuint *ids);
_mesa_DeleteProgramsARB(GLsizei n, const GLuint *ids);
extern void GLAPIENTRY
_mesa_GenPrograms(GLsizei n, GLuint *ids);
_mesa_GenProgramsARB(GLsizei n, GLuint *ids);
extern GLboolean GLAPIENTRY

View file

@ -431,7 +431,7 @@ _mesa_BindVertexArrayAPPLE( GLuint id )
* \param ids Array of \c n array object IDs.
*/
void GLAPIENTRY
_mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids)
_mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids)
{
GET_CURRENT_CONTEXT(ctx);
GLsizei i;
@ -541,7 +541,7 @@ _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays)
* \c GL_FALSE otherwise.
*/
GLboolean GLAPIENTRY
_mesa_IsVertexArrayAPPLE( GLuint id )
_mesa_IsVertexArray( GLuint id )
{
struct gl_array_object * obj;
GET_CURRENT_CONTEXT(ctx);

View file

@ -110,12 +110,12 @@ void GLAPIENTRY _mesa_BindVertexArray( GLuint id );
void GLAPIENTRY _mesa_BindVertexArrayAPPLE( GLuint id );
void GLAPIENTRY _mesa_DeleteVertexArraysAPPLE(GLsizei n, const GLuint *ids);
void GLAPIENTRY _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids);
void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays);
void GLAPIENTRY _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *buffer);
GLboolean GLAPIENTRY _mesa_IsVertexArrayAPPLE( GLuint id );
GLboolean GLAPIENTRY _mesa_IsVertexArray( GLuint id );
#endif /* ARRAYOBJ_H */

View file

@ -618,7 +618,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable)
const GLbitfield genEnabled = enable->TexGen[i];
if (ctx->Texture.Unit[i].Enabled != enabled) {
_mesa_ActiveTextureARB(GL_TEXTURE0 + i);
_mesa_ActiveTexture(GL_TEXTURE0 + i);
_mesa_set_enable(ctx, GL_TEXTURE_1D, !!(enabled & TEXTURE_1D_BIT));
_mesa_set_enable(ctx, GL_TEXTURE_2D, !!(enabled & TEXTURE_2D_BIT));
@ -640,7 +640,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable)
}
if (ctx->Texture.Unit[i].TexGenEnabled != genEnabled) {
_mesa_ActiveTextureARB(GL_TEXTURE0 + i);
_mesa_ActiveTexture(GL_TEXTURE0 + i);
_mesa_set_enable(ctx, GL_TEXTURE_GEN_S, !!(genEnabled & S_BIT));
_mesa_set_enable(ctx, GL_TEXTURE_GEN_T, !!(genEnabled & T_BIT));
_mesa_set_enable(ctx, GL_TEXTURE_GEN_R, !!(genEnabled & R_BIT));
@ -648,7 +648,7 @@ pop_enable_group(struct gl_context *ctx, const struct gl_enable_attrib *enable)
}
}
_mesa_ActiveTextureARB(GL_TEXTURE0 + curTexUnitSave);
_mesa_ActiveTexture(GL_TEXTURE0 + curTexUnitSave);
}
@ -666,7 +666,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate)
const struct gl_texture_unit *unit = &texstate->Texture.Unit[u];
GLuint tgt;
_mesa_ActiveTextureARB(GL_TEXTURE0_ARB + u);
_mesa_ActiveTexture(GL_TEXTURE0_ARB + u);
_mesa_set_enable(ctx, GL_TEXTURE_1D, !!(unit->Enabled & TEXTURE_1D_BIT));
_mesa_set_enable(ctx, GL_TEXTURE_2D, !!(unit->Enabled & TEXTURE_2D_BIT));
_mesa_set_enable(ctx, GL_TEXTURE_3D, !!(unit->Enabled & TEXTURE_3D_BIT));
@ -808,7 +808,7 @@ pop_texture_group(struct gl_context *ctx, struct texture_state *texstate)
}
}
_mesa_ActiveTextureARB(GL_TEXTURE0_ARB + texstate->Texture.CurrentUnit);
_mesa_ActiveTexture(GL_TEXTURE0_ARB + texstate->Texture.CurrentUnit);
_mesa_reference_shared_state(ctx, &texstate->SharedRef, NULL);
@ -879,7 +879,7 @@ _mesa_PopAttrib(void)
else {
GLuint i;
for (i = 0; i < ctx->Const.MaxDrawBuffers; i++) {
_mesa_ColorMaskIndexed(i,
_mesa_ColorMaski(i,
(GLboolean) (color->ColorMask[i][0] != 0),
(GLboolean) (color->ColorMask[i][1] != 0),
(GLboolean) (color->ColorMask[i][2] != 0),
@ -910,7 +910,7 @@ _mesa_PopAttrib(void)
* to record that error. Per OpenGL ARB decision.
*/
if (multipleBuffers)
_mesa_DrawBuffersARB(ctx->Const.MaxDrawBuffers,
_mesa_DrawBuffers(ctx->Const.MaxDrawBuffers,
color->DrawBuffer);
else
_mesa_DrawBuffer(color->DrawBuffer[0]);
@ -934,18 +934,18 @@ _mesa_PopAttrib(void)
/* set blend per buffer */
GLuint buf;
for (buf = 0; buf < ctx->Const.MaxDrawBuffers; buf++) {
_mesa_BlendFuncSeparatei(buf, color->Blend[buf].SrcRGB,
_mesa_BlendFuncSeparateiARB(buf, color->Blend[buf].SrcRGB,
color->Blend[buf].DstRGB,
color->Blend[buf].SrcA,
color->Blend[buf].DstA);
_mesa_BlendEquationSeparatei(buf,
_mesa_BlendEquationSeparateiARB(buf,
color->Blend[buf].EquationRGB,
color->Blend[buf].EquationA);
}
}
else {
/* set same blend modes for all buffers */
_mesa_BlendFuncSeparateEXT(color->Blend[0].SrcRGB,
_mesa_BlendFuncSeparate(color->Blend[0].SrcRGB,
color->Blend[0].DstRGB,
color->Blend[0].SrcA,
color->Blend[0].DstA);
@ -957,7 +957,7 @@ _mesa_PopAttrib(void)
_mesa_BlendEquation(color->Blend[0].EquationRGB);
}
else {
_mesa_BlendEquationSeparateEXT(
_mesa_BlendEquationSeparate(
color->Blend[0].EquationRGB,
color->Blend[0].EquationA);
}
@ -972,8 +972,8 @@ _mesa_PopAttrib(void)
_mesa_set_enable(ctx, GL_INDEX_LOGIC_OP,
color->IndexLogicOpEnabled);
_mesa_set_enable(ctx, GL_DITHER, color->DitherFlag);
_mesa_ClampColorARB(GL_CLAMP_FRAGMENT_COLOR_ARB, color->ClampFragmentColor);
_mesa_ClampColorARB(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
_mesa_ClampColor(GL_CLAMP_FRAGMENT_COLOR_ARB, color->ClampFragmentColor);
_mesa_ClampColor(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
/* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */
if (ctx->Extensions.EXT_framebuffer_sRGB)
@ -1100,7 +1100,7 @@ _mesa_PopAttrib(void)
/* materials */
memcpy(&ctx->Light.Material, &light->Material,
sizeof(struct gl_material));
_mesa_ClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, light->ClampVertexColor);
_mesa_ClampColor(GL_CLAMP_VERTEX_COLOR_ARB, light->ClampVertexColor);
}
break;
case GL_LINE_BIT:
@ -1293,7 +1293,7 @@ _mesa_PopAttrib(void)
ms->SampleAlphaToOne,
GL_SAMPLE_ALPHA_TO_ONE);
_mesa_SampleCoverageARB(ms->SampleCoverageValue,
_mesa_SampleCoverage(ms->SampleCoverageValue,
ms->SampleCoverageInvert);
}
break;
@ -1432,7 +1432,7 @@ restore_array_attrib(struct gl_context *ctx,
const bool arb_vao = (src->ArrayObj->Name != 0
&& src->ArrayObj->ARBsemantics);
if (arb_vao && !_mesa_IsVertexArrayAPPLE(src->ArrayObj->Name))
if (arb_vao && !_mesa_IsVertexArray(src->ArrayObj->Name))
return;
_mesa_BindVertexArrayAPPLE(src->ArrayObj->Name);
@ -1440,11 +1440,11 @@ restore_array_attrib(struct gl_context *ctx,
/* Restore or recreate the buffer objects by the names ... */
if (!arb_vao
|| src->ArrayBufferObj->Name == 0
|| _mesa_IsBufferARB(src->ArrayBufferObj->Name)) {
|| _mesa_IsBuffer(src->ArrayBufferObj->Name)) {
/* ... and restore its content */
copy_array_attrib(ctx, dest, src, false);
_mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB,
_mesa_BindBuffer(GL_ARRAY_BUFFER_ARB,
src->ArrayBufferObj->Name);
} else {
copy_array_attrib(ctx, dest, src, true);
@ -1452,8 +1452,8 @@ restore_array_attrib(struct gl_context *ctx,
if (!arb_vao
|| src->ArrayObj->ElementArrayBufferObj->Name == 0
|| _mesa_IsBufferARB(src->ArrayObj->ElementArrayBufferObj->Name))
_mesa_BindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB,
|| _mesa_IsBuffer(src->ArrayObj->ElementArrayBufferObj->Name))
_mesa_BindBuffer(GL_ELEMENT_ARRAY_BUFFER_ARB,
src->ArrayObj->ElementArrayBufferObj->Name);
}

View file

@ -170,7 +170,7 @@ validate_blend_factors(struct gl_context *ctx, const char *func,
void GLAPIENTRY
_mesa_BlendFunc( GLenum sfactor, GLenum dfactor )
{
_mesa_BlendFuncSeparateEXT(sfactor, dfactor, sfactor, dfactor);
_mesa_BlendFuncSeparate(sfactor, dfactor, sfactor, dfactor);
}
static GLboolean
@ -201,7 +201,7 @@ update_uses_dual_src(struct gl_context *ctx, int buf)
* \param dfactorA alpha destination factor operator.
*/
void GLAPIENTRY
_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
_mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA )
{
GLuint buf, numBuffers;
@ -260,9 +260,9 @@ _mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
* Set blend source/dest factors for one color buffer/target.
*/
void GLAPIENTRY
_mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor)
_mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor)
{
_mesa_BlendFuncSeparatei(buf, sfactor, dfactor, sfactor, dfactor);
_mesa_BlendFuncSeparateiARB(buf, sfactor, dfactor, sfactor, dfactor);
}
@ -270,7 +270,7 @@ _mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor)
* Set separate blend source/dest factors for one color buffer/target.
*/
void GLAPIENTRY
_mesa_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA)
{
GET_CURRENT_CONTEXT(ctx);
@ -384,7 +384,7 @@ _mesa_BlendEquation( GLenum mode )
* Set blend equation for one color buffer/target.
*/
void GLAPIENTRY
_mesa_BlendEquationi(GLuint buf, GLenum mode)
_mesa_BlendEquationiARB(GLuint buf, GLenum mode)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@ -419,7 +419,7 @@ _mesa_BlendEquationi(GLuint buf, GLenum mode)
void GLAPIENTRY
_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA )
_mesa_BlendEquationSeparate( GLenum modeRGB, GLenum modeA )
{
GLuint buf, numBuffers;
GLboolean changed;
@ -477,7 +477,7 @@ _mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA )
* Set separate blend equations for one color buffer/target.
*/
void GLAPIENTRY
_mesa_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA)
_mesa_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@ -730,7 +730,7 @@ _mesa_ColorMask( GLboolean red, GLboolean green,
* For GL_EXT_draw_buffers2 and GL3
*/
void GLAPIENTRY
_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green,
_mesa_ColorMaski( GLuint buf, GLboolean red, GLboolean green,
GLboolean blue, GLboolean alpha )
{
GLubyte tmp[4];
@ -766,7 +766,7 @@ _mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green,
void GLAPIENTRY
_mesa_ClampColorARB(GLenum target, GLenum clamp)
_mesa_ClampColor(GLenum target, GLenum clamp)
{
GET_CURRENT_CONTEXT(ctx);

View file

@ -43,16 +43,16 @@ _mesa_BlendFunc( GLenum sfactor, GLenum dfactor );
extern void GLAPIENTRY
_mesa_BlendFuncSeparateEXT( GLenum sfactorRGB, GLenum dfactorRGB,
_mesa_BlendFuncSeparate( GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA );
extern void GLAPIENTRY
_mesa_BlendFunci(GLuint buf, GLenum sfactor, GLenum dfactor);
_mesa_BlendFunciARB(GLuint buf, GLenum sfactor, GLenum dfactor);
extern void GLAPIENTRY
_mesa_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
_mesa_BlendFuncSeparateiARB(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB,
GLenum sfactorA, GLenum dfactorA);
@ -61,15 +61,15 @@ _mesa_BlendEquation( GLenum mode );
extern void GLAPIENTRY
_mesa_BlendEquationi(GLuint buf, GLenum mode);
_mesa_BlendEquationiARB(GLuint buf, GLenum mode);
extern void GLAPIENTRY
_mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA );
_mesa_BlendEquationSeparate( GLenum modeRGB, GLenum modeA );
extern void GLAPIENTRY
_mesa_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA);
_mesa_BlendEquationSeparateiARB(GLuint buf, GLenum modeRGB, GLenum modeA);
extern void GLAPIENTRY
@ -92,12 +92,12 @@ _mesa_ColorMask( GLboolean red, GLboolean green,
GLboolean blue, GLboolean alpha );
extern void GLAPIENTRY
_mesa_ColorMaskIndexed( GLuint buf, GLboolean red, GLboolean green,
_mesa_ColorMaski( GLuint buf, GLboolean red, GLboolean green,
GLboolean blue, GLboolean alpha );
extern void GLAPIENTRY
_mesa_ClampColorARB(GLenum target, GLenum clamp);
_mesa_ClampColor(GLenum target, GLenum clamp);
extern void

View file

@ -819,7 +819,7 @@ _mesa_init_buffer_object_functions(struct dd_function_table *driver)
/**********************************************************************/
void GLAPIENTRY
_mesa_BindBufferARB(GLenum target, GLuint buffer)
_mesa_BindBuffer(GLenum target, GLuint buffer)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@ -839,7 +839,7 @@ _mesa_BindBufferARB(GLenum target, GLuint buffer)
* \param ids Array of \c n buffer object IDs.
*/
void GLAPIENTRY
_mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
_mesa_DeleteBuffers(GLsizei n, const GLuint *ids)
{
GET_CURRENT_CONTEXT(ctx);
GLsizei i;
@ -874,23 +874,23 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
}
if (ctx->Array.ArrayBufferObj == bufObj) {
_mesa_BindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );
_mesa_BindBuffer( GL_ARRAY_BUFFER_ARB, 0 );
}
if (arrayObj->ElementArrayBufferObj == bufObj) {
_mesa_BindBufferARB( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
_mesa_BindBuffer( GL_ELEMENT_ARRAY_BUFFER_ARB, 0 );
}
/* unbind ARB_copy_buffer binding points */
if (ctx->CopyReadBuffer == bufObj) {
_mesa_BindBufferARB( GL_COPY_READ_BUFFER, 0 );
_mesa_BindBuffer( GL_COPY_READ_BUFFER, 0 );
}
if (ctx->CopyWriteBuffer == bufObj) {
_mesa_BindBufferARB( GL_COPY_WRITE_BUFFER, 0 );
_mesa_BindBuffer( GL_COPY_WRITE_BUFFER, 0 );
}
/* unbind transform feedback binding points */
if (ctx->TransformFeedback.CurrentBuffer == bufObj) {
_mesa_BindBufferARB( GL_TRANSFORM_FEEDBACK_BUFFER, 0 );
_mesa_BindBuffer( GL_TRANSFORM_FEEDBACK_BUFFER, 0 );
}
for (j = 0; j < MAX_FEEDBACK_BUFFERS; j++) {
if (ctx->TransformFeedback.CurrentObject->Buffers[j] == bufObj) {
@ -906,19 +906,19 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
}
if (ctx->UniformBuffer == bufObj) {
_mesa_BindBufferARB( GL_UNIFORM_BUFFER, 0 );
_mesa_BindBuffer( GL_UNIFORM_BUFFER, 0 );
}
/* unbind any pixel pack/unpack pointers bound to this buffer */
if (ctx->Pack.BufferObj == bufObj) {
_mesa_BindBufferARB( GL_PIXEL_PACK_BUFFER_EXT, 0 );
_mesa_BindBuffer( GL_PIXEL_PACK_BUFFER_EXT, 0 );
}
if (ctx->Unpack.BufferObj == bufObj) {
_mesa_BindBufferARB( GL_PIXEL_UNPACK_BUFFER_EXT, 0 );
_mesa_BindBuffer( GL_PIXEL_UNPACK_BUFFER_EXT, 0 );
}
if (ctx->Texture.BufferObject == bufObj) {
_mesa_BindBufferARB( GL_TEXTURE_BUFFER, 0 );
_mesa_BindBuffer( GL_TEXTURE_BUFFER, 0 );
}
/* The ID is immediately freed for re-use */
@ -949,7 +949,7 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids)
* \param buffer Array of \c n locations to store the IDs.
*/
void GLAPIENTRY
_mesa_GenBuffersARB(GLsizei n, GLuint *buffer)
_mesa_GenBuffers(GLsizei n, GLuint *buffer)
{
GET_CURRENT_CONTEXT(ctx);
GLuint first;
@ -994,7 +994,7 @@ _mesa_GenBuffersARB(GLsizei n, GLuint *buffer)
* \c GL_FALSE otherwise.
*/
GLboolean GLAPIENTRY
_mesa_IsBufferARB(GLuint id)
_mesa_IsBuffer(GLuint id)
{
struct gl_buffer_object *bufObj;
GET_CURRENT_CONTEXT(ctx);
@ -1009,7 +1009,7 @@ _mesa_IsBufferARB(GLuint id)
void GLAPIENTRY
_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
_mesa_BufferData(GLenum target, GLsizeiptrARB size,
const GLvoid * data, GLenum usage)
{
GET_CURRENT_CONTEXT(ctx);
@ -1089,7 +1089,7 @@ _mesa_BufferDataARB(GLenum target, GLsizeiptrARB size,
void GLAPIENTRY
_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,
_mesa_BufferSubData(GLenum target, GLintptrARB offset,
GLsizeiptrARB size, const GLvoid * data)
{
GET_CURRENT_CONTEXT(ctx);
@ -1114,7 +1114,7 @@ _mesa_BufferSubDataARB(GLenum target, GLintptrARB offset,
void GLAPIENTRY
_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,
_mesa_GetBufferSubData(GLenum target, GLintptrARB offset,
GLsizeiptrARB size, void * data)
{
GET_CURRENT_CONTEXT(ctx);
@ -1134,7 +1134,7 @@ _mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset,
void * GLAPIENTRY
_mesa_MapBufferARB(GLenum target, GLenum access)
_mesa_MapBuffer(GLenum target, GLenum access)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object * bufObj;
@ -1229,7 +1229,7 @@ _mesa_MapBufferARB(GLenum target, GLenum access)
GLboolean GLAPIENTRY
_mesa_UnmapBufferARB(GLenum target)
_mesa_UnmapBuffer(GLenum target)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *bufObj;
@ -1292,7 +1292,7 @@ _mesa_UnmapBufferARB(GLenum target)
void GLAPIENTRY
_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params)
_mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *bufObj;
@ -1395,7 +1395,7 @@ invalid_pname:
void GLAPIENTRY
_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params)
_mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object * bufObj;

View file

@ -101,29 +101,29 @@ _mesa_init_buffer_object_functions(struct dd_function_table *driver);
*/
void GLAPIENTRY
_mesa_BindBufferARB(GLenum target, GLuint buffer);
_mesa_BindBuffer(GLenum target, GLuint buffer);
void GLAPIENTRY
_mesa_DeleteBuffersARB(GLsizei n, const GLuint * buffer);
_mesa_DeleteBuffers(GLsizei n, const GLuint * buffer);
void GLAPIENTRY
_mesa_GenBuffersARB(GLsizei n, GLuint * buffer);
_mesa_GenBuffers(GLsizei n, GLuint * buffer);
GLboolean GLAPIENTRY
_mesa_IsBufferARB(GLuint buffer);
_mesa_IsBuffer(GLuint buffer);
void GLAPIENTRY
_mesa_BufferDataARB(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage);
_mesa_BufferData(GLenum target, GLsizeiptrARB size, const GLvoid * data, GLenum usage);
void GLAPIENTRY
_mesa_BufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data);
_mesa_BufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid * data);
void GLAPIENTRY
_mesa_GetBufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data);
_mesa_GetBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data);
void * GLAPIENTRY
_mesa_MapBufferARB(GLenum target, GLenum access);
_mesa_MapBuffer(GLenum target, GLenum access);
GLboolean GLAPIENTRY
_mesa_UnmapBufferARB(GLenum target);
_mesa_UnmapBuffer(GLenum target);
void GLAPIENTRY
_mesa_GetBufferParameterivARB(GLenum target, GLenum pname, GLint *params);
_mesa_GetBufferParameteriv(GLenum target, GLenum pname, GLint *params);
void GLAPIENTRY
_mesa_GetBufferParameteri64v(GLenum target, GLenum pname, GLint64 *params);
void GLAPIENTRY
_mesa_GetBufferPointervARB(GLenum target, GLenum pname, GLvoid **params);
_mesa_GetBufferPointerv(GLenum target, GLenum pname, GLvoid **params);
void GLAPIENTRY
_mesa_CopyBufferSubData(GLenum readTarget, GLenum writeTarget,
GLintptr readOffset, GLintptr writeOffset,

View file

@ -206,7 +206,7 @@ read_buffer_enum_to_index(GLenum buffer)
* Called by glDrawBuffer().
* Specify which renderbuffer(s) to draw into for the first color output.
* <buffer> can name zero, one, two or four renderbuffers!
* \sa _mesa_DrawBuffersARB
* \sa _mesa_DrawBuffers
*
* \param buffer buffer token such as GL_LEFT or GL_FRONT_AND_BACK, etc.
*
@ -280,7 +280,7 @@ _mesa_DrawBuffer(GLenum buffer)
* GL_FRONT_AND_BACK is illegal.
*/
void GLAPIENTRY
_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers)
_mesa_DrawBuffers(GLsizei n, const GLenum *buffers)
{
GLint output;
GLbitfield usedBufferMask, supportedMask;

View file

@ -41,7 +41,7 @@ extern void GLAPIENTRY
_mesa_DrawBuffer( GLenum mode );
extern void GLAPIENTRY
_mesa_DrawBuffersARB(GLsizei n, const GLenum *buffers);
_mesa_DrawBuffers(GLsizei n, const GLenum *buffers);
extern void
_mesa_drawbuffers(struct gl_context *ctx, GLuint n, const GLenum *buffers,

File diff suppressed because it is too large Load diff

View file

@ -55,7 +55,7 @@ draw_texture(struct gl_context *ctx, GLfloat x, GLfloat y, GLfloat z,
void GLAPIENTRY
_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
_mesa_DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, x, y, z, width, height);
@ -63,7 +63,7 @@ _mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height)
void GLAPIENTRY
_mesa_DrawTexfv(const GLfloat *coords)
_mesa_DrawTexfvOES(const GLfloat *coords)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, coords[0], coords[1], coords[2], coords[3], coords[4]);
@ -71,7 +71,7 @@ _mesa_DrawTexfv(const GLfloat *coords)
void GLAPIENTRY
_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)
_mesa_DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
@ -80,7 +80,7 @@ _mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height)
void GLAPIENTRY
_mesa_DrawTexiv(const GLint *coords)
_mesa_DrawTexivOES(const GLint *coords)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],
@ -89,7 +89,7 @@ _mesa_DrawTexiv(const GLint *coords)
void GLAPIENTRY
_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
_mesa_DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) x, (GLfloat) y, (GLfloat) z,
@ -98,7 +98,7 @@ _mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height)
void GLAPIENTRY
_mesa_DrawTexsv(const GLshort *coords)
_mesa_DrawTexsvOES(const GLshort *coords)
{
GET_CURRENT_CONTEXT(ctx);
draw_texture(ctx, (GLfloat) coords[0], (GLfloat) coords[1],

View file

@ -30,22 +30,22 @@
extern void GLAPIENTRY
_mesa_DrawTexf(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
_mesa_DrawTexfOES(GLfloat x, GLfloat y, GLfloat z, GLfloat width, GLfloat height);
extern void GLAPIENTRY
_mesa_DrawTexfv(const GLfloat *coords);
_mesa_DrawTexfvOES(const GLfloat *coords);
extern void GLAPIENTRY
_mesa_DrawTexi(GLint x, GLint y, GLint z, GLint width, GLint height);
_mesa_DrawTexiOES(GLint x, GLint y, GLint z, GLint width, GLint height);
extern void GLAPIENTRY
_mesa_DrawTexiv(const GLint *coords);
_mesa_DrawTexivOES(const GLint *coords);
extern void GLAPIENTRY
_mesa_DrawTexs(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
_mesa_DrawTexsOES(GLshort x, GLshort y, GLshort z, GLshort width, GLshort height);
extern void GLAPIENTRY
_mesa_DrawTexsv(const GLshort *coords);
_mesa_DrawTexsvOES(const GLshort *coords);
extern void GLAPIENTRY
_mesa_DrawTexx(GLfixed x, GLfixed y, GLfixed z, GLfixed width, GLfixed height);

View file

@ -1072,7 +1072,7 @@ invalid_enum_error:
void GLAPIENTRY
_mesa_DisableIndexed( GLenum cap, GLuint index )
_mesa_Disablei( GLenum cap, GLuint index )
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@ -1081,7 +1081,7 @@ _mesa_DisableIndexed( GLenum cap, GLuint index )
void GLAPIENTRY
_mesa_EnableIndexed( GLenum cap, GLuint index )
_mesa_Enablei( GLenum cap, GLuint index )
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@ -1090,7 +1090,7 @@ _mesa_EnableIndexed( GLenum cap, GLuint index )
GLboolean GLAPIENTRY
_mesa_IsEnabledIndexed( GLenum cap, GLuint index )
_mesa_IsEnabledi( GLenum cap, GLuint index )
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, 0);

View file

@ -53,13 +53,13 @@ extern void
_mesa_set_enablei(struct gl_context *ctx, GLenum cap, GLuint index, GLboolean state);
extern void GLAPIENTRY
_mesa_DisableIndexed( GLenum cap, GLuint index );
_mesa_Disablei( GLenum cap, GLuint index );
extern void GLAPIENTRY
_mesa_EnableIndexed( GLenum cap, GLuint index );
_mesa_Enablei( GLenum cap, GLuint index );
extern GLboolean GLAPIENTRY
_mesa_IsEnabledIndexed( GLenum cap, GLuint index );
_mesa_IsEnabledi( GLenum cap, GLuint index );
extern void GLAPIENTRY
_mesa_EnableClientState( GLenum cap );

View file

@ -30,13 +30,13 @@
#include "main/es1_conversion.h"
void GL_APIENTRY
_es_AlphaFuncx(GLenum func, GLclampx ref)
_mesa_AlphaFuncx(GLenum func, GLclampx ref)
{
_mesa_AlphaFunc(func, (GLclampf) (ref / 65536.0f));
}
void GL_APIENTRY
_es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)
_mesa_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)
{
_mesa_ClearColor((GLclampf) (red / 65536.0f),
(GLclampf) (green / 65536.0f),
@ -45,13 +45,13 @@ _es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha)
}
void GL_APIENTRY
_es_ClearDepthx(GLclampx depth)
_mesa_ClearDepthx(GLclampx depth)
{
_mesa_ClearDepthf((GLclampf) (depth / 65536.0f));
}
void GL_APIENTRY
_es_ClipPlanef(GLenum plane, const GLfloat *equation)
_mesa_ClipPlanef(GLenum plane, const GLfloat *equation)
{
unsigned int i;
GLdouble converted_equation[4];
@ -64,7 +64,7 @@ _es_ClipPlanef(GLenum plane, const GLfloat *equation)
}
void GL_APIENTRY
_es_ClipPlanex(GLenum plane, const GLfixed *equation)
_mesa_ClipPlanex(GLenum plane, const GLfixed *equation)
{
unsigned int i;
GLdouble converted_equation[4];
@ -86,7 +86,7 @@ _es_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
}
void GL_APIENTRY
_es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
_mesa_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
{
_es_Color4f((GLfloat) (red / 65536.0f),
(GLfloat) (green / 65536.0f),
@ -95,17 +95,17 @@ _es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha)
}
void GL_APIENTRY
_es_DepthRangex(GLclampx zNear, GLclampx zFar)
_mesa_DepthRangex(GLclampx zNear, GLclampx zFar)
{
_mesa_DepthRangef((GLclampf) (zNear / 65536.0f),
(GLclampf) (zFar / 65536.0f));
}
void GL_APIENTRY
_es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h)
_mesa_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h)
{
_mesa_DrawTexf((GLfloat) (x / 65536.0f),
_mesa_DrawTexfOES((GLfloat) (x / 65536.0f),
(GLfloat) (y / 65536.0f),
(GLfloat) (z / 65536.0f),
(GLfloat) (w / 65536.0f),
@ -113,7 +113,7 @@ _es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h)
}
void GL_APIENTRY
_es_DrawTexxvOES(const GLfixed *coords)
_mesa_DrawTexxvOES(const GLfixed *coords)
{
unsigned int i;
GLfloat converted_coords[5];
@ -122,11 +122,11 @@ _es_DrawTexxvOES(const GLfixed *coords)
converted_coords[i] = (GLfloat) (coords[i] / 65536.0f);
}
_mesa_DrawTexfv(converted_coords);
_mesa_DrawTexfvOES(converted_coords);
}
void GL_APIENTRY
_es_Fogx(GLenum pname, GLfixed param)
_mesa_Fogx(GLenum pname, GLfixed param)
{
if (pname != GL_FOG_MODE) {
_mesa_Fogf(pname, (GLfloat) (param / 65536.0f));
@ -137,7 +137,7 @@ _es_Fogx(GLenum pname, GLfixed param)
}
void GL_APIENTRY
_es_Fogxv(GLenum pname, const GLfixed *params)
_mesa_Fogxv(GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@ -177,7 +177,7 @@ _es_Fogxv(GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
_es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
_mesa_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
GLfloat zNear, GLfloat zFar)
{
_mesa_Frustum((GLdouble) (left),
@ -189,7 +189,7 @@ _es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
}
void GL_APIENTRY
_es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
_mesa_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
GLfixed zNear, GLfixed zFar)
{
_mesa_Frustum((GLdouble) (left / 65536.0),
@ -201,7 +201,7 @@ _es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
}
void GL_APIENTRY
_es_GetClipPlanef(GLenum plane, GLfloat *equation)
_mesa_GetClipPlanef(GLenum plane, GLfloat *equation)
{
unsigned int i;
GLdouble converted_equation[4];
@ -213,7 +213,7 @@ _es_GetClipPlanef(GLenum plane, GLfloat *equation)
}
void GL_APIENTRY
_es_GetClipPlanex(GLenum plane, GLfixed *equation)
_mesa_GetClipPlanex(GLenum plane, GLfixed *equation)
{
unsigned int i;
GLdouble converted_equation[4];
@ -225,7 +225,7 @@ _es_GetClipPlanex(GLenum plane, GLfixed *equation)
}
void GL_APIENTRY
_es_GetLightxv(GLenum light, GLenum pname, GLfixed *params)
_mesa_GetLightxv(GLenum light, GLenum pname, GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@ -266,7 +266,7 @@ _es_GetLightxv(GLenum light, GLenum pname, GLfixed *params)
}
void GL_APIENTRY
_es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
_mesa_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@ -304,7 +304,7 @@ _es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params)
}
void GL_APIENTRY
_es_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
_mesa_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@ -396,13 +396,13 @@ _check_GetTexGenivOES(GLenum coord, GLenum pname, GLint *params)
}
void GL_APIENTRY
_check_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params)
_mesa_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params)
{
_mesa_GetTexGeniv(coord, pname, (GLint *) params);
}
void GL_APIENTRY
_es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
_mesa_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@ -450,13 +450,13 @@ _es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params)
}
void GL_APIENTRY
_es_LightModelx(GLenum pname, GLfixed param)
_mesa_LightModelx(GLenum pname, GLfixed param)
{
_mesa_LightModelf(pname, (GLfloat) param);
}
void GL_APIENTRY
_es_LightModelxv(GLenum pname, const GLfixed *params)
_mesa_LightModelxv(GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@ -491,13 +491,13 @@ _es_LightModelxv(GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
_es_Lightx(GLenum light, GLenum pname, GLfixed param)
_mesa_Lightx(GLenum light, GLenum pname, GLfixed param)
{
_mesa_Lightf(light, pname, (GLfloat) (param / 65536.0f));
}
void GL_APIENTRY
_es_Lightxv(GLenum light, GLenum pname, const GLfixed *params)
_mesa_Lightxv(GLenum light, GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@ -539,13 +539,13 @@ _es_Lightxv(GLenum light, GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
_es_LineWidthx(GLfixed width)
_mesa_LineWidthx(GLfixed width)
{
_mesa_LineWidth((GLfloat) (width / 65536.0f));
}
void GL_APIENTRY
_es_LoadMatrixx(const GLfixed *m)
_mesa_LoadMatrixx(const GLfixed *m)
{
unsigned int i;
GLfloat converted_m[16];
@ -558,7 +558,7 @@ _es_LoadMatrixx(const GLfixed *m)
}
void GL_APIENTRY
_es_Materialx(GLenum face, GLenum pname, GLfixed param)
_mesa_Materialx(GLenum face, GLenum pname, GLfixed param)
{
if (face != GL_FRONT_AND_BACK) {
_mesa_error(_mesa_get_current_context(), GL_INVALID_ENUM,
@ -576,7 +576,7 @@ _es_Materialx(GLenum face, GLenum pname, GLfixed param)
}
void GL_APIENTRY
_es_Materialxv(GLenum face, GLenum pname, const GLfixed *params)
_mesa_Materialxv(GLenum face, GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@ -613,7 +613,7 @@ _es_Materialxv(GLenum face, GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
_es_MultMatrixx(const GLfixed *m)
_mesa_MultMatrixx(const GLfixed *m)
{
unsigned int i;
GLfloat converted_m[16];
@ -626,7 +626,7 @@ _es_MultMatrixx(const GLfixed *m)
}
void GL_APIENTRY
_es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
_mesa_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
{
_es_MultiTexCoord4f(texture,
(GLfloat) (s / 65536.0f),
@ -636,7 +636,7 @@ _es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q)
}
void GL_APIENTRY
_es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
_mesa_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
{
_es_Normal3f((GLfloat) (nx / 65536.0f),
(GLfloat) (ny / 65536.0f),
@ -644,7 +644,7 @@ _es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz)
}
void GL_APIENTRY
_es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
_mesa_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
GLfloat zNear, GLfloat zFar)
{
_mesa_Ortho((GLdouble) (left),
@ -656,7 +656,7 @@ _es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
}
void GL_APIENTRY
_es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
_mesa_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
GLfixed zNear, GLfixed zFar)
{
_mesa_Ortho((GLdouble) (left / 65536.0),
@ -668,13 +668,13 @@ _es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
}
void GL_APIENTRY
_es_PointParameterx(GLenum pname, GLfixed param)
_mesa_PointParameterx(GLenum pname, GLfixed param)
{
_mesa_PointParameterf(pname, (GLfloat) (param / 65536.0f));
}
void GL_APIENTRY
_es_PointParameterxv(GLenum pname, const GLfixed *params)
_mesa_PointParameterxv(GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 3;
@ -703,20 +703,20 @@ _es_PointParameterxv(GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
_es_PointSizex(GLfixed size)
_mesa_PointSizex(GLfixed size)
{
_mesa_PointSize((GLfloat) (size / 65536.0f));
}
void GL_APIENTRY
_es_PolygonOffsetx(GLfixed factor, GLfixed units)
_mesa_PolygonOffsetx(GLfixed factor, GLfixed units)
{
_mesa_PolygonOffset((GLfloat) (factor / 65536.0f),
(GLfloat) (units / 65536.0f));
}
void GL_APIENTRY
_es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
_mesa_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
{
_mesa_Rotatef((GLfloat) (angle / 65536.0f),
(GLfloat) (x / 65536.0f),
@ -725,14 +725,14 @@ _es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z)
}
void GL_APIENTRY
_es_SampleCoveragex(GLclampx value, GLboolean invert)
_mesa_SampleCoveragex(GLclampx value, GLboolean invert)
{
_mesa_SampleCoverageARB((GLclampf) (value / 65536.0f),
_mesa_SampleCoverage((GLclampf) (value / 65536.0f),
invert);
}
void GL_APIENTRY
_es_Scalex(GLfixed x, GLfixed y, GLfixed z)
_mesa_Scalex(GLfixed x, GLfixed y, GLfixed z)
{
_mesa_Scalef((GLfloat) (x / 65536.0f),
(GLfloat) (y / 65536.0f),
@ -740,7 +740,7 @@ _es_Scalex(GLfixed x, GLfixed y, GLfixed z)
}
void GL_APIENTRY
_es_TexEnvx(GLenum target, GLenum pname, GLfixed param)
_mesa_TexEnvx(GLenum target, GLenum pname, GLfixed param)
{
switch(target) {
case GL_POINT_SPRITE:
@ -785,7 +785,7 @@ _es_TexEnvx(GLenum target, GLenum pname, GLfixed param)
}
void GL_APIENTRY
_es_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
_mesa_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params)
{
switch(target) {
case GL_POINT_SPRITE:
@ -853,19 +853,19 @@ _check_TexGenivOES(GLenum coord, GLenum pname, const GLint *params)
}
void GL_APIENTRY
_check_TexGenxOES(GLenum coord, GLenum pname, GLfixed param)
_mesa_TexGenxOES(GLenum coord, GLenum pname, GLfixed param)
{
_es_TexGenf(coord, pname, (GLfloat) param);
}
void GL_APIENTRY
_check_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params)
_mesa_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params)
{
_es_TexGenf(coord, pname, (GLfloat) params[0]);
}
void GL_APIENTRY
_es_TexParameterx(GLenum target, GLenum pname, GLfixed param)
_mesa_TexParameterx(GLenum target, GLenum pname, GLfixed param)
{
if (pname == GL_TEXTURE_MAX_ANISOTROPY_EXT) {
_mesa_TexParameterf(target, pname, (GLfloat) (param / 65536.0f));
@ -875,7 +875,7 @@ _es_TexParameterx(GLenum target, GLenum pname, GLfixed param)
}
void GL_APIENTRY
_es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
_mesa_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
{
unsigned int i;
unsigned int n_params = 4;
@ -930,7 +930,7 @@ _es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params)
}
void GL_APIENTRY
_es_Translatex(GLfixed x, GLfixed y, GLfixed z)
_mesa_Translatex(GLfixed x, GLfixed y, GLfixed z)
{
_mesa_Translatef((GLfloat) (x / 65536.0f),
(GLfloat) (y / 65536.0f),

View file

@ -29,140 +29,140 @@
#endif
void GL_APIENTRY
_es_AlphaFuncx(GLenum func, GLclampx ref);
_mesa_AlphaFuncx(GLenum func, GLclampx ref);
void GL_APIENTRY
_es_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
_mesa_ClearColorx(GLclampx red, GLclampx green, GLclampx blue, GLclampx alpha);
void GL_APIENTRY
_es_ClearDepthx(GLclampx depth);
_mesa_ClearDepthx(GLclampx depth);
void GL_APIENTRY
_es_ClipPlanef(GLenum plane, const GLfloat *equation);
_mesa_ClipPlanef(GLenum plane, const GLfloat *equation);
void GL_APIENTRY
_es_ClipPlanex(GLenum plane, const GLfixed *equation);
_mesa_ClipPlanex(GLenum plane, const GLfixed *equation);
void GL_APIENTRY
_es_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha);
void GL_APIENTRY
_es_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
_mesa_Color4x(GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha);
void GL_APIENTRY
_es_DepthRangex(GLclampx zNear, GLclampx zFar);
_mesa_DepthRangex(GLclampx zNear, GLclampx zFar);
void GL_APIENTRY
_es_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h);
_mesa_DrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h);
void GL_APIENTRY
_es_DrawTexxvOES(const GLfixed *coords);
_mesa_DrawTexxvOES(const GLfixed *coords);
void GL_APIENTRY
_es_Fogx(GLenum pname, GLfixed param);
_mesa_Fogx(GLenum pname, GLfixed param);
void GL_APIENTRY
_es_Fogxv(GLenum pname, const GLfixed *params);
_mesa_Fogxv(GLenum pname, const GLfixed *params);
void GL_APIENTRY
_es_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
_mesa_Frustumf(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
GLfloat zNear, GLfloat zFar);
void GL_APIENTRY
_es_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
_mesa_Frustumx(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
GLfixed zNear, GLfixed zFar);
void GL_APIENTRY
_es_GetClipPlanef(GLenum plane, GLfloat *equation);
_mesa_GetClipPlanef(GLenum plane, GLfloat *equation);
void GL_APIENTRY
_es_GetClipPlanex(GLenum plane, GLfixed *equation);
_mesa_GetClipPlanex(GLenum plane, GLfixed *equation);
void GL_APIENTRY
_es_GetLightxv(GLenum light, GLenum pname, GLfixed *params);
_mesa_GetLightxv(GLenum light, GLenum pname, GLfixed *params);
void GL_APIENTRY
_es_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params);
_mesa_GetMaterialxv(GLenum face, GLenum pname, GLfixed *params);
void GL_APIENTRY
_check_GetTexGenivOES(GLenum coord, GLenum pname, GLint *params);
void GL_APIENTRY
_es_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params);
_mesa_GetTexEnvxv(GLenum target, GLenum pname, GLfixed *params);
void GL_APIENTRY
_check_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params);
_mesa_GetTexGenxvOES(GLenum coord, GLenum pname, GLfixed *params);
void GL_APIENTRY
_es_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params);
_mesa_GetTexParameterxv(GLenum target, GLenum pname, GLfixed *params);
void GL_APIENTRY
_es_LightModelx(GLenum pname, GLfixed param);
_mesa_LightModelx(GLenum pname, GLfixed param);
void GL_APIENTRY
_es_LightModelxv(GLenum pname, const GLfixed *params);
_mesa_LightModelxv(GLenum pname, const GLfixed *params);
void GL_APIENTRY
_es_Lightx(GLenum light, GLenum pname, GLfixed param);
_mesa_Lightx(GLenum light, GLenum pname, GLfixed param);
void GL_APIENTRY
_es_Lightxv(GLenum light, GLenum pname, const GLfixed *params);
_mesa_Lightxv(GLenum light, GLenum pname, const GLfixed *params);
void GL_APIENTRY
_es_LineWidthx(GLfixed width);
_mesa_LineWidthx(GLfixed width);
void GL_APIENTRY
_es_LoadMatrixx(const GLfixed *m);
_mesa_LoadMatrixx(const GLfixed *m);
void GL_APIENTRY
_es_Materialx(GLenum face, GLenum pname, GLfixed param);
_mesa_Materialx(GLenum face, GLenum pname, GLfixed param);
void GL_APIENTRY
_es_Materialxv(GLenum face, GLenum pname, const GLfixed *params);
_mesa_Materialxv(GLenum face, GLenum pname, const GLfixed *params);
void GL_APIENTRY
_es_MultMatrixx(const GLfixed *m);
_mesa_MultMatrixx(const GLfixed *m);
void GL_APIENTRY
_es_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
_mesa_MultiTexCoord4x(GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q);
void GL_APIENTRY
_es_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz);
_mesa_Normal3x(GLfixed nx, GLfixed ny, GLfixed nz);
void GL_APIENTRY
_es_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
_mesa_Orthof(GLfloat left, GLfloat right, GLfloat bottom, GLfloat top,
GLfloat zNear, GLfloat zFar);
void GL_APIENTRY
_es_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
_mesa_Orthox(GLfixed left, GLfixed right, GLfixed bottom, GLfixed top,
GLfixed zNear, GLfixed zFar);
void GL_APIENTRY
_es_PointParameterx(GLenum pname, GLfixed param);
_mesa_PointParameterx(GLenum pname, GLfixed param);
void GL_APIENTRY
_es_PointParameterxv(GLenum pname, const GLfixed *params);
_mesa_PointParameterxv(GLenum pname, const GLfixed *params);
void GL_APIENTRY
_es_PointSizex(GLfixed size);
_mesa_PointSizex(GLfixed size);
void GL_APIENTRY
_es_PolygonOffsetx(GLfixed factor, GLfixed units);
_mesa_PolygonOffsetx(GLfixed factor, GLfixed units);
void GL_APIENTRY
_es_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
_mesa_Rotatex(GLfixed angle, GLfixed x, GLfixed y, GLfixed z);
void GL_APIENTRY
_es_SampleCoveragex(GLclampx value, GLboolean invert);
_mesa_SampleCoveragex(GLclampx value, GLboolean invert);
void GL_APIENTRY
_es_Scalex(GLfixed x, GLfixed y, GLfixed z);
_mesa_Scalex(GLfixed x, GLfixed y, GLfixed z);
void GL_APIENTRY
_es_TexEnvx(GLenum target, GLenum pname, GLfixed param);
_mesa_TexEnvx(GLenum target, GLenum pname, GLfixed param);
void GL_APIENTRY
_es_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params);
_mesa_TexEnvxv(GLenum target, GLenum pname, const GLfixed *params);
void GL_APIENTRY
_check_TexGeniOES(GLenum coord, GLenum pname, GLint param);
@ -171,18 +171,18 @@ void GL_APIENTRY
_check_TexGenivOES(GLenum coord, GLenum pname, const GLint *params);
void GL_APIENTRY
_check_TexGenxOES(GLenum coord, GLenum pname, GLfixed param);
_mesa_TexGenxOES(GLenum coord, GLenum pname, GLfixed param);
void GL_APIENTRY
_check_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params);
_mesa_TexGenxvOES(GLenum coord, GLenum pname, const GLfixed *params);
void GL_APIENTRY
_es_TexParameterx(GLenum target, GLenum pname, GLfixed param);
_mesa_TexParameterx(GLenum target, GLenum pname, GLfixed param);
void GL_APIENTRY
_es_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params);
_mesa_TexParameterxv(GLenum target, GLenum pname, const GLfixed *params);
void GL_APIENTRY
_es_Translatex(GLfixed x, GLfixed y, GLfixed z);
_mesa_Translatex(GLfixed x, GLfixed y, GLfixed z);
#endif /* ES1_CONVERSION_H */

View file

@ -883,7 +883,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
GLboolean GLAPIENTRY
_mesa_IsRenderbufferEXT(GLuint renderbuffer)
_mesa_IsRenderbuffer(GLuint renderbuffer)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@ -897,7 +897,7 @@ _mesa_IsRenderbufferEXT(GLuint renderbuffer)
void GLAPIENTRY
_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer)
_mesa_BindRenderbuffer(GLenum target, GLuint renderbuffer)
{
struct gl_renderbuffer *newRb;
GET_CURRENT_CONTEXT(ctx);
@ -969,7 +969,7 @@ detach_renderbuffer(struct gl_context *ctx,
void GLAPIENTRY
_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers)
_mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
{
GLint i;
GET_CURRENT_CONTEXT(ctx);
@ -986,7 +986,7 @@ _mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers)
if (rb == ctx->CurrentRenderbuffer) {
/* bind default */
ASSERT(rb->RefCount >= 2);
_mesa_BindRenderbufferEXT(GL_RENDERBUFFER_EXT, 0);
_mesa_BindRenderbuffer(GL_RENDERBUFFER_EXT, 0);
}
if (_mesa_is_user_fbo(ctx->DrawBuffer)) {
@ -1014,7 +1014,7 @@ _mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers)
void GLAPIENTRY
_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers)
_mesa_GenRenderbuffers(GLsizei n, GLuint *renderbuffers)
{
GET_CURRENT_CONTEXT(ctx);
GLuint first;
@ -1398,9 +1398,9 @@ invalidate_rb(GLuint key, void *data, void *userData)
/**
* Helper function used by _mesa_RenderbufferStorageEXT() and
* Helper function used by _mesa_RenderbufferStorage() and
* _mesa_RenderbufferStorageMultisample().
* samples will be NO_SAMPLES if called by _mesa_RenderbufferStorageEXT().
* samples will be NO_SAMPLES if called by _mesa_RenderbufferStorage().
*/
static void
renderbuffer_storage(GLenum target, GLenum internalFormat,
@ -1526,8 +1526,8 @@ _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image)
/**
* Helper function for _mesa_GetRenderbufferParameterivEXT() and
* _mesa_GetFramebufferAttachmentParameterivEXT()
* Helper function for _mesa_GetRenderbufferParameteriv() and
* _mesa_GetFramebufferAttachmentParameteriv()
* We have to be careful to respect the base format. For example, if a
* renderbuffer/texture was created with internalFormat=GL_RGB but the
* driver actually chose a GL_RGBA format, when the user queries ALPHA_SIZE
@ -1545,7 +1545,7 @@ get_component_bits(GLenum pname, GLenum baseFormat, gl_format format)
void GLAPIENTRY
_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
_mesa_RenderbufferStorage(GLenum target, GLenum internalFormat,
GLsizei width, GLsizei height)
{
/* GL_ARB_fbo says calling this function is equivalent to calling
@ -1587,7 +1587,7 @@ _es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
void GLAPIENTRY
_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)
_mesa_GetRenderbufferParameteriv(GLenum target, GLenum pname, GLint *params)
{
struct gl_renderbuffer *rb;
GET_CURRENT_CONTEXT(ctx);
@ -1645,7 +1645,7 @@ _mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname, GLint *params)
GLboolean GLAPIENTRY
_mesa_IsFramebufferEXT(GLuint framebuffer)
_mesa_IsFramebuffer(GLuint framebuffer)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@ -1705,7 +1705,7 @@ check_end_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
void GLAPIENTRY
_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
_mesa_BindFramebuffer(GLenum target, GLuint framebuffer)
{
struct gl_framebuffer *newDrawFb, *newReadFb;
struct gl_framebuffer *oldDrawFb, *oldReadFb;
@ -1839,7 +1839,7 @@ _mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer)
void GLAPIENTRY
_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
_mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
{
GLint i;
GET_CURRENT_CONTEXT(ctx);
@ -1860,12 +1860,12 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
if (fb == ctx->DrawBuffer) {
/* bind default */
ASSERT(fb->RefCount >= 2);
_mesa_BindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0);
_mesa_BindFramebuffer(GL_DRAW_FRAMEBUFFER_EXT, 0);
}
if (fb == ctx->ReadBuffer) {
/* bind default */
ASSERT(fb->RefCount >= 2);
_mesa_BindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0);
_mesa_BindFramebuffer(GL_READ_FRAMEBUFFER_EXT, 0);
}
}
else {
@ -1873,7 +1873,7 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
if (fb == ctx->DrawBuffer || fb == ctx->ReadBuffer) {
/* bind default */
ASSERT(fb->RefCount >= 2);
_mesa_BindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0);
_mesa_BindFramebuffer(GL_FRAMEBUFFER_EXT, 0);
}
}
@ -1893,7 +1893,7 @@ _mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers)
void GLAPIENTRY
_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers)
_mesa_GenFramebuffers(GLsizei n, GLuint *framebuffers)
{
GET_CURRENT_CONTEXT(ctx);
GLuint first;
@ -1924,7 +1924,7 @@ _mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers)
GLenum GLAPIENTRY
_mesa_CheckFramebufferStatusEXT(GLenum target)
_mesa_CheckFramebufferStatus(GLenum target)
{
struct gl_framebuffer *buffer;
GET_CURRENT_CONTEXT(ctx);
@ -2151,7 +2151,7 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target,
void GLAPIENTRY
_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
_mesa_FramebufferTexture1D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture, GLint level)
{
GET_CURRENT_CONTEXT(ctx);
@ -2184,7 +2184,7 @@ _mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
void GLAPIENTRY
_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
_mesa_FramebufferTexture2D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture, GLint level)
{
GET_CURRENT_CONTEXT(ctx);
@ -2230,7 +2230,7 @@ _mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
void GLAPIENTRY
_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
_mesa_FramebufferTexture3D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture,
GLint level, GLint zoffset)
{
@ -2248,7 +2248,7 @@ _mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
void GLAPIENTRY
_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,
_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment,
GLuint texture, GLint level, GLint layer)
{
GET_CURRENT_CONTEXT(ctx);
@ -2259,7 +2259,7 @@ _mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,
void GLAPIENTRY
_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
_mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment,
GLenum renderbufferTarget,
GLuint renderbuffer)
{
@ -2343,7 +2343,7 @@ _mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
void GLAPIENTRY
_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
_mesa_GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment,
GLenum pname, GLint *params)
{
const struct gl_renderbuffer_attachment *att;
@ -2575,7 +2575,7 @@ invalid_pname_enum:
void GLAPIENTRY
_mesa_GenerateMipmapEXT(GLenum target)
_mesa_GenerateMipmap(GLenum target)
{
struct gl_texture_image *srcImage;
struct gl_texture_object *texObj;
@ -2833,7 +2833,7 @@ compatible_resolve_formats(const struct gl_renderbuffer *colorReadRb,
* when the samples must be resolved to a single color.
*/
void GLAPIENTRY
_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
_mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
GLbitfield mask, GLenum filter)
{

View file

@ -124,19 +124,19 @@ extern GLenum
_mesa_base_fbo_format(struct gl_context *ctx, GLenum internalFormat);
extern GLboolean GLAPIENTRY
_mesa_IsRenderbufferEXT(GLuint renderbuffer);
_mesa_IsRenderbuffer(GLuint renderbuffer);
extern void GLAPIENTRY
_mesa_BindRenderbufferEXT(GLenum target, GLuint renderbuffer);
_mesa_BindRenderbuffer(GLenum target, GLuint renderbuffer);
extern void GLAPIENTRY
_mesa_DeleteRenderbuffersEXT(GLsizei n, const GLuint *renderbuffers);
_mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers);
extern void GLAPIENTRY
_mesa_GenRenderbuffersEXT(GLsizei n, GLuint *renderbuffers);
_mesa_GenRenderbuffers(GLsizei n, GLuint *renderbuffers);
extern void GLAPIENTRY
_mesa_RenderbufferStorageEXT(GLenum target, GLenum internalformat,
_mesa_RenderbufferStorage(GLenum target, GLenum internalformat,
GLsizei width, GLsizei height);
extern void GLAPIENTRY
@ -152,56 +152,56 @@ extern void GLAPIENTRY
_mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image);
extern void GLAPIENTRY
_mesa_GetRenderbufferParameterivEXT(GLenum target, GLenum pname,
_mesa_GetRenderbufferParameteriv(GLenum target, GLenum pname,
GLint *params);
extern GLboolean GLAPIENTRY
_mesa_IsFramebufferEXT(GLuint framebuffer);
_mesa_IsFramebuffer(GLuint framebuffer);
extern void GLAPIENTRY
_mesa_BindFramebufferEXT(GLenum target, GLuint framebuffer);
_mesa_BindFramebuffer(GLenum target, GLuint framebuffer);
extern void GLAPIENTRY
_mesa_DeleteFramebuffersEXT(GLsizei n, const GLuint *framebuffers);
_mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers);
extern void GLAPIENTRY
_mesa_GenFramebuffersEXT(GLsizei n, GLuint *framebuffers);
_mesa_GenFramebuffers(GLsizei n, GLuint *framebuffers);
extern GLenum GLAPIENTRY
_mesa_CheckFramebufferStatusEXT(GLenum target);
_mesa_CheckFramebufferStatus(GLenum target);
extern void GLAPIENTRY
_mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
_mesa_FramebufferTexture1D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture, GLint level);
extern void GLAPIENTRY
_mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
_mesa_FramebufferTexture2D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture, GLint level);
extern void GLAPIENTRY
_mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
_mesa_FramebufferTexture3D(GLenum target, GLenum attachment,
GLenum textarget, GLuint texture,
GLint level, GLint zoffset);
extern void GLAPIENTRY
_mesa_FramebufferTextureLayerEXT(GLenum target, GLenum attachment,
_mesa_FramebufferTextureLayer(GLenum target, GLenum attachment,
GLuint texture, GLint level, GLint layer);
extern void GLAPIENTRY
_mesa_FramebufferRenderbufferEXT(GLenum target, GLenum attachment,
_mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment,
GLenum renderbuffertarget,
GLuint renderbuffer);
extern void GLAPIENTRY
_mesa_GetFramebufferAttachmentParameterivEXT(GLenum target, GLenum attachment,
_mesa_GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment,
GLenum pname, GLint *params);
extern void GLAPIENTRY
_mesa_GenerateMipmapEXT(GLenum target);
_mesa_GenerateMipmap(GLenum target);
extern void GLAPIENTRY
_mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
_mesa_BlitFramebuffer(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1,
GLbitfield mask, GLenum filter);

View file

@ -1614,7 +1614,7 @@ find_value_indexed(const char *func, GLenum pname, GLuint index, union value *v)
}
void GLAPIENTRY
_mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params )
_mesa_GetBooleani_v( GLenum pname, GLuint index, GLboolean *params )
{
union value v;
enum value_type type =
@ -1639,7 +1639,7 @@ _mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params )
}
void GLAPIENTRY
_mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params )
_mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params )
{
union value v;
enum value_type type =

View file

@ -54,10 +54,10 @@ extern void GLAPIENTRY
_mesa_GetFixedv(GLenum pname, GLfixed *params);
extern void GLAPIENTRY
_mesa_GetBooleanIndexedv( GLenum pname, GLuint index, GLboolean *params );
_mesa_GetBooleani_v( GLenum pname, GLuint index, GLboolean *params );
extern void GLAPIENTRY
_mesa_GetIntegerIndexedv( GLenum pname, GLuint index, GLint *params );
_mesa_GetIntegeri_v( GLenum pname, GLuint index, GLint *params );
extern void GLAPIENTRY
_mesa_GetInteger64Indexedv( GLenum pname, GLuint index, GLint64 *params );

View file

@ -66,7 +66,7 @@ _mesa_ShadeModel( GLenum mode )
* triangle or line.
*/
void GLAPIENTRY
_mesa_ProvokingVertexEXT(GLenum mode)
_mesa_ProvokingVertex(GLenum mode)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);

View file

@ -39,7 +39,7 @@ extern void GLAPIENTRY
_mesa_ShadeModel( GLenum mode );
extern void GLAPIENTRY
_mesa_ProvokingVertexEXT(GLenum mode);
_mesa_ProvokingVertex(GLenum mode);
extern void GLAPIENTRY

View file

@ -489,7 +489,7 @@ _mesa_Translated( GLdouble x, GLdouble y, GLdouble z )
void GLAPIENTRY
_mesa_LoadTransposeMatrixfARB( const GLfloat *m )
_mesa_LoadTransposeMatrixf( const GLfloat *m )
{
GLfloat tm[16];
if (!m) return;
@ -499,7 +499,7 @@ _mesa_LoadTransposeMatrixfARB( const GLfloat *m )
void GLAPIENTRY
_mesa_LoadTransposeMatrixdARB( const GLdouble *m )
_mesa_LoadTransposeMatrixd( const GLdouble *m )
{
GLfloat tm[16];
if (!m) return;
@ -509,7 +509,7 @@ _mesa_LoadTransposeMatrixdARB( const GLdouble *m )
void GLAPIENTRY
_mesa_MultTransposeMatrixfARB( const GLfloat *m )
_mesa_MultTransposeMatrixf( const GLfloat *m )
{
GLfloat tm[16];
if (!m) return;
@ -519,7 +519,7 @@ _mesa_MultTransposeMatrixfARB( const GLfloat *m )
void GLAPIENTRY
_mesa_MultTransposeMatrixdARB( const GLdouble *m )
_mesa_MultTransposeMatrixd( const GLdouble *m )
{
GLfloat tm[16];
if (!m) return;

View file

@ -85,16 +85,16 @@ extern void GLAPIENTRY
_mesa_Translated( GLdouble x, GLdouble y, GLdouble z );
extern void GLAPIENTRY
_mesa_LoadTransposeMatrixfARB( const GLfloat *m );
_mesa_LoadTransposeMatrixf( const GLfloat *m );
extern void GLAPIENTRY
_mesa_LoadTransposeMatrixdARB( const GLdouble *m );
_mesa_LoadTransposeMatrixd( const GLdouble *m );
extern void GLAPIENTRY
_mesa_MultTransposeMatrixfARB( const GLfloat *m );
_mesa_MultTransposeMatrixf( const GLfloat *m );
extern void GLAPIENTRY
_mesa_MultTransposeMatrixdARB( const GLdouble *m );
_mesa_MultTransposeMatrixd( const GLdouble *m );
extern void

View file

@ -34,7 +34,7 @@
* Called via glSampleCoverageARB
*/
void GLAPIENTRY
_mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
_mesa_SampleCoverage(GLclampf value, GLboolean invert)
{
GET_CURRENT_CONTEXT(ctx);

View file

@ -31,7 +31,7 @@
struct gl_context;
extern void GLAPIENTRY
_mesa_SampleCoverageARB(GLclampf value, GLboolean invert);
_mesa_SampleCoverage(GLclampf value, GLboolean invert);
extern void

View file

@ -89,7 +89,7 @@ fpclassify(double x)
#endif
GLbitfield GLAPIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
GLbitfield GLAPIENTRY _mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16])
{
GLfloat matrix[16];
GLint tmp;

View file

@ -34,6 +34,6 @@
*/
extern GLbitfield GLAPIENTRY
_es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
_mesa_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]);
#endif

View file

@ -169,7 +169,7 @@ get_query_binding_point(struct gl_context *ctx, GLenum target)
void GLAPIENTRY
_mesa_GenQueriesARB(GLsizei n, GLuint *ids)
_mesa_GenQueries(GLsizei n, GLuint *ids)
{
GLuint first;
GET_CURRENT_CONTEXT(ctx);
@ -208,7 +208,7 @@ _mesa_GenQueriesARB(GLsizei n, GLuint *ids)
void GLAPIENTRY
_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
_mesa_DeleteQueries(GLsizei n, const GLuint *ids)
{
GLint i;
GET_CURRENT_CONTEXT(ctx);
@ -244,7 +244,7 @@ _mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids)
GLboolean GLAPIENTRY
_mesa_IsQueryARB(GLuint id)
_mesa_IsQuery(GLuint id)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END_WITH_RETVAL(ctx, GL_FALSE);
@ -403,13 +403,13 @@ _mesa_EndQueryIndexed(GLenum target, GLuint index)
}
void GLAPIENTRY
_mesa_BeginQueryARB(GLenum target, GLuint id)
_mesa_BeginQuery(GLenum target, GLuint id)
{
_mesa_BeginQueryIndexed(target, 0, id);
}
void GLAPIENTRY
_mesa_EndQueryARB(GLenum target)
_mesa_EndQuery(GLenum target)
{
_mesa_EndQueryIndexed(target, 0);
}
@ -547,13 +547,13 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
}
void GLAPIENTRY
_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params)
_mesa_GetQueryiv(GLenum target, GLenum pname, GLint *params)
{
_mesa_GetQueryIndexediv(target, 0, pname, params);
}
void GLAPIENTRY
_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
_mesa_GetQueryObjectiv(GLuint id, GLenum pname, GLint *params)
{
struct gl_query_object *q = NULL;
GET_CURRENT_CONTEXT(ctx);
@ -604,7 +604,7 @@ _mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params)
void GLAPIENTRY
_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
_mesa_GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params)
{
struct gl_query_object *q = NULL;
GET_CURRENT_CONTEXT(ctx);
@ -658,7 +658,7 @@ _mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params)
* New with GL_EXT_timer_query
*/
void GLAPIENTRY
_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
_mesa_GetQueryObjecti64v(GLuint id, GLenum pname, GLint64EXT *params)
{
struct gl_query_object *q = NULL;
GET_CURRENT_CONTEXT(ctx);
@ -699,7 +699,7 @@ _mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params)
* New with GL_EXT_timer_query
*/
void GLAPIENTRY
_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params)
_mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params)
{
struct gl_query_object *q = NULL;
GET_CURRENT_CONTEXT(ctx);
@ -740,20 +740,20 @@ void
_mesa_init_queryobj_dispatch(const struct gl_context *ctx,
struct _glapi_table *disp)
{
SET_GenQueriesARB(disp, _mesa_GenQueriesARB);
SET_DeleteQueriesARB(disp, _mesa_DeleteQueriesARB);
SET_IsQueryARB(disp, _mesa_IsQueryARB);
SET_BeginQueryARB(disp, _mesa_BeginQueryARB);
SET_EndQueryARB(disp, _mesa_EndQueryARB);
SET_GetQueryivARB(disp, _mesa_GetQueryivARB);
SET_GetQueryObjectuivARB(disp, _mesa_GetQueryObjectuivARB);
SET_GenQueries(disp, _mesa_GenQueries);
SET_DeleteQueries(disp, _mesa_DeleteQueries);
SET_IsQuery(disp, _mesa_IsQuery);
SET_BeginQuery(disp, _mesa_BeginQuery);
SET_EndQuery(disp, _mesa_EndQuery);
SET_GetQueryiv(disp, _mesa_GetQueryiv);
SET_GetQueryObjectuiv(disp, _mesa_GetQueryObjectuiv);
if (_mesa_is_desktop_gl(ctx)) {
SET_GetQueryObjectivARB(disp, _mesa_GetQueryObjectivARB);
SET_GetQueryObjectiv(disp, _mesa_GetQueryObjectiv);
SET_QueryCounter(disp, _mesa_QueryCounter);
SET_GetQueryObjecti64vEXT(disp, _mesa_GetQueryObjecti64vEXT);
SET_GetQueryObjectui64vEXT(disp, _mesa_GetQueryObjectui64vEXT);
SET_GetQueryObjecti64v(disp, _mesa_GetQueryObjecti64v);
SET_GetQueryObjectui64v(disp, _mesa_GetQueryObjectui64v);
SET_BeginQueryIndexed(disp, _mesa_BeginQueryIndexed);
SET_EndQueryIndexed(disp, _mesa_EndQueryIndexed);

View file

@ -54,33 +54,33 @@ extern void
_mesa_free_queryobj_data(struct gl_context *ctx);
void GLAPIENTRY
_mesa_GenQueriesARB(GLsizei n, GLuint *ids);
_mesa_GenQueries(GLsizei n, GLuint *ids);
void GLAPIENTRY
_mesa_DeleteQueriesARB(GLsizei n, const GLuint *ids);
_mesa_DeleteQueries(GLsizei n, const GLuint *ids);
GLboolean GLAPIENTRY
_mesa_IsQueryARB(GLuint id);
_mesa_IsQuery(GLuint id);
void GLAPIENTRY
_mesa_BeginQueryIndexed(GLenum target, GLuint index, GLuint id);
void GLAPIENTRY
_mesa_EndQueryIndexed(GLenum target, GLuint index);
void GLAPIENTRY
_mesa_BeginQueryARB(GLenum target, GLuint id);
_mesa_BeginQuery(GLenum target, GLuint id);
void GLAPIENTRY
_mesa_EndQueryARB(GLenum target);
_mesa_EndQuery(GLenum target);
void GLAPIENTRY
_mesa_QueryCounter(GLuint id, GLenum target);
void GLAPIENTRY
_mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname,
GLint *params);
void GLAPIENTRY
_mesa_GetQueryivARB(GLenum target, GLenum pname, GLint *params);
_mesa_GetQueryiv(GLenum target, GLenum pname, GLint *params);
void GLAPIENTRY
_mesa_GetQueryObjectivARB(GLuint id, GLenum pname, GLint *params);
_mesa_GetQueryObjectiv(GLuint id, GLenum pname, GLint *params);
void GLAPIENTRY
_mesa_GetQueryObjectuivARB(GLuint id, GLenum pname, GLuint *params);
_mesa_GetQueryObjectuiv(GLuint id, GLenum pname, GLuint *params);
void GLAPIENTRY
_mesa_GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64EXT *params);
_mesa_GetQueryObjecti64v(GLuint id, GLenum pname, GLint64EXT *params);
void GLAPIENTRY
_mesa_GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64EXT *params);
_mesa_GetQueryObjectui64v(GLuint id, GLenum pname, GLuint64EXT *params);
#endif /* QUERYOBJ_H */

View file

@ -289,49 +289,49 @@ window_pos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
void GLAPIENTRY
_mesa_WindowPos2dMESA(GLdouble x, GLdouble y)
_mesa_WindowPos2d(GLdouble x, GLdouble y)
{
window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
}
void GLAPIENTRY
_mesa_WindowPos2fMESA(GLfloat x, GLfloat y)
_mesa_WindowPos2f(GLfloat x, GLfloat y)
{
window_pos4f(x, y, 0.0F, 1.0F);
}
void GLAPIENTRY
_mesa_WindowPos2iMESA(GLint x, GLint y)
_mesa_WindowPos2i(GLint x, GLint y)
{
window_pos4f((GLfloat) x, (GLfloat) y, 0.0F, 1.0F);
}
void GLAPIENTRY
_mesa_WindowPos2sMESA(GLshort x, GLshort y)
_mesa_WindowPos2s(GLshort x, GLshort y)
{
window_pos4f(x, y, 0.0F, 1.0F);
}
void GLAPIENTRY
_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z)
_mesa_WindowPos3d(GLdouble x, GLdouble y, GLdouble z)
{
window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
}
void GLAPIENTRY
_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z)
_mesa_WindowPos3f(GLfloat x, GLfloat y, GLfloat z)
{
window_pos4f(x, y, z, 1.0F);
}
void GLAPIENTRY
_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z)
_mesa_WindowPos3i(GLint x, GLint y, GLint z)
{
window_pos4f((GLfloat) x, (GLfloat) y, (GLfloat) z, 1.0F);
}
void GLAPIENTRY
_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z)
_mesa_WindowPos3s(GLshort x, GLshort y, GLshort z)
{
window_pos4f(x, y, z, 1.0F);
}
@ -361,49 +361,49 @@ _mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w)
}
void GLAPIENTRY
_mesa_WindowPos2dvMESA(const GLdouble *v)
_mesa_WindowPos2dv(const GLdouble *v)
{
window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
}
void GLAPIENTRY
_mesa_WindowPos2fvMESA(const GLfloat *v)
_mesa_WindowPos2fv(const GLfloat *v)
{
window_pos4f(v[0], v[1], 0.0F, 1.0F);
}
void GLAPIENTRY
_mesa_WindowPos2ivMESA(const GLint *v)
_mesa_WindowPos2iv(const GLint *v)
{
window_pos4f((GLfloat) v[0], (GLfloat) v[1], 0.0F, 1.0F);
}
void GLAPIENTRY
_mesa_WindowPos2svMESA(const GLshort *v)
_mesa_WindowPos2sv(const GLshort *v)
{
window_pos4f(v[0], v[1], 0.0F, 1.0F);
}
void GLAPIENTRY
_mesa_WindowPos3dvMESA(const GLdouble *v)
_mesa_WindowPos3dv(const GLdouble *v)
{
window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
}
void GLAPIENTRY
_mesa_WindowPos3fvMESA(const GLfloat *v)
_mesa_WindowPos3fv(const GLfloat *v)
{
window_pos4f(v[0], v[1], v[2], 1.0);
}
void GLAPIENTRY
_mesa_WindowPos3ivMESA(const GLint *v)
_mesa_WindowPos3iv(const GLint *v)
{
window_pos4f((GLfloat) v[0], (GLfloat) v[1], (GLfloat) v[2], 1.0F);
}
void GLAPIENTRY
_mesa_WindowPos3svMESA(const GLshort *v)
_mesa_WindowPos3sv(const GLshort *v)
{
window_pos4f(v[0], v[1], v[2], 1.0F);
}

View file

@ -90,21 +90,21 @@ _mesa_RasterPos4iv(const GLint *v);
void GLAPIENTRY
_mesa_RasterPos4sv(const GLshort *v);
void GLAPIENTRY
_mesa_WindowPos2dMESA(GLdouble x, GLdouble y);
_mesa_WindowPos2d(GLdouble x, GLdouble y);
void GLAPIENTRY
_mesa_WindowPos2fMESA(GLfloat x, GLfloat y);
_mesa_WindowPos2f(GLfloat x, GLfloat y);
void GLAPIENTRY
_mesa_WindowPos2iMESA(GLint x, GLint y);
_mesa_WindowPos2i(GLint x, GLint y);
void GLAPIENTRY
_mesa_WindowPos2sMESA(GLshort x, GLshort y);
_mesa_WindowPos2s(GLshort x, GLshort y);
void GLAPIENTRY
_mesa_WindowPos3dMESA(GLdouble x, GLdouble y, GLdouble z);
_mesa_WindowPos3d(GLdouble x, GLdouble y, GLdouble z);
void GLAPIENTRY
_mesa_WindowPos3fMESA(GLfloat x, GLfloat y, GLfloat z);
_mesa_WindowPos3f(GLfloat x, GLfloat y, GLfloat z);
void GLAPIENTRY
_mesa_WindowPos3iMESA(GLint x, GLint y, GLint z);
_mesa_WindowPos3i(GLint x, GLint y, GLint z);
void GLAPIENTRY
_mesa_WindowPos3sMESA(GLshort x, GLshort y, GLshort z);
_mesa_WindowPos3s(GLshort x, GLshort y, GLshort z);
void GLAPIENTRY
_mesa_WindowPos4dMESA(GLdouble x, GLdouble y, GLdouble z, GLdouble w);
void GLAPIENTRY
@ -114,21 +114,21 @@ _mesa_WindowPos4iMESA(GLint x, GLint y, GLint z, GLint w);
void GLAPIENTRY
_mesa_WindowPos4sMESA(GLshort x, GLshort y, GLshort z, GLshort w);
void GLAPIENTRY
_mesa_WindowPos2dvMESA(const GLdouble *v);
_mesa_WindowPos2dv(const GLdouble *v);
void GLAPIENTRY
_mesa_WindowPos2fvMESA(const GLfloat *v);
_mesa_WindowPos2fv(const GLfloat *v);
void GLAPIENTRY
_mesa_WindowPos2ivMESA(const GLint *v);
_mesa_WindowPos2iv(const GLint *v);
void GLAPIENTRY
_mesa_WindowPos2svMESA(const GLshort *v);
_mesa_WindowPos2sv(const GLshort *v);
void GLAPIENTRY
_mesa_WindowPos3dvMESA(const GLdouble *v);
_mesa_WindowPos3dv(const GLdouble *v);
void GLAPIENTRY
_mesa_WindowPos3fvMESA(const GLfloat *v);
_mesa_WindowPos3fv(const GLfloat *v);
void GLAPIENTRY
_mesa_WindowPos3ivMESA(const GLint *v);
_mesa_WindowPos3iv(const GLint *v);
void GLAPIENTRY
_mesa_WindowPos3svMESA(const GLshort *v);
_mesa_WindowPos3sv(const GLshort *v);
void GLAPIENTRY
_mesa_WindowPos4dvMESA(const GLdouble *v);
void GLAPIENTRY

View file

@ -40,7 +40,7 @@ extern "C" {
}
void GLAPIENTRY
_mesa_BindAttribLocationARB(GLhandleARB program, GLuint index,
_mesa_BindAttribLocation(GLhandleARB program, GLuint index,
const GLcharARB *name)
{
GET_CURRENT_CONTEXT(ctx);
@ -77,7 +77,7 @@ _mesa_BindAttribLocationARB(GLhandleARB program, GLuint index,
}
void GLAPIENTRY
_mesa_GetActiveAttribARB(GLhandleARB program, GLuint desired_index,
_mesa_GetActiveAttrib(GLhandleARB program, GLuint desired_index,
GLsizei maxLength, GLsizei * length, GLint * size,
GLenum * type, GLcharARB * name)
{
@ -132,7 +132,7 @@ _mesa_GetActiveAttribARB(GLhandleARB program, GLuint desired_index,
}
GLint GLAPIENTRY
_mesa_GetAttribLocationARB(GLhandleARB program, const GLcharARB * name)
_mesa_GetAttribLocation(GLhandleARB program, const GLcharARB * name)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_shader_program *const shProg =

View file

@ -1001,7 +1001,7 @@ _mesa_AttachShader(GLuint program, GLuint shader)
void GLAPIENTRY
_mesa_CompileShaderARB(GLhandleARB shaderObj)
_mesa_CompileShader(GLhandleARB shaderObj)
{
GET_CURRENT_CONTEXT(ctx);
if (MESA_VERBOSE & VERBOSE_API)
@ -1215,7 +1215,7 @@ _mesa_GetShaderInfoLog(GLuint shader, GLsizei bufSize,
void GLAPIENTRY
_mesa_GetShaderSourceARB(GLhandleARB shader, GLsizei maxLength,
_mesa_GetShaderSource(GLhandleARB shader, GLsizei maxLength,
GLsizei *length, GLcharARB *sourceOut)
{
GET_CURRENT_CONTEXT(ctx);
@ -1248,7 +1248,7 @@ _mesa_IsShader(GLuint name)
void GLAPIENTRY
_mesa_LinkProgramARB(GLhandleARB programObj)
_mesa_LinkProgram(GLhandleARB programObj)
{
GET_CURRENT_CONTEXT(ctx);
link_program(ctx, programObj);
@ -1291,7 +1291,7 @@ read_shader(const char *fname)
* and pass it to _mesa_shader_source().
*/
void GLAPIENTRY
_mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
_mesa_ShaderSource(GLhandleARB shaderObj, GLsizei count,
const GLcharARB ** string, const GLint * length)
{
GET_CURRENT_CONTEXT(ctx);
@ -1385,7 +1385,7 @@ _mesa_ShaderSourceARB(GLhandleARB shaderObj, GLsizei count,
void GLAPIENTRY
_mesa_UseProgramObjectARB(GLhandleARB program)
_mesa_UseProgram(GLhandleARB program)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_shader_program *shProg;
@ -1425,7 +1425,7 @@ _mesa_UseProgramObjectARB(GLhandleARB program)
void GLAPIENTRY
_mesa_ValidateProgramARB(GLhandleARB program)
_mesa_ValidateProgram(GLhandleARB program)
{
GET_CURRENT_CONTEXT(ctx);
validate_program(ctx, program);
@ -1706,12 +1706,12 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx,
}
if (ctx->API != API_OPENGLES) {
SET_ShaderSourceARB(exec, _mesa_ShaderSourceARB);
SET_CompileShaderARB(exec, _mesa_CompileShaderARB);
SET_LinkProgramARB(exec, _mesa_LinkProgramARB);
SET_UseProgramObjectARB(exec, _mesa_UseProgramObjectARB);
SET_ValidateProgramARB(exec, _mesa_ValidateProgramARB);
SET_GetShaderSourceARB(exec, _mesa_GetShaderSourceARB);
SET_ShaderSource(exec, _mesa_ShaderSource);
SET_CompileShader(exec, _mesa_CompileShader);
SET_LinkProgram(exec, _mesa_LinkProgram);
SET_UseProgram(exec, _mesa_UseProgram);
SET_ValidateProgram(exec, _mesa_ValidateProgram);
SET_GetShaderSource(exec, _mesa_GetShaderSource);
/* OpenGL 2.0 */
SET_AttachShader(exec, _mesa_AttachShader);
@ -1729,9 +1729,9 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx,
SET_IsShader(exec, _mesa_IsShader);
/* GL_ARB_vertex_shader */
SET_BindAttribLocationARB(exec, _mesa_BindAttribLocationARB);
SET_GetActiveAttribARB(exec, _mesa_GetActiveAttribARB);
SET_GetAttribLocationARB(exec, _mesa_GetAttribLocationARB);
SET_BindAttribLocation(exec, _mesa_BindAttribLocation);
SET_GetActiveAttrib(exec, _mesa_GetActiveAttrib);
SET_GetAttribLocation(exec, _mesa_GetAttribLocation);
}
if (ctx->API == API_OPENGL) {
@ -1742,10 +1742,10 @@ _mesa_init_shader_dispatch(const struct gl_context *ctx,
/* GL_EXT_gpu_shader4 / GL 3.0 */
if (_mesa_is_desktop_gl(ctx)) {
SET_BindFragDataLocationEXT(exec, _mesa_BindFragDataLocation);
SET_BindFragDataLocation(exec, _mesa_BindFragDataLocation);
}
if (_mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx)) {
SET_GetFragDataLocationEXT(exec, _mesa_GetFragDataLocation);
SET_GetFragDataLocation(exec, _mesa_GetFragDataLocation);
}
/* GL_ARB_ES2_compatibility */

View file

@ -64,7 +64,7 @@ extern void GLAPIENTRY
_mesa_AttachObjectARB(GLhandleARB, GLhandleARB);
extern void GLAPIENTRY
_mesa_CompileShaderARB(GLhandleARB);
_mesa_CompileShader(GLhandleARB);
extern GLhandleARB GLAPIENTRY
_mesa_CreateProgramObjectARB(void);
@ -100,7 +100,7 @@ extern void GLAPIENTRY
_mesa_GetObjectParameterivARB(GLhandleARB, GLenum, GLint *);
extern void GLAPIENTRY
_mesa_GetShaderSourceARB(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
_mesa_GetShaderSource(GLhandleARB, GLsizei, GLsizei *, GLcharARB *);
extern GLboolean GLAPIENTRY
_mesa_IsProgram(GLuint name);
@ -109,20 +109,20 @@ extern GLboolean GLAPIENTRY
_mesa_IsShader(GLuint name);
extern void GLAPIENTRY
_mesa_LinkProgramARB(GLhandleARB programObj);
_mesa_LinkProgram(GLhandleARB programObj);
extern void GLAPIENTRY
_mesa_ShaderSourceARB(GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
_mesa_ShaderSource(GLhandleARB, GLsizei, const GLcharARB* *, const GLint *);
extern void GLAPIENTRY
_mesa_UseProgramObjectARB(GLhandleARB);
_mesa_UseProgram(GLhandleARB);
extern void GLAPIENTRY
_mesa_ValidateProgramARB(GLhandleARB);
_mesa_ValidateProgram(GLhandleARB);
extern void GLAPIENTRY
_mesa_BindAttribLocationARB(GLhandleARB, GLuint, const GLcharARB *);
_mesa_BindAttribLocation(GLhandleARB, GLuint, const GLcharARB *);
extern void GLAPIENTRY
_mesa_BindFragDataLocation(GLuint program, GLuint colorNumber,
@ -133,11 +133,11 @@ _mesa_BindFragDataLocationIndexed(GLuint program, GLuint colorNumber,
GLuint index, const GLchar *name);
extern void GLAPIENTRY
_mesa_GetActiveAttribARB(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *,
_mesa_GetActiveAttrib(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *,
GLenum *, GLcharARB *);
extern GLint GLAPIENTRY
_mesa_GetAttribLocationARB(GLhandleARB, const GLcharARB *);
_mesa_GetAttribLocation(GLhandleARB, const GLcharARB *);

View file

@ -894,7 +894,7 @@ const struct function gl_core_functions_possible[] = {
};
const struct function gles11_functions_possible[] = {
{ "glActiveTexture", 11, _gloffset_ActiveTextureARB },
{ "glActiveTexture", 11, _gloffset_ActiveTexture },
{ "glAlphaFunc", 11, _gloffset_AlphaFunc },
{ "glAlphaFuncx", 11, -1 },
{ "glBindBuffer", 11, -1 },
@ -914,7 +914,7 @@ const struct function gles11_functions_possible[] = {
{ "glClearDepthf", 11, -1 },
{ "glClearDepthx", 11, -1 },
{ "glClearStencil", 11, _gloffset_ClearStencil },
{ "glClientActiveTexture", 11, _gloffset_ClientActiveTextureARB },
{ "glClientActiveTexture", 11, _gloffset_ClientActiveTexture },
{ "glClipPlanef", 11, -1 },
{ "glClipPlanex", 11, -1 },
{ "glColor4f", 11, _gloffset_Color4f },
@ -1088,7 +1088,7 @@ const struct function gles11_functions_possible[] = {
};
const struct function gles2_functions_possible[] = {
{ "glActiveTexture", 20, _gloffset_ActiveTextureARB },
{ "glActiveTexture", 20, _gloffset_ActiveTexture },
{ "glAttachShader", 20, -1 },
{ "glBindAttribLocation", 20, -1 },
{ "glBindBuffer", 20, -1 },

View file

@ -959,7 +959,7 @@ _mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize,
}
void GLAPIENTRY
_mesa_GetCompressedTexImageARB(GLenum target, GLint level, GLvoid *img)
_mesa_GetCompressedTexImage(GLenum target, GLint level, GLvoid *img)
{
_mesa_GetnCompressedTexImageARB(target, level, INT_MAX, img);
}

View file

@ -54,7 +54,7 @@ _mesa_GetnTexImageARB( GLenum target, GLint level, GLenum format,
GLenum type, GLsizei bufSize, GLvoid *pixels );
extern void GLAPIENTRY
_mesa_GetCompressedTexImageARB(GLenum target, GLint lod, GLvoid *img);
_mesa_GetCompressedTexImage(GLenum target, GLint lod, GLvoid *img);
extern void GLAPIENTRY
_mesa_GetnCompressedTexImageARB(GLenum target, GLint level, GLsizei bufSize,

View file

@ -3532,7 +3532,7 @@ compressed_subtexture_error_check(struct gl_context *ctx, GLint dims,
void GLAPIENTRY
_mesa_CompressedTexImage1DARB(GLenum target, GLint level,
_mesa_CompressedTexImage1D(GLenum target, GLint level,
GLenum internalFormat, GLsizei width,
GLint border, GLsizei imageSize,
const GLvoid *data)
@ -3544,7 +3544,7 @@ _mesa_CompressedTexImage1DARB(GLenum target, GLint level,
void GLAPIENTRY
_mesa_CompressedTexImage2DARB(GLenum target, GLint level,
_mesa_CompressedTexImage2D(GLenum target, GLint level,
GLenum internalFormat, GLsizei width,
GLsizei height, GLint border, GLsizei imageSize,
const GLvoid *data)
@ -3556,7 +3556,7 @@ _mesa_CompressedTexImage2DARB(GLenum target, GLint level,
void GLAPIENTRY
_mesa_CompressedTexImage3DARB(GLenum target, GLint level,
_mesa_CompressedTexImage3D(GLenum target, GLint level,
GLenum internalFormat, GLsizei width,
GLsizei height, GLsizei depth, GLint border,
GLsizei imageSize, const GLvoid *data)
@ -3611,7 +3611,7 @@ compressed_tex_sub_image(GLuint dims, GLenum target, GLint level,
void GLAPIENTRY
_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
_mesa_CompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset,
GLsizei width, GLenum format,
GLsizei imageSize, const GLvoid *data)
{
@ -3621,7 +3621,7 @@ _mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
void GLAPIENTRY
_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
_mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLsizei width, GLsizei height,
GLenum format, GLsizei imageSize,
const GLvoid *data)
@ -3632,7 +3632,7 @@ _mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
void GLAPIENTRY
_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
_mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLint zoffset, GLsizei width,
GLsizei height, GLsizei depth, GLenum format,
GLsizei imageSize, const GLvoid *data)

View file

@ -248,41 +248,41 @@ _mesa_CopyTexSubImage3D( GLenum target, GLint level,
extern void GLAPIENTRY
_mesa_CompressedTexImage1DARB(GLenum target, GLint level,
_mesa_CompressedTexImage1D(GLenum target, GLint level,
GLenum internalformat, GLsizei width,
GLint border, GLsizei imageSize,
const GLvoid *data);
extern void GLAPIENTRY
_mesa_CompressedTexImage2DARB(GLenum target, GLint level,
_mesa_CompressedTexImage2D(GLenum target, GLint level,
GLenum internalformat, GLsizei width,
GLsizei height, GLint border, GLsizei imageSize,
const GLvoid *data);
extern void GLAPIENTRY
_mesa_CompressedTexImage3DARB(GLenum target, GLint level,
_mesa_CompressedTexImage3D(GLenum target, GLint level,
GLenum internalformat, GLsizei width,
GLsizei height, GLsizei depth, GLint border,
GLsizei imageSize, const GLvoid *data);
#ifdef VMS
#define _mesa_CompressedTexSubImage1DARB _mesa_CompressedTexSubImage1DAR
#define _mesa_CompressedTexSubImage2DARB _mesa_CompressedTexSubImage2DAR
#define _mesa_CompressedTexSubImage3DARB _mesa_CompressedTexSubImage3DAR
#define _mesa_CompressedTexSubImage1D _mesa_CompressedTexSubImage1DAR
#define _mesa_CompressedTexSubImage2D _mesa_CompressedTexSubImage2DAR
#define _mesa_CompressedTexSubImage3D _mesa_CompressedTexSubImage3DAR
#endif
extern void GLAPIENTRY
_mesa_CompressedTexSubImage1DARB(GLenum target, GLint level, GLint xoffset,
_mesa_CompressedTexSubImage1D(GLenum target, GLint level, GLint xoffset,
GLsizei width, GLenum format,
GLsizei imageSize, const GLvoid *data);
extern void GLAPIENTRY
_mesa_CompressedTexSubImage2DARB(GLenum target, GLint level, GLint xoffset,
_mesa_CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLsizei width, GLsizei height,
GLenum format, GLsizei imageSize,
const GLvoid *data);
extern void GLAPIENTRY
_mesa_CompressedTexSubImage3DARB(GLenum target, GLint level, GLint xoffset,
_mesa_CompressedTexSubImage3D(GLenum target, GLint level, GLint xoffset,
GLint yoffset, GLint zoffset, GLsizei width,
GLsizei height, GLsizei depth, GLenum format,
GLsizei imageSize, const GLvoid *data);

View file

@ -286,7 +286,7 @@ calculate_derived_texenv( struct gl_tex_env_combine_state *state,
/* GL_ARB_multitexture */
void GLAPIENTRY
_mesa_ActiveTextureARB(GLenum texture)
_mesa_ActiveTexture(GLenum texture)
{
const GLuint texUnit = texture - GL_TEXTURE0;
GLuint k;
@ -325,7 +325,7 @@ _mesa_ActiveTextureARB(GLenum texture)
/* GL_ARB_multitexture */
void GLAPIENTRY
_mesa_ClientActiveTextureARB(GLenum texture)
_mesa_ClientActiveTexture(GLenum texture)
{
GET_CURRENT_CONTEXT(ctx);
GLuint texUnit = texture - GL_TEXTURE0;

View file

@ -62,10 +62,10 @@ _mesa_print_texunit_state( struct gl_context *ctx, GLuint unit );
/*@{*/
extern void GLAPIENTRY
_mesa_ActiveTextureARB( GLenum target );
_mesa_ActiveTexture( GLenum target );
extern void GLAPIENTRY
_mesa_ClientActiveTextureARB( GLenum target );
_mesa_ClientActiveTexture( GLenum target );
/*@}*/

View file

@ -38,7 +38,7 @@
extern "C" void GLAPIENTRY
_mesa_GetActiveUniformARB(GLhandleARB program, GLuint index,
_mesa_GetActiveUniform(GLhandleARB program, GLuint index,
GLsizei maxLength, GLsizei *length, GLint *size,
GLenum *type, GLcharARB *nameOut)
{

View file

@ -128,14 +128,14 @@ _mesa_uniform_detach_all_driver_storage(struct gl_uniform_storage *uni)
}
void GLAPIENTRY
_mesa_Uniform1fARB(GLint location, GLfloat v0)
_mesa_Uniform1f(GLint location, GLfloat v0)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_FLOAT);
}
void GLAPIENTRY
_mesa_Uniform2fARB(GLint location, GLfloat v0, GLfloat v1)
_mesa_Uniform2f(GLint location, GLfloat v0, GLfloat v1)
{
GET_CURRENT_CONTEXT(ctx);
GLfloat v[2];
@ -145,7 +145,7 @@ _mesa_Uniform2fARB(GLint location, GLfloat v0, GLfloat v1)
}
void GLAPIENTRY
_mesa_Uniform3fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
_mesa_Uniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
{
GET_CURRENT_CONTEXT(ctx);
GLfloat v[3];
@ -156,7 +156,7 @@ _mesa_Uniform3fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
}
void GLAPIENTRY
_mesa_Uniform4fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
_mesa_Uniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
GLfloat v3)
{
GET_CURRENT_CONTEXT(ctx);
@ -169,14 +169,14 @@ _mesa_Uniform4fARB(GLint location, GLfloat v0, GLfloat v1, GLfloat v2,
}
void GLAPIENTRY
_mesa_Uniform1iARB(GLint location, GLint v0)
_mesa_Uniform1i(GLint location, GLint v0)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, 1, &v0, GL_INT);
}
void GLAPIENTRY
_mesa_Uniform2iARB(GLint location, GLint v0, GLint v1)
_mesa_Uniform2i(GLint location, GLint v0, GLint v1)
{
GET_CURRENT_CONTEXT(ctx);
GLint v[2];
@ -186,7 +186,7 @@ _mesa_Uniform2iARB(GLint location, GLint v0, GLint v1)
}
void GLAPIENTRY
_mesa_Uniform3iARB(GLint location, GLint v0, GLint v1, GLint v2)
_mesa_Uniform3i(GLint location, GLint v0, GLint v1, GLint v2)
{
GET_CURRENT_CONTEXT(ctx);
GLint v[3];
@ -197,7 +197,7 @@ _mesa_Uniform3iARB(GLint location, GLint v0, GLint v1, GLint v2)
}
void GLAPIENTRY
_mesa_Uniform4iARB(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
_mesa_Uniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
{
GET_CURRENT_CONTEXT(ctx);
GLint v[4];
@ -209,56 +209,56 @@ _mesa_Uniform4iARB(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
}
void GLAPIENTRY
_mesa_Uniform1fvARB(GLint location, GLsizei count, const GLfloat * value)
_mesa_Uniform1fv(GLint location, GLsizei count, const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT);
}
void GLAPIENTRY
_mesa_Uniform2fvARB(GLint location, GLsizei count, const GLfloat * value)
_mesa_Uniform2fv(GLint location, GLsizei count, const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC2);
}
void GLAPIENTRY
_mesa_Uniform3fvARB(GLint location, GLsizei count, const GLfloat * value)
_mesa_Uniform3fv(GLint location, GLsizei count, const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC3);
}
void GLAPIENTRY
_mesa_Uniform4fvARB(GLint location, GLsizei count, const GLfloat * value)
_mesa_Uniform4fv(GLint location, GLsizei count, const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_FLOAT_VEC4);
}
void GLAPIENTRY
_mesa_Uniform1ivARB(GLint location, GLsizei count, const GLint * value)
_mesa_Uniform1iv(GLint location, GLsizei count, const GLint * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT);
}
void GLAPIENTRY
_mesa_Uniform2ivARB(GLint location, GLsizei count, const GLint * value)
_mesa_Uniform2iv(GLint location, GLsizei count, const GLint * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC2);
}
void GLAPIENTRY
_mesa_Uniform3ivARB(GLint location, GLsizei count, const GLint * value)
_mesa_Uniform3iv(GLint location, GLsizei count, const GLint * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC3);
}
void GLAPIENTRY
_mesa_Uniform4ivARB(GLint location, GLsizei count, const GLint * value)
_mesa_Uniform4iv(GLint location, GLsizei count, const GLint * value)
{
GET_CURRENT_CONTEXT(ctx);
_mesa_uniform(ctx, ctx->Shader.ActiveProgram, location, count, value, GL_INT_VEC4);
@ -337,7 +337,7 @@ _mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value)
void GLAPIENTRY
_mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
_mesa_UniformMatrix2fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
@ -346,7 +346,7 @@ _mesa_UniformMatrix2fvARB(GLint location, GLsizei count, GLboolean transpose,
}
void GLAPIENTRY
_mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,
_mesa_UniformMatrix3fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
@ -355,7 +355,7 @@ _mesa_UniformMatrix3fvARB(GLint location, GLsizei count, GLboolean transpose,
}
void GLAPIENTRY
_mesa_UniformMatrix4fvARB(GLint location, GLsizei count, GLboolean transpose,
_mesa_UniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat * value)
{
GET_CURRENT_CONTEXT(ctx);
@ -431,7 +431,7 @@ _mesa_GetnUniformfvARB(GLhandleARB program, GLint location,
}
void GLAPIENTRY
_mesa_GetUniformfvARB(GLhandleARB program, GLint location, GLfloat *params)
_mesa_GetUniformfv(GLhandleARB program, GLint location, GLfloat *params)
{
_mesa_GetnUniformfvARB(program, location, INT_MAX, params);
}
@ -446,7 +446,7 @@ _mesa_GetnUniformivARB(GLhandleARB program, GLint location,
}
void GLAPIENTRY
_mesa_GetUniformivARB(GLhandleARB program, GLint location, GLint *params)
_mesa_GetUniformiv(GLhandleARB program, GLint location, GLint *params)
{
_mesa_GetnUniformivARB(program, location, INT_MAX, params);
}
@ -495,7 +495,7 @@ _mesa_GetUniformdv(GLhandleARB program, GLint location, GLdouble *params)
GLint GLAPIENTRY
_mesa_GetUniformLocationARB(GLhandleARB programObj, const GLcharARB *name)
_mesa_GetUniformLocation(GLhandleARB programObj, const GLcharARB *name)
{
struct gl_shader_program *shProg;
GLuint index, offset;

View file

@ -39,37 +39,37 @@ struct gl_program;
struct _glapi_table;
void GLAPIENTRY
_mesa_Uniform1fARB(GLint, GLfloat);
_mesa_Uniform1f(GLint, GLfloat);
void GLAPIENTRY
_mesa_Uniform2fARB(GLint, GLfloat, GLfloat);
_mesa_Uniform2f(GLint, GLfloat, GLfloat);
void GLAPIENTRY
_mesa_Uniform3fARB(GLint, GLfloat, GLfloat, GLfloat);
_mesa_Uniform3f(GLint, GLfloat, GLfloat, GLfloat);
void GLAPIENTRY
_mesa_Uniform4fARB(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
_mesa_Uniform4f(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
void GLAPIENTRY
_mesa_Uniform1iARB(GLint, GLint);
_mesa_Uniform1i(GLint, GLint);
void GLAPIENTRY
_mesa_Uniform2iARB(GLint, GLint, GLint);
_mesa_Uniform2i(GLint, GLint, GLint);
void GLAPIENTRY
_mesa_Uniform3iARB(GLint, GLint, GLint, GLint);
_mesa_Uniform3i(GLint, GLint, GLint, GLint);
void GLAPIENTRY
_mesa_Uniform4iARB(GLint, GLint, GLint, GLint, GLint);
_mesa_Uniform4i(GLint, GLint, GLint, GLint, GLint);
void GLAPIENTRY
_mesa_Uniform1fvARB(GLint, GLsizei, const GLfloat *);
_mesa_Uniform1fv(GLint, GLsizei, const GLfloat *);
void GLAPIENTRY
_mesa_Uniform2fvARB(GLint, GLsizei, const GLfloat *);
_mesa_Uniform2fv(GLint, GLsizei, const GLfloat *);
void GLAPIENTRY
_mesa_Uniform3fvARB(GLint, GLsizei, const GLfloat *);
_mesa_Uniform3fv(GLint, GLsizei, const GLfloat *);
void GLAPIENTRY
_mesa_Uniform4fvARB(GLint, GLsizei, const GLfloat *);
_mesa_Uniform4fv(GLint, GLsizei, const GLfloat *);
void GLAPIENTRY
_mesa_Uniform1ivARB(GLint, GLsizei, const GLint *);
_mesa_Uniform1iv(GLint, GLsizei, const GLint *);
void GLAPIENTRY
_mesa_Uniform2ivARB(GLint, GLsizei, const GLint *);
_mesa_Uniform2iv(GLint, GLsizei, const GLint *);
void GLAPIENTRY
_mesa_Uniform3ivARB(GLint, GLsizei, const GLint *);
_mesa_Uniform3iv(GLint, GLsizei, const GLint *);
void GLAPIENTRY
_mesa_Uniform4ivARB(GLint, GLsizei, const GLint *);
_mesa_Uniform4iv(GLint, GLsizei, const GLint *);
void GLAPIENTRY
_mesa_Uniform1ui(GLint location, GLuint v0);
void GLAPIENTRY
@ -87,11 +87,11 @@ _mesa_Uniform3uiv(GLint location, GLsizei count, const GLuint *value);
void GLAPIENTRY
_mesa_Uniform4uiv(GLint location, GLsizei count, const GLuint *value);
void GLAPIENTRY
_mesa_UniformMatrix2fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
_mesa_UniformMatrix2fv(GLint, GLsizei, GLboolean, const GLfloat *);
void GLAPIENTRY
_mesa_UniformMatrix3fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
_mesa_UniformMatrix3fv(GLint, GLsizei, GLboolean, const GLfloat *);
void GLAPIENTRY
_mesa_UniformMatrix4fvARB(GLint, GLsizei, GLboolean, const GLfloat *);
_mesa_UniformMatrix4fv(GLint, GLsizei, GLboolean, const GLfloat *);
void GLAPIENTRY
_mesa_UniformMatrix2x3fv(GLint location, GLsizei count, GLboolean transpose,
const GLfloat *value);
@ -113,7 +113,7 @@ _mesa_UniformMatrix4x3fv(GLint location, GLsizei count, GLboolean transpose,
void GLAPIENTRY
_mesa_GetnUniformfvARB(GLhandleARB, GLint, GLsizei, GLfloat *);
void GLAPIENTRY
_mesa_GetUniformfvARB(GLhandleARB, GLint, GLfloat *);
_mesa_GetUniformfv(GLhandleARB, GLint, GLfloat *);
void GLAPIENTRY
_mesa_GetnUniformivARB(GLhandleARB, GLint, GLsizei, GLint *);
void GLAPIENTRY
@ -127,7 +127,7 @@ _mesa_GetnUniformdvARB(GLhandleARB, GLint, GLsizei, GLdouble *);
void GLAPIENTRY
_mesa_GetUniformdv(GLhandleARB, GLint, GLdouble *);
GLint GLAPIENTRY
_mesa_GetUniformLocationARB(GLhandleARB, const GLcharARB *);
_mesa_GetUniformLocation(GLhandleARB, const GLcharARB *);
GLuint GLAPIENTRY
_mesa_GetUniformBlockIndex(GLuint program,
const GLchar *uniformBlockName);
@ -156,7 +156,7 @@ _mesa_GetActiveUniformName(GLuint program, GLuint uniformIndex,
GLsizei bufSize, GLsizei *length,
GLchar *uniformName);
void GLAPIENTRY
_mesa_GetActiveUniformARB(GLhandleARB, GLuint, GLsizei, GLsizei *,
_mesa_GetActiveUniform(GLhandleARB, GLuint, GLsizei, GLsizei *,
GLint *, GLenum *, GLcharARB *);
void GLAPIENTRY
_mesa_GetActiveUniformsiv(GLuint program,
@ -165,7 +165,7 @@ _mesa_GetActiveUniformsiv(GLuint program,
GLenum pname,
GLint *params);
void GLAPIENTRY
_mesa_GetUniformivARB(GLhandleARB, GLint, GLint *);
_mesa_GetUniformiv(GLhandleARB, GLint, GLint *);
unsigned
_mesa_get_uniform_location(struct gl_context *ctx, struct gl_shader_program *shProg,

View file

@ -330,7 +330,7 @@ _mesa_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
void GLAPIENTRY
_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr)
_mesa_FogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
{
const GLbitfield legalTypes = (HALF_BIT | FLOAT_BIT | DOUBLE_BIT);
GET_CURRENT_CONTEXT(ctx);
@ -357,7 +357,7 @@ _mesa_IndexPointer(GLenum type, GLsizei stride, const GLvoid *ptr)
void GLAPIENTRY
_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
_mesa_SecondaryColorPointer(GLint size, GLenum type,
GLsizei stride, const GLvoid *ptr)
{
const GLbitfield legalTypes = (BYTE_BIT | UNSIGNED_BYTE_BIT |
@ -413,7 +413,7 @@ _mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr)
void GLAPIENTRY
_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr)
_mesa_PointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *ptr)
{
const GLbitfield legalTypes = (FLOAT_BIT | FIXED_ES_BIT);
GET_CURRENT_CONTEXT(ctx);
@ -437,7 +437,7 @@ _mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr)
* (position, normal, color, fog, texcoord, etc).
*/
void GLAPIENTRY
_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
_mesa_VertexAttribPointer(GLuint index, GLint size, GLenum type,
GLboolean normalized,
GLsizei stride, const GLvoid *ptr)
{
@ -493,7 +493,7 @@ _mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,
void GLAPIENTRY
_mesa_EnableVertexAttribArrayARB(GLuint index)
_mesa_EnableVertexAttribArray(GLuint index)
{
struct gl_array_object *arrayObj;
GET_CURRENT_CONTEXT(ctx);
@ -520,7 +520,7 @@ _mesa_EnableVertexAttribArrayARB(GLuint index)
void GLAPIENTRY
_mesa_DisableVertexAttribArrayARB(GLuint index)
_mesa_DisableVertexAttribArray(GLuint index)
{
struct gl_array_object *arrayObj;
GET_CURRENT_CONTEXT(ctx);
@ -630,7 +630,7 @@ get_current_attrib(struct gl_context *ctx, GLuint index, const char *function)
}
void GLAPIENTRY
_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
_mesa_GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@ -649,7 +649,7 @@ _mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params)
void GLAPIENTRY
_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params)
_mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@ -671,7 +671,7 @@ _mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params)
void GLAPIENTRY
_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params)
_mesa_GetVertexAttribiv(GLuint index, GLenum pname, GLint *params)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@ -736,7 +736,7 @@ _mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params)
void GLAPIENTRY
_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer)
_mesa_GetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer)
{
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@ -1039,7 +1039,7 @@ _mesa_UnlockArraysEXT( void )
/* GL_EXT_multi_draw_arrays */
void GLAPIENTRY
_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first,
_mesa_MultiDrawArrays( GLenum mode, const GLint *first,
const GLsizei *count, GLsizei primcount )
{
GET_CURRENT_CONTEXT(ctx);

View file

@ -127,20 +127,20 @@ _mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr);
extern void GLAPIENTRY
_mesa_FogCoordPointerEXT(GLenum type, GLsizei stride, const GLvoid *ptr);
_mesa_FogCoordPointer(GLenum type, GLsizei stride, const GLvoid *ptr);
extern void GLAPIENTRY
_mesa_SecondaryColorPointerEXT(GLint size, GLenum type,
_mesa_SecondaryColorPointer(GLint size, GLenum type,
GLsizei stride, const GLvoid *ptr);
extern void GLAPIENTRY
_mesa_PointSizePointer(GLenum type, GLsizei stride, const GLvoid *ptr);
_mesa_PointSizePointerOES(GLenum type, GLsizei stride, const GLvoid *ptr);
extern void GLAPIENTRY
_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
_mesa_VertexAttribPointer(GLuint index, GLint size, GLenum type,
GLboolean normalized, GLsizei stride,
const GLvoid *pointer);
@ -150,23 +150,23 @@ _mesa_VertexAttribIPointer(GLuint index, GLint size, GLenum type,
extern void GLAPIENTRY
_mesa_EnableVertexAttribArrayARB(GLuint index);
_mesa_EnableVertexAttribArray(GLuint index);
extern void GLAPIENTRY
_mesa_DisableVertexAttribArrayARB(GLuint index);
_mesa_DisableVertexAttribArray(GLuint index);
extern void GLAPIENTRY
_mesa_GetVertexAttribdvARB(GLuint index, GLenum pname, GLdouble *params);
_mesa_GetVertexAttribdv(GLuint index, GLenum pname, GLdouble *params);
extern void GLAPIENTRY
_mesa_GetVertexAttribfvARB(GLuint index, GLenum pname, GLfloat *params);
_mesa_GetVertexAttribfv(GLuint index, GLenum pname, GLfloat *params);
extern void GLAPIENTRY
_mesa_GetVertexAttribivARB(GLuint index, GLenum pname, GLint *params);
_mesa_GetVertexAttribiv(GLuint index, GLenum pname, GLint *params);
extern void GLAPIENTRY
@ -178,7 +178,7 @@ _mesa_GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint *params);
extern void GLAPIENTRY
_mesa_GetVertexAttribPointervARB(GLuint index, GLenum pname, GLvoid **pointer);
_mesa_GetVertexAttribPointerv(GLuint index, GLenum pname, GLvoid **pointer);
extern void GLAPIENTRY
@ -186,7 +186,7 @@ _mesa_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid *pointer);
extern void GLAPIENTRY
_mesa_MultiDrawArraysEXT( GLenum mode, const GLint *first,
_mesa_MultiDrawArrays( GLenum mode, const GLint *first,
const GLsizei *count, GLsizei primcount );
extern void GLAPIENTRY