Solved compile problems due to latest merge

1 files changed, 11 insertions, 15 deletions

diff --git a/xorg-server/glx/renderpixswap.c b/xorg-server/glx/renderpixswap.c
index e4da31f94..3fa11518a 100644
--- a/xorg-server/glx/renderpixswap.c
+++ b/xorg-server/glx/renderpixswap.c
@@ -36,10 +36,8 @@
 #include "glxserver.h"
 #include "unpack.h"
 #include "indirect_dispatch.h"
-#include "glapitable.h"
-#include "glapi.h"
-#include "glthread.h"
-#include "dispatch.h"
+
+#include "glfunctions.h"
 
 void
 __glXDispSwap_SeparableFilter2D(GLbyte * pc)
@@ -68,12 +66,12 @@ __glXDispSwap_SeparableFilter2D(GLbyte * pc)
      ** Just invert swapBytes flag; the GL will figure out if it needs to swap
      ** the pixel data.
      */
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, !hdr->swapBytes));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, hdr->lsbFirst));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH, hdr->rowLength));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, hdr->skipRows));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS, hdr->skipPixels));
-    CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ALIGNMENT, hdr->alignment));
+    glPixelStorei(GL_UNPACK_SWAP_BYTES, !hdr->swapBytes);
+    glPixelStorei(GL_UNPACK_LSB_FIRST, hdr->lsbFirst);
+    glPixelStorei(GL_UNPACK_ROW_LENGTH, hdr->rowLength);
+    glPixelStorei(GL_UNPACK_SKIP_ROWS, hdr->skipRows);
+    glPixelStorei(GL_UNPACK_SKIP_PIXELS, hdr->skipPixels);
+    glPixelStorei(GL_UNPACK_ALIGNMENT, hdr->alignment);
 
     /* XXX check this usage - internal code called
      ** a version without the packing parameters
@@ -83,10 +81,8 @@ __glXDispSwap_SeparableFilter2D(GLbyte * pc)
                                hdr->alignment);
     image1len = __GLX_PAD(image1len);
 
-    CALL_SeparableFilter2D(GET_DISPATCH(), (hdr->target, hdr->internalformat,
-                                            hdr->width, hdr->height,
-                                            hdr->format, hdr->type,
+    glSeparableFilter2D(hdr->target, hdr->internalformat, hdr->width,
+                        hdr->height, hdr->format, hdr->type,
                         ((GLubyte *) hdr + hdrlen),
-                                            ((GLubyte *) hdr + hdrlen +
-                                             image1len)));
+                        ((GLubyte *) hdr + hdrlen + image1len));
 }