Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013

Conflicts:
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.c
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdri.c
	xorg-server/glx/glxext.c
	xorg-server/glx/glxext.h
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_reqsize.c
	xorg-server/glx/indirect_reqsize.h
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.c
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_texture_compression.c
	xorg-server/glx/render2.c
	xorg-server/glx/render2swap.c

1 files changed, 32 insertions, 56 deletions

diff --git a/xorg-server/glx/singlepixswap.c b/xorg-server/glx/singlepixswap.c
index 7e20ed6bb..064f5cce2 100644
--- a/xorg-server/glx/singlepixswap.c
+++ b/xorg-server/glx/singlepixswap.c
@@ -39,10 +39,6 @@
 #include "unpack.h"
 #include "indirect_dispatch.h"
 #include "indirect_size_get.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 
 int
 __glXDispSwap_ReadPixels(__GLXclientState * cl, GLbyte * pc)
@@ -82,17 +78,13 @@ __glXDispSwap_ReadPixels(__GLXclientState * cl, GLbyte * pc)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_LSB_FIRST, lsbFirst));
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
+    glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_ReadPixels(GET_DISPATCH(),
-                    (*(GLint *) (pc + 0),
-                     *(GLint *) (pc + 4),
-                     *(GLsizei *) (pc + 8),
-                     *(GLsizei *) (pc + 12),
-                     *(GLenum *) (pc + 16), *(GLenum *) (pc + 20), answer)
-        );
+    glReadPixels(*(GLint *) (pc + 0), *(GLint *) (pc + 4),
+                 *(GLsizei *) (pc + 8), *(GLsizei *) (pc + 12),
+                 *(GLenum *) (pc + 16), *(GLenum *) (pc + 20), answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -141,13 +133,10 @@ __glXDispSwap_GetTexImage(__GLXclientState * cl, GLbyte * pc)
     target = *(GLenum *) (pc + 0);
     swapBytes = *(GLboolean *) (pc + 16);
 
-    CALL_GetTexLevelParameteriv(GET_DISPATCH(),
-                                (target, level, GL_TEXTURE_WIDTH, &width));
-    CALL_GetTexLevelParameteriv(GET_DISPATCH(),
-                                (target, level, GL_TEXTURE_HEIGHT, &height));
+    glGetTexLevelParameteriv(target, level, GL_TEXTURE_WIDTH, &width);
+    glGetTexLevelParameteriv(target, level, GL_TEXTURE_HEIGHT, &height);
     if (target == GL_TEXTURE_3D) {
-        CALL_GetTexLevelParameteriv(GET_DISPATCH(),
-                                    (target, level, GL_TEXTURE_DEPTH, &depth));
+        glGetTexLevelParameteriv(target, level, GL_TEXTURE_DEPTH, &depth);
     }
     /*
      * The three queries above might fail if we're in a state where queries
@@ -158,13 +147,11 @@ __glXDispSwap_GetTexImage(__GLXclientState * cl, GLbyte * pc)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetTexImage(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                      *(GLint *) (pc + 4),
-                                      *(GLenum *) (pc + 8),
-                                      *(GLenum *) (pc + 12), answer));
+    glGetTexImage(*(GLenum *) (pc + 0), *(GLint *) (pc + 4),
+                  *(GLenum *) (pc + 8), *(GLenum *) (pc + 12), answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -206,11 +193,11 @@ __glXDispSwap_GetPolygonStipple(__GLXclientState * cl, GLbyte * pc)
     pc += __GLX_SINGLE_HDR_SIZE;
     lsbFirst = *(GLboolean *) (pc + 0);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_LSB_FIRST, lsbFirst));
+    glPixelStorei(GL_PACK_LSB_FIRST, lsbFirst);
     __GLX_GET_ANSWER_BUFFER(answer, cl, 128, 1);
 
     __glXClearErrorOccured();
-    CALL_GetPolygonStipple(GET_DISPATCH(), ((GLubyte *) answer));
+    glGetPolygonStipple((GLubyte *) answer);
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
         __GLX_SWAP_REPLY_HEADER();
@@ -256,10 +243,8 @@ GetSeparableFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     /* target must be SEPARABLE_2D, however I guess we can let the GL
        barf on this one.... */
 
-    CALL_GetConvolutionParameteriv(GET_DISPATCH(),
-                                   (target, GL_CONVOLUTION_WIDTH, &width));
-    CALL_GetConvolutionParameteriv(GET_DISPATCH(),
-                                   (target, GL_CONVOLUTION_HEIGHT, &height));
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_WIDTH, &width);
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_HEIGHT, &height);
     /*
      * The two queries above might fail if we're in a state where queries
      * are illegal, but then width and height would still be zero anyway.
@@ -274,13 +259,11 @@ GetSeparableFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     compsize = __GLX_PAD(compsize);
     compsize2 = __GLX_PAD(compsize2);
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize + compsize2, 1);
     __glXClearErrorOccured();
-    CALL_GetSeparableFilter(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                             *(GLenum *) (pc + 4),
-                                             *(GLenum *) (pc + 8),
-                                             answer, answer + compsize, NULL));
+    glGetSeparableFilter(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4),
+                         *(GLenum *) (pc + 8), answer, answer + compsize, NULL);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -343,15 +326,12 @@ GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     target = *(GLenum *) (pc + 0);
     swapBytes = *(GLboolean *) (pc + 12);
 
-    CALL_GetConvolutionParameteriv(GET_DISPATCH(),
-                                   (target, GL_CONVOLUTION_WIDTH, &width));
+    glGetConvolutionParameteriv(target, GL_CONVOLUTION_WIDTH, &width);
     if (target == GL_CONVOLUTION_2D) {
         height = 1;
     }
     else {
-        CALL_GetConvolutionParameteriv(GET_DISPATCH(),
-                                       (target, GL_CONVOLUTION_HEIGHT,
-                                        &height));
+        glGetConvolutionParameteriv(target, GL_CONVOLUTION_HEIGHT, &height);
     }
     /*
      * The two queries above might fail if we're in a state where queries
@@ -361,12 +341,11 @@ GetConvolutionFilter(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetConvolutionFilter(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                               *(GLenum *) (pc + 4),
-                                               *(GLenum *) (pc + 8), answer));
+    glGetConvolutionFilter(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4),
+                           *(GLenum *) (pc + 8), answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -430,8 +409,7 @@ GetHistogram(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     swapBytes = *(GLboolean *) (pc + 12);
     reset = *(GLboolean *) (pc + 13);
 
-    CALL_GetHistogramParameteriv(GET_DISPATCH(),
-                                 (target, GL_HISTOGRAM_WIDTH, &width));
+    glGetHistogramParameteriv(target, GL_HISTOGRAM_WIDTH, &width);
     /*
      * The one query above might fail if we're in a state where queries
      * are illegal, but then width would still be zero anyway.
@@ -440,10 +418,10 @@ GetHistogram(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetHistogram(GET_DISPATCH(), (target, reset, format, type, answer));
+    glGetHistogram(target, reset, format, type, answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -508,10 +486,10 @@ GetMinmax(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetMinmax(GET_DISPATCH(), (target, reset, format, type, answer));
+    glGetMinmax(target, reset, format, type, answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);
@@ -570,8 +548,7 @@ GetColorTable(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     target = *(GLenum *) (pc + 0);
     swapBytes = *(GLboolean *) (pc + 12);
 
-    CALL_GetColorTableParameteriv(GET_DISPATCH(),
-                                  (target, GL_COLOR_TABLE_WIDTH, &width));
+    glGetColorTableParameteriv(target, GL_COLOR_TABLE_WIDTH, &width);
     /*
      * The one query above might fail if we're in a state where queries
      * are illegal, but then width would still be zero anyway.
@@ -580,12 +557,11 @@ GetColorTable(__GLXclientState * cl, GLbyte * pc, GLXContextTag tag)
     if (compsize < 0)
         compsize = 0;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_PACK_SWAP_BYTES, !swapBytes));
+    glPixelStorei(GL_PACK_SWAP_BYTES, !swapBytes);
     __GLX_GET_ANSWER_BUFFER(answer, cl, compsize, 1);
     __glXClearErrorOccured();
-    CALL_GetColorTable(GET_DISPATCH(), (*(GLenum *) (pc + 0),
-                                        *(GLenum *) (pc + 4),
-                                        *(GLenum *) (pc + 8), answer));
+    glGetColorTable(*(GLenum *) (pc + 0), *(GLenum *) (pc + 4),
+                    *(GLenum *) (pc + 8), answer);
 
     if (__glXErrorOccured()) {
         __GLX_BEGIN_REPLY(0);