Merged origin/release (checked in because wanted to merge new stuff)

1 files changed, 68 insertions, 0 deletions

diff --git a/xorg-server/glx/glfunctions.h b/xorg-server/glx/glfunctions.h
index d060031a4..fa5080278 100644
--- a/xorg-server/glx/glfunctions.h
+++ b/xorg-server/glx/glfunctions.h
@@ -808,6 +808,24 @@
 #define glVertexP4uiv(a1, a2) CALL_VertexP4uiv(GET_DISPATCH(), (a1, a2))
 #define glDrawArraysIndirect(a1, a2) CALL_DrawArraysIndirect(GET_DISPATCH(), (a1, a2))
 #define glDrawElementsIndirect(a1, a2, a3) CALL_DrawElementsIndirect(GET_DISPATCH(), (a1, a2, a3))
+#define glGetUniformdv(a1, a2, a3) CALL_GetUniformdv(GET_DISPATCH(), (a1, a2, a3))
+#define glUniform1d(a1, a2) CALL_Uniform1d(GET_DISPATCH(), (a1, a2))
+#define glUniform1dv(a1, a2, a3) CALL_Uniform1dv(GET_DISPATCH(), (a1, a2, a3))
+#define glUniform2d(a1, a2, a3) CALL_Uniform2d(GET_DISPATCH(), (a1, a2, a3))
+#define glUniform2dv(a1, a2, a3) CALL_Uniform2dv(GET_DISPATCH(), (a1, a2, a3))
+#define glUniform3d(a1, a2, a3, a4) CALL_Uniform3d(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniform3dv(a1, a2, a3) CALL_Uniform3dv(GET_DISPATCH(), (a1, a2, a3))
+#define glUniform4d(a1, a2, a3, a4, a5) CALL_Uniform4d(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glUniform4dv(a1, a2, a3) CALL_Uniform4dv(GET_DISPATCH(), (a1, a2, a3))
+#define glUniformMatrix2dv(a1, a2, a3, a4) CALL_UniformMatrix2dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix2x3dv(a1, a2, a3, a4) CALL_UniformMatrix2x3dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix2x4dv(a1, a2, a3, a4) CALL_UniformMatrix2x4dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix3dv(a1, a2, a3, a4) CALL_UniformMatrix3dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix3x2dv(a1, a2, a3, a4) CALL_UniformMatrix3x2dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix3x4dv(a1, a2, a3, a4) CALL_UniformMatrix3x4dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix4dv(a1, a2, a3, a4) CALL_UniformMatrix4dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix4x2dv(a1, a2, a3, a4) CALL_UniformMatrix4x2dv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glUniformMatrix4x3dv(a1, a2, a3, a4) CALL_UniformMatrix4x3dv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glBindTransformFeedback(a1, a2) CALL_BindTransformFeedback(GET_DISPATCH(), (a1, a2))
 #define glDeleteTransformFeedbacks(a1, a2) CALL_DeleteTransformFeedbacks(GET_DISPATCH(), (a1, a2))
 #define glDrawTransformFeedback(a1, a2) CALL_DrawTransformFeedback(GET_DISPATCH(), (a1, a2))
@@ -899,6 +917,38 @@
 #define glBindTextures(a1, a2, a3) CALL_BindTextures(GET_DISPATCH(), (a1, a2, a3))
 #define glBindVertexBuffers(a1, a2, a3, a4, a5) CALL_BindVertexBuffers(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glClipControl(a1, a2) CALL_ClipControl(GET_DISPATCH(), (a1, a2))
