diff options
author | marha <marha@users.sourceforge.net> | 2013-12-22 22:04:41 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-12-22 22:06:29 +0100 |
commit | 66215bff25b8961e396ea4a3b1847ac668de3ff4 (patch) | |
tree | 64e98f6dabdd61a56aa92264176c07d1aa0807df /xorg-server/glx/singlesize.c | |
parent | 1d03b6f684ab1ea6772f00058605a9ebb2910628 (diff) | |
download | vcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.tar.gz vcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.tar.bz2 vcxsrv-66215bff25b8961e396ea4a3b1847ac668de3ff4.zip |
Solved compile problems due to latest merge
Diffstat (limited to 'xorg-server/glx/singlesize.c')
-rw-r--r-- | xorg-server/glx/singlesize.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/xorg-server/glx/singlesize.c b/xorg-server/glx/singlesize.c index 48ebbec4a..3c4c6fadc 100644 --- a/xorg-server/glx/singlesize.c +++ b/xorg-server/glx/singlesize.c @@ -33,18 +33,12 @@ #endif #include "glheader.h" +#include <GL/gl.h> #include "glxserver.h" -#include "glxext.h" #include "singlesize.h" -#include "unpack.h" -#include "indirect_dispatch.h" #include "indirect_size_get.h" -#include "glapitable.h" -#include "glapi.h" -#include "glthread.h" -#include "dispatch.h" -#include <GL/gl.h> +#include "glfunctions.h" /* ** These routines compute the size of variable-size returned parameters. @@ -80,7 +74,7 @@ __glGetMap_size(GLenum target, GLenum query) switch (query) { case GL_COEFF: k = __glMap1d_size(target); - CALL_GetMapiv(GET_DISPATCH(), (target, GL_ORDER, &order)); + glGetMapiv(target, GL_ORDER, &order); /* ** The query above might fail, but then order will be zero anyway. */ @@ -104,7 +98,7 @@ __glGetMap_size(GLenum target, GLenum query) case GL_COEFF: k = __glMap2d_size(target); majorMinor[0] = majorMinor[1] = 0; - CALL_GetMapiv(GET_DISPATCH(), (target, GL_ORDER, majorMinor)); + glGetMapiv(target, GL_ORDER, majorMinor); /* ** The query above might fail, but then majorMinor will be zeroes */ @@ -177,7 +171,7 @@ __glGetPixelMap_size(GLenum map) default: return -1; } - CALL_GetIntegerv(GET_DISPATCH(), (query, &size)); + glGetIntegerv(query, &size); return size; } |