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, 11 insertions, 19 deletions

diff --git a/xorg-server/glx/xfont.c b/xorg-server/glx/xfont.c
index 5a7a8bfcd..03ff6d0e8 100644
--- a/xorg-server/glx/xfont.c
+++ b/xorg-server/glx/xfont.c
@@ -36,10 +36,6 @@
 #include "glxserver.h"
 #include "glxutil.h"
 #include "unpack.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
 #include "indirect_dispatch.h"
 #include <GL/gl.h>
 #include <pixmapstr.h>
@@ -95,10 +91,8 @@ __glXMakeBitmapFromGlyph(FontPtr font, CharInfoPtr pci)
         pglyph -= widthPadded;
         p += widthPadded;
     }
-    CALL_Bitmap(GET_DISPATCH(), (w, h, -pci->metrics.leftSideBearing,
-                                 pci->metrics.descent,
-                                 pci->metrics.characterWidth, 0,
-                                 allocbuf ? allocbuf : buf));
+    glBitmap(w, h, -pci->metrics.leftSideBearing, pci->metrics.descent,
+             pci->metrics.characterWidth, 0, allocbuf ? allocbuf : buf);
 
     free(allocbuf);
     return Success;
@@ -119,13 +113,12 @@ MakeBitmapsFromFont(FontPtr pFont, int first, int count, int list_base)
     int rv;                     /* return value */
     int encoding = (FONTLASTROW(pFont) == 0) ? Linear16Bit : TwoD16Bit;
 
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, FALSE));
-    CALL_PixelStorei(GET_DISPATCH(),
-                     (GL_UNPACK_LSB_FIRST, BITMAP_BIT_ORDER == LSBFirst));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH, 0));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, 0));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS, 0));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ALIGNMENT, GLYPHPADBYTES));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, FALSE);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, BITMAP_BIT_ORDER == LSBFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, 0);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, 0);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, GLYPHPADBYTES);
     for (i = 0; i < count; i++) {
         chs[0] = (first + i) >> 8;      /* high byte is first byte */
         chs[1] = first + i;
@@ -136,14 +129,14 @@ MakeBitmapsFromFont(FontPtr pFont, int first, int count, int list_base)
         /*
          ** Define a display list containing just a glBitmap() call.
          */
-        CALL_NewList(GET_DISPATCH(), (list_base + i, GL_COMPILE));
+        glNewList(list_base + i, GL_COMPILE);
         if (nglyphs) {
             rv = __glXMakeBitmapFromGlyph(pFont, pci);
             if (rv) {
                 return rv;
             }
         }
-        CALL_EndList(GET_DISPATCH(), ());
+        glEndList();
     }
     return Success;
 }
@@ -168,8 +161,7 @@ __glXDisp_UseXFont(__GLXclientState * cl, GLbyte * pc)
         return error;
     }
 
-    CALL_GetIntegerv(GET_DISPATCH(),
-                     (GL_LIST_INDEX, (GLint *) &currentListIndex));
+    glGetIntegerv(GL_LIST_INDEX, (GLint *) &currentListIndex);
     if (currentListIndex != 0) {
         /*
          ** A display list is currently being made.  It is an error