aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/renderpix.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-08 11:47:30 +0100
committermarha <marha@users.sourceforge.net>2013-11-08 11:47:30 +0100
commitc8483dc2831dc37d93a36804022f6b064f5962ea (patch)
tree599f145a848e10b75a1a8c314ed9c51031446506 /xorg-server/glx/renderpix.c
parentc97d11aec40d8fa07d6b456bf8694133a77d35f4 (diff)
downloadvcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.tar.gz
vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.tar.bz2
vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.zip
Solved compilation and link problems after last merge
Diffstat (limited to 'xorg-server/glx/renderpix.c')
-rwxr-xr-x[-rw-r--r--]xorg-server/glx/renderpix.c24
1 files changed, 15 insertions, 9 deletions
diff --git a/xorg-server/glx/renderpix.c b/xorg-server/glx/renderpix.c
index ae8d299e8..26462f343 100644..100755
--- a/xorg-server/glx/renderpix.c
+++ b/xorg-server/glx/renderpix.c
@@ -36,6 +36,10 @@
#include "glxserver.h"
#include "unpack.h"
#include "indirect_dispatch.h"
+#include "glapitable.h"
+#include "glapi.h"
+#include "glthread.h"
+#include "dispatch.h"
void
__glXDisp_SeparableFilter2D(GLbyte * pc)
@@ -46,12 +50,12 @@ __glXDisp_SeparableFilter2D(GLbyte * pc)
hdrlen = __GLX_PAD(__GLX_CONV_FILT_CMD_DISPATCH_HDR_SIZE);
- 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);
+ 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));
/* XXX check this usage - internal code called
** a version without the packing parameters
@@ -61,8 +65,10 @@ __glXDisp_SeparableFilter2D(GLbyte * pc)
hdr->alignment);
image1len = __GLX_PAD(image1len);
- glSeparableFilter2D(hdr->target, hdr->internalformat, hdr->width,
- hdr->height, hdr->format, hdr->type,
+ CALL_SeparableFilter2D(GET_DISPATCH(), (hdr->target, hdr->internalformat,
+ hdr->width, hdr->height,
+ hdr->format, hdr->type,
((GLubyte *) hdr + hdrlen),
- ((GLubyte *) hdr + hdrlen + image1len));
+ ((GLubyte *) hdr + hdrlen +
+ image1len)));
}