Synchronised mesa files

1 files changed, 22 insertions, 22 deletions

diff --git a/xorg-server/glx/indirect_reqsize.c b/xorg-server/glx/indirect_reqsize.c
index 691055186..a87f7d230 100644
--- a/xorg-server/glx/indirect_reqsize.c
+++ b/xorg-server/glx/indirect_reqsize.c
@@ -623,7 +623,7 @@ GLenum type        = * (GLenum *)(pc + 80);
 }
 
 int
-__glXCompressedTexImage1DARBReqSize( const GLbyte * pc, Bool swap )
+__glXCompressedTexImage1DReqSize( const GLbyte * pc, Bool swap )
 {
 GLsizei imageSize  = *(GLsizei *)(pc + 20);
 
@@ -635,7 +635,7 @@ GLsizei imageSize  = *(GLsizei *)(pc + 20);
 }
 
 int
-__glXCompressedTexImage2DARBReqSize( const GLbyte * pc, Bool swap )
+__glXCompressedTexImage2DReqSize( const GLbyte * pc, Bool swap )
 {
 GLsizei imageSize  = *(GLsizei *)(pc + 24);
 
@@ -647,7 +647,7 @@ GLsizei imageSize  = *(GLsizei *)(pc + 24);
 }
 
 int
-__glXCompressedTexImage3DARBReqSize( const GLbyte * pc, Bool swap )
+__glXCompressedTexImage3DReqSize( const GLbyte * pc, Bool swap )
 {
 GLsizei imageSize  = *(GLsizei *)(pc + 28);
 
@@ -659,7 +659,7 @@ GLsizei imageSize  = *(GLsizei *)(pc + 28);
 }
 
 int
-__glXCompressedTexSubImage3DARBReqSize( const GLbyte * pc, Bool swap )
+__glXCompressedTexSubImage3DReqSize( const GLbyte * pc, Bool swap )
 {
 GLsizei imageSize  = *(GLsizei *)(pc + 36);
 
@@ -671,19 +671,21 @@ GLsizei imageSize  = *(GLsizei *)(pc + 36);
 }
 
 int
-__glXProgramStringARBReqSize( const GLbyte * pc, Bool swap )
+__glXPointParameterfvReqSize( const GLbyte * pc, Bool swap )
 {
-GLsizei len        = *(GLsizei *)(pc + 8);
+GLenum pname       = * (GLenum *)(pc + 0);
+    GLsizei compsize;
 
     if (swap) {
-        len = bswap_32(len);
+        pname = bswap_32(pname);
     }
 
-    return __GLX_PAD(len);
+    compsize = __glPointParameterfv_size(pname);
+    return __GLX_PAD((compsize * 4));
 }
 
 int
-__glXDrawBuffersARBReqSize( const GLbyte * pc, Bool swap )
+__glXDrawBuffersReqSize( const GLbyte * pc, Bool swap )
 {
 GLsizei n          = *(GLsizei *)(pc + 0);
 
@@ -695,17 +697,15 @@ GLsizei n          = *(GLsizei *)(pc + 0);
 }
 
 int
-__glXPointParameterfvEXTReqSize( const GLbyte * pc, Bool swap )
+__glXProgramStringARBReqSize( const GLbyte * pc, Bool swap )
 {
-GLenum pname       = * (GLenum *)(pc + 0);
-    GLsizei compsize;
+GLsizei len        = *(GLsizei *)(pc + 8);
 
     if (swap) {
-        pname = bswap_32(pname);
+        len = bswap_32(len);
     }
 
-    compsize = __glPointParameterfvEXT_size(pname);
-    return __GLX_PAD((compsize * 4));
+    return __GLX_PAD(len);
 }
 
 int
@@ -826,10 +826,13 @@ ALIAS( TexGeniv, TexGenfv )
 ALIAS( PixelMapuiv, PixelMapfv )
 ALIAS( ColorTableParameteriv, ColorTableParameterfv )
 ALIAS( ConvolutionParameteriv, ConvolutionParameterfv )
-ALIAS( CompressedTexSubImage1DARB, CompressedTexImage1DARB )
-ALIAS( CompressedTexSubImage2DARB, CompressedTexImage3DARB )
+ALIAS( CompressedTexSubImage1D, CompressedTexImage1D )
+ALIAS( CompressedTexSubImage2D, CompressedTexImage3D )
+ALIAS( PointParameteriv, PointParameterfv )
+ALIAS( DeleteFramebuffers, DrawBuffers )
+ALIAS( DeleteRenderbuffers, DrawBuffers )
 ALIAS( LoadProgramNV, ProgramStringARB )
-ALIAS( RequestResidentProgramsNV, DrawBuffersARB )
+ALIAS( RequestResidentProgramsNV, DrawBuffers )
 ALIAS( VertexAttribs1fvNV, PixelMapfv )
 ALIAS( VertexAttribs1svNV, PixelMapusv )
 ALIAS( VertexAttribs2fvNV, VertexAttribs1dvNV )
@@ -837,7 +840,4 @@ ALIAS( VertexAttribs2svNV, PixelMapfv )
 ALIAS( VertexAttribs4fvNV, VertexAttribs2dvNV )
 ALIAS( VertexAttribs4svNV, VertexAttribs1dvNV )
 ALIAS( VertexAttribs4ubvNV, PixelMapfv )
-ALIAS( PointParameterivNV, PointParameterfvEXT )
-ALIAS( ProgramNamedParameter4dvNV, CompressedTexSubImage3DARB )
-ALIAS( DeleteFramebuffersEXT, DrawBuffersARB )
-ALIAS( DeleteRenderbuffersEXT, DrawBuffersARB )
+ALIAS( ProgramNamedParameter4dvNV, CompressedTexSubImage3D )