From 044155399477435a14c90420ab7c19d59cc3bddc Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 12 Nov 2013 11:23:32 +0100 Subject: Do not call gl functions directly --- xorg-server/glx/singlesize.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'xorg-server/glx/singlesize.c') diff --git a/xorg-server/glx/singlesize.c b/xorg-server/glx/singlesize.c index a93a0e5fe..48ebbec4a 100644 --- a/xorg-server/glx/singlesize.c +++ b/xorg-server/glx/singlesize.c @@ -33,10 +33,18 @@ #endif #include "glheader.h" -#include #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 /* ** These routines compute the size of variable-size returned parameters. @@ -72,7 +80,7 @@ __glGetMap_size(GLenum target, GLenum query) switch (query) { case GL_COEFF: k = __glMap1d_size(target); - glGetMapiv(target, GL_ORDER, &order); + CALL_GetMapiv(GET_DISPATCH(), (target, GL_ORDER, &order)); /* ** The query above might fail, but then order will be zero anyway. */ @@ -96,7 +104,7 @@ __glGetMap_size(GLenum target, GLenum query) case GL_COEFF: k = __glMap2d_size(target); majorMinor[0] = majorMinor[1] = 0; - glGetMapiv(target, GL_ORDER, majorMinor); + CALL_GetMapiv(GET_DISPATCH(), (target, GL_ORDER, majorMinor)); /* ** The query above might fail, but then majorMinor will be zeroes */ @@ -169,7 +177,7 @@ __glGetPixelMap_size(GLenum map) default: return -1; } - glGetIntegerv(query, &size); + CALL_GetIntegerv(GET_DISPATCH(), (query, &size)); return size; } -- cgit v1.2.3