svn merge ^/branches/released .

1 files changed, 20 insertions, 14 deletions

diff --git a/xorg-server/glx/indirect_dispatch.h b/xorg-server/glx/indirect_dispatch.h
index d69e14c9c..12e09cd97 100644
--- a/xorg-server/glx/indirect_dispatch.h
+++ b/xorg-server/glx/indirect_dispatch.h
@@ -123,8 +123,8 @@ extern HIDDEN void __glXDisp_Normal3bv(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_Normal3bv(GLbyte * pc);

 extern HIDDEN int __glXDisp_VendorPrivate(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN int __glXDispSwap_VendorPrivate(struct __GLXclientStateRec *, GLbyte *);

-extern HIDDEN int __glXDisp_CreateGLXPixmapWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);

-extern HIDDEN int __glXDispSwap_CreateGLXPixmapWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);

+extern HIDDEN void __glXDisp_TexGeniv(GLbyte * pc);

+extern HIDDEN void __glXDispSwap_TexGeniv(GLbyte * pc);

 extern HIDDEN void __glXDisp_VertexAttrib1fvNV(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_VertexAttrib1fvNV(GLbyte * pc);

 extern HIDDEN void __glXDisp_Vertex3iv(GLbyte * pc);

@@ -197,8 +197,6 @@ extern HIDDEN int __glXDisp_GetClipPlane(struct __GLXclientStateRec *, GLbyte *)
 extern HIDDEN int __glXDispSwap_GetClipPlane(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN void __glXDisp_VertexAttribs3dvNV(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_VertexAttribs3dvNV(GLbyte * pc);

-extern HIDDEN void __glXDisp_LightModeli(GLbyte * pc);

-extern HIDDEN void __glXDispSwap_LightModeli(GLbyte * pc);

 extern HIDDEN void __glXDisp_VertexAttribs4fvNV(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_VertexAttribs4fvNV(GLbyte * pc);

 extern HIDDEN void __glXDisp_Scaled(GLbyte * pc);

@@ -227,6 +225,8 @@ extern HIDDEN void __glXDisp_DrawPixels(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_DrawPixels(GLbyte * pc);

 extern HIDDEN void __glXDisp_MultiTexCoord2svARB(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_MultiTexCoord2svARB(GLbyte * pc);

+extern HIDDEN void __glXDisp_MultiTexCoord3svARB(GLbyte * pc);

+extern HIDDEN void __glXDispSwap_MultiTexCoord3svARB(GLbyte * pc);

 extern HIDDEN void __glXDisp_GenerateMipmapEXT(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_GenerateMipmapEXT(GLbyte * pc);

 extern HIDDEN int __glXDisp_GenLists(struct __GLXclientStateRec *, GLbyte *);

@@ -339,8 +339,8 @@ extern HIDDEN void __glXDisp_End(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_End(GLbyte * pc);

 extern HIDDEN void __glXDisp_VertexAttribs2dvNV(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_VertexAttribs2dvNV(GLbyte * pc);

-extern HIDDEN void __glXDisp_MultiTexCoord3fvARB(GLbyte * pc);

-extern HIDDEN void __glXDispSwap_MultiTexCoord3fvARB(GLbyte * pc);

+extern HIDDEN int __glXDisp_CreateContextAttribsARB(struct __GLXclientStateRec *, GLbyte *);

+extern HIDDEN int __glXDispSwap_CreateContextAttribsARB(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN int __glXDisp_GetProgramParameterfvNV(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN int __glXDispSwap_GetProgramParameterfvNV(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN void __glXDisp_BindTexture(GLbyte * pc);

@@ -389,8 +389,8 @@ extern HIDDEN int __glXDisp_GetMaterialiv(struct __GLXclientStateRec *, GLbyte *
 extern HIDDEN int __glXDispSwap_GetMaterialiv(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN void __glXDisp_StencilOp(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_StencilOp(GLbyte * pc);

-extern HIDDEN void __glXDisp_MultiTexCoord3svARB(GLbyte * pc);

-extern HIDDEN void __glXDispSwap_MultiTexCoord3svARB(GLbyte * pc);

+extern HIDDEN void __glXDisp_Ortho(GLbyte * pc);

+extern HIDDEN void __glXDispSwap_Ortho(GLbyte * pc);

 extern HIDDEN void __glXDisp_TexEnvfv(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_TexEnvfv(GLbyte * pc);

 extern HIDDEN int __glXDisp_QueryServerString(struct __GLXclientStateRec *, GLbyte *);

@@ -439,8 +439,8 @@ extern HIDDEN void __glXDisp_TexCoord2fv(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_TexCoord2fv(GLbyte * pc);

 extern HIDDEN void __glXDisp_TexCoord1sv(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_TexCoord1sv(GLbyte * pc);

-extern HIDDEN void __glXDisp_TexGeniv(GLbyte * pc);

-extern HIDDEN void __glXDispSwap_TexGeniv(GLbyte * pc);

+extern HIDDEN int __glXDisp_CreateGLXPixmapWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);

+extern HIDDEN int __glXDispSwap_CreateGLXPixmapWithConfigSGIX(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN void __glXDisp_DepthFunc(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_DepthFunc(GLbyte * pc);

 extern HIDDEN void __glXDisp_PixelMapusv(GLbyte * pc);

@@ -525,8 +525,6 @@ extern HIDDEN void __glXDisp_TexCoord4iv(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_TexCoord4iv(GLbyte * pc);

 extern HIDDEN int __glXDisp_GetDrawableAttributesSGIX(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN int __glXDispSwap_GetDrawableAttributesSGIX(struct __GLXclientStateRec *, GLbyte *);

-extern HIDDEN void __glXDisp_SampleMaskSGIS(GLbyte * pc);

-extern HIDDEN void __glXDispSwap_SampleMaskSGIS(GLbyte * pc);

 extern HIDDEN void __glXDisp_ColorTableParameteriv(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_ColorTableParameteriv(GLbyte * pc);

 extern HIDDEN void __glXDisp_VertexAttrib4ubvARB(GLbyte * pc);

@@ -563,6 +561,8 @@ extern HIDDEN void __glXDisp_VertexAttrib4NivARB(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_VertexAttrib4NivARB(GLbyte * pc);

 extern HIDDEN void __glXDisp_Materialiv(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_Materialiv(GLbyte * pc);

+extern HIDDEN void __glXDisp_SampleMaskSGIS(GLbyte * pc);

+extern HIDDEN void __glXDispSwap_SampleMaskSGIS(GLbyte * pc);

 extern HIDDEN void __glXDisp_SecondaryColor3fvEXT(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_SecondaryColor3fvEXT(GLbyte * pc);

 extern HIDDEN void __glXDisp_PolygonMode(GLbyte * pc);

@@ -605,6 +605,8 @@ extern HIDDEN int __glXDisp_IsTexture(struct __GLXclientStateRec *, GLbyte *);
 extern HIDDEN int __glXDispSwap_IsTexture(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN int __glXDisp_IsTextureEXT(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN int __glXDispSwap_IsTextureEXT(struct __GLXclientStateRec *, GLbyte *);

+extern HIDDEN int __glXDisp_SetClientInfo2ARB(struct __GLXclientStateRec *, GLbyte *);

+extern HIDDEN int __glXDispSwap_SetClientInfo2ARB(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN int __glXDisp_DeleteQueriesARB(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN int __glXDispSwap_DeleteQueriesARB(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN int __glXDisp_GetMapdv(struct __GLXclientStateRec *, GLbyte *);

@@ -771,8 +773,8 @@ extern HIDDEN void __glXDisp_ReadBuffer(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_ReadBuffer(GLbyte * pc);

 extern HIDDEN void __glXDisp_ConvolutionParameteri(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_ConvolutionParameteri(GLbyte * pc);

-extern HIDDEN void __glXDisp_Ortho(GLbyte * pc);

-extern HIDDEN void __glXDispSwap_Ortho(GLbyte * pc);

+extern HIDDEN void __glXDisp_LightModeli(GLbyte * pc);

+extern HIDDEN void __glXDispSwap_LightModeli(GLbyte * pc);

 extern HIDDEN void __glXDisp_ListBase(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_ListBase(GLbyte * pc);

 extern HIDDEN void __glXDisp_ConvolutionParameterf(GLbyte * pc);

@@ -797,6 +799,8 @@ extern HIDDEN void __glXDisp_BindRenderbufferEXT(GLbyte * pc);
 extern HIDDEN void __glXDispSwap_BindRenderbufferEXT(GLbyte * pc);

 extern HIDDEN void __glXDisp_Vertex3sv(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_Vertex3sv(GLbyte * pc);

+extern HIDDEN int __glXDisp_SetClientInfoARB(struct __GLXclientStateRec *, GLbyte *);

+extern HIDDEN int __glXDispSwap_SetClientInfoARB(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN int __glXDisp_BindTexImageEXT(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN int __glXDispSwap_BindTexImageEXT(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN void __glXDisp_ProgramLocalParameter4fvARB(GLbyte * pc);

@@ -957,6 +961,8 @@ extern HIDDEN int __glXDisp_QueryContext(struct __GLXclientStateRec *, GLbyte *)
 extern HIDDEN int __glXDispSwap_QueryContext(struct __GLXclientStateRec *, GLbyte *);

 extern HIDDEN void __glXDisp_SecondaryColor3svEXT(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_SecondaryColor3svEXT(GLbyte * pc);

+extern HIDDEN void __glXDisp_MultiTexCoord3fvARB(GLbyte * pc);

+extern HIDDEN void __glXDispSwap_MultiTexCoord3fvARB(GLbyte * pc);

 extern HIDDEN void __glXDisp_IndexMask(GLbyte * pc);

 extern HIDDEN void __glXDispSwap_IndexMask(GLbyte * pc);

 extern HIDDEN void __glXDisp_BindProgramNV(GLbyte * pc);