+#define glBindTextureUnit(a1, a2) CALL_BindTextureUnit(GET_DISPATCH(), (a1, a2))
+#define glCompressedTextureSubImage1D(a1, a2, a3, a4, a5, a6, a7) CALL_CompressedTextureSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
+#define glCompressedTextureSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_CompressedTextureSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9))
+#define glCompressedTextureSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) CALL_CompressedTextureSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11))
+#define glCopyTextureSubImage1D(a1, a2, a3, a4, a5, a6) CALL_CopyTextureSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
+#define glCopyTextureSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8) CALL_CopyTextureSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8))
+#define glCopyTextureSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_CopyTextureSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9))
+#define glCreateTextures(a1, a2, a3) CALL_CreateTextures(GET_DISPATCH(), (a1, a2, a3))
+#define glGenerateTextureMipmap(a1) CALL_GenerateTextureMipmap(GET_DISPATCH(), (a1))
+#define glGetCompressedTextureImage(a1, a2, a3, a4) CALL_GetCompressedTextureImage(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetTextureImage(a1, a2, a3, a4, a5, a6) CALL_GetTextureImage(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
+#define glGetTextureLevelParameterfv(a1, a2, a3, a4) CALL_GetTextureLevelParameterfv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetTextureLevelParameteriv(a1, a2, a3, a4) CALL_GetTextureLevelParameteriv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glGetTextureParameterIiv(a1, a2, a3) CALL_GetTextureParameterIiv(GET_DISPATCH(), (a1, a2, a3))
+#define glGetTextureParameterIuiv(a1, a2, a3) CALL_GetTextureParameterIuiv(GET_DISPATCH(), (a1, a2, a3))
+#define glGetTextureParameterfv(a1, a2, a3) CALL_GetTextureParameterfv(GET_DISPATCH(), (a1, a2, a3))
+#define glGetTextureParameteriv(a1, a2, a3) CALL_GetTextureParameteriv(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureBuffer(a1, a2, a3) CALL_TextureBuffer(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureParameterIiv(a1, a2, a3) CALL_TextureParameterIiv(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureParameterIuiv(a1, a2, a3) CALL_TextureParameterIuiv(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureParameterf(a1, a2, a3) CALL_TextureParameterf(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureParameterfv(a1, a2, a3) CALL_TextureParameterfv(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureParameteri(a1, a2, a3) CALL_TextureParameteri(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureParameteriv(a1, a2, a3) CALL_TextureParameteriv(GET_DISPATCH(), (a1, a2, a3))
+#define glTextureStorage1D(a1, a2, a3, a4) CALL_TextureStorage1D(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glTextureStorage2D(a1, a2, a3, a4, a5) CALL_TextureStorage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glTextureStorage2DMultisample(a1, a2, a3, a4, a5, a6) CALL_TextureStorage2DMultisample(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
+#define glTextureStorage3D(a1, a2, a3, a4, a5, a6) CALL_TextureStorage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
+#define glTextureStorage3DMultisample(a1, a2, a3, a4, a5, a6, a7) CALL_TextureStorage3DMultisample(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
+#define glTextureSubImage1D(a1, a2, a3, a4, a5, a6, a7) CALL_TextureSubImage1D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
+#define glTextureSubImage2D(a1, a2, a3, a4, a5, a6, a7, a8, a9) CALL_TextureSubImage2D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9))
+#define glTextureSubImage3D(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11) CALL_TextureSubImage3D(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11))
 #define glInvalidateBufferData(a1) CALL_InvalidateBufferData(GET_DISPATCH(), (a1))
 #define glInvalidateBufferSubData(a1, a2, a3) CALL_InvalidateBufferSubData(GET_DISPATCH(), (a1, a2, a3))
 #define glInvalidateFramebuffer(a1, a2, a3) CALL_InvalidateFramebuffer(GET_DISPATCH(), (a1, a2, a3))
@@ -934,38 +984,55 @@
 #define glGetProgramPipelineiv(a1, a2, a3) CALL_GetProgramPipelineiv(GET_DISPATCH(), (a1, a2, a3))
 #define glIsProgramPipeline(a1) CALL_IsProgramPipeline(GET_DISPATCH(), (a1))
 #define glLockArraysEXT(a1, a2) CALL_LockArraysEXT(GET_DISPATCH(), (a1, a2))
+#define glProgramUniform1d(a1, a2, a3) CALL_ProgramUniform1d(GET_DISPATCH(), (a1, a2, a3))
+#define glProgramUniform1dv(a1, a2, a3, a4) CALL_ProgramUniform1dv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform1f(a1, a2, a3) CALL_ProgramUniform1f(GET_DISPATCH(), (a1, a2, a3))
 #define glProgramUniform1fv(a1, a2, a3, a4) CALL_ProgramUniform1fv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform1i(a1, a2, a3) CALL_ProgramUniform1i(GET_DISPATCH(), (a1, a2, a3))
 #define glProgramUniform1iv(a1, a2, a3, a4) CALL_ProgramUniform1iv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform1ui(a1, a2, a3) CALL_ProgramUniform1ui(GET_DISPATCH(), (a1, a2, a3))
 #define glProgramUniform1uiv(a1, a2, a3, a4) CALL_ProgramUniform1uiv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glProgramUniform2d(a1, a2, a3, a4) CALL_ProgramUniform2d(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glProgramUniform2dv(a1, a2, a3, a4) CALL_ProgramUniform2dv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform2f(a1, a2, a3, a4) CALL_ProgramUniform2f(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform2fv(a1, a2, a3, a4) CALL_ProgramUniform2fv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform2i(a1, a2, a3, a4) CALL_ProgramUniform2i(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform2iv(a1, a2, a3, a4) CALL_ProgramUniform2iv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform2ui(a1, a2, a3, a4) CALL_ProgramUniform2ui(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform2uiv(a1, a2, a3, a4) CALL_ProgramUniform2uiv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glProgramUniform3d(a1, a2, a3, a4, a5) CALL_ProgramUniform3d(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniform3dv(a1, a2, a3, a4) CALL_ProgramUniform3dv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform3f(a1, a2, a3, a4, a5) CALL_ProgramUniform3f(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glProgramUniform3fv(a1, a2, a3, a4) CALL_ProgramUniform3fv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform3i(a1, a2, a3, a4, a5) CALL_ProgramUniform3i(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glProgramUniform3iv(a1, a2, a3, a4) CALL_ProgramUniform3iv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform3ui(a1, a2, a3, a4, a5) CALL_ProgramUniform3ui(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glProgramUniform3uiv(a1, a2, a3, a4) CALL_ProgramUniform3uiv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glProgramUniform4d(a1, a2, a3, a4, a5, a6) CALL_ProgramUniform4d(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
+#define glProgramUniform4dv(a1, a2, a3, a4) CALL_ProgramUniform4dv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform4f(a1, a2, a3, a4, a5, a6) CALL_ProgramUniform4f(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
 #define glProgramUniform4fv(a1, a2, a3, a4) CALL_ProgramUniform4fv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform4i(a1, a2, a3, a4, a5, a6) CALL_ProgramUniform4i(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
 #define glProgramUniform4iv(a1, a2, a3, a4) CALL_ProgramUniform4iv(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramUniform4ui(a1, a2, a3, a4, a5, a6) CALL_ProgramUniform4ui(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6))
 #define glProgramUniform4uiv(a1, a2, a3, a4) CALL_ProgramUniform4uiv(GET_DISPATCH(), (a1, a2, a3, a4))
+#define glProgramUniformMatrix2dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glProgramUniformMatrix2fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix2x3dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2x3dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glProgramUniformMatrix2x3fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2x3fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix2x4dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2x4dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glProgramUniformMatrix2x4fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix2x4fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix3dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glProgramUniformMatrix3fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix3x2dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3x2dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glProgramUniformMatrix3x2fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3x2fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix3x4dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3x4dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glProgramUniformMatrix3x4fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix3x4fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix4dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glProgramUniformMatrix4fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix4x2dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4x2dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glProgramUniformMatrix4x2fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4x2fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
+#define glProgramUniformMatrix4x3dv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4x3dv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glProgramUniformMatrix4x3fv(a1, a2, a3, a4, a5) CALL_ProgramUniformMatrix4x3fv(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glUnlockArraysEXT() CALL_UnlockArraysEXT(GET_DISPATCH(), ())
 #define glUseProgramStages(a1, a2, a3) CALL_UseProgramStages(GET_DISPATCH(), (a1, a2, a3))
@@ -1142,6 +1209,7 @@
 #define glGetPerfQueryDataINTEL(a1, a2, a3, a4, a5) CALL_GetPerfQueryDataINTEL(GET_DISPATCH(), (a1, a2, a3, a4, a5))
 #define glGetPerfQueryIdByNameINTEL(a1, a2) CALL_GetPerfQueryIdByNameINTEL(GET_DISPATCH(), (a1, a2))
 #define glGetPerfQueryInfoINTEL(a1, a2, a3, a4, a5, a6, a7) CALL_GetPerfQueryInfoINTEL(GET_DISPATCH(), (a1, a2, a3, a4, a5, a6, a7))
+#define glPolygonOffsetClampEXT(a1, a2, a3) CALL_PolygonOffsetClampEXT(GET_DISPATCH(), (a1, a2, a3))
 #define glStencilFuncSeparateATI(a1, a2, a3, a4) CALL_StencilFuncSeparateATI(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramEnvParameters4fvEXT(a1, a2, a3, a4) CALL_ProgramEnvParameters4fvEXT(GET_DISPATCH(), (a1, a2, a3, a4))
 #define glProgramLocalParameters4fvEXT(a1, a2, a3, a4) CALL_ProgramLocalParameters4fvEXT(GET_DISPATCH(), (a1, a2, a3, a4))