From e4ef724e06621be9325fc41ed886fd404467fdc0 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 31 Oct 2013 08:40:01 +0100 Subject: fontconfig glproto libX11 mesa xserver xkeyboard-config git update 31 oct 2013 xserver commit 902ff0b3497d202b86bf9a411e17db7b694d6eaa xkeyboard-config commit 70bbf18d6cddb7271db1b2e042765ace3c4ac485 libX11 commit 6cb02b166361200da35ba14f52cd9aaa493eb0ea glproto commit aacc7a51b6161c765b04524e0d2ab31e5e586834 fontconfig commit 525a135ccf53e4bf3363c3143d9cfdf15fba55ab mesa commit b16b3c8703f198ca0f025b730d582600df79c19c --- xorg-server/glx/singlesize.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'xorg-server/glx/singlesize.c') diff --git a/xorg-server/glx/singlesize.c b/xorg-server/glx/singlesize.c index 777ebb35e..4c60b6920 100644 --- a/xorg-server/glx/singlesize.c +++ b/xorg-server/glx/singlesize.c @@ -36,10 +36,6 @@ #include "glxserver.h" #include "singlesize.h" #include "indirect_size_get.h" -#include "glapitable.h" -#include "glapi.h" -#include "glthread.h" -#include "dispatch.h" /* ** These routines compute the size of variable-size returned parameters. @@ -75,7 +71,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. */ @@ -99,7 +95,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 */ @@ -172,7 +168,7 @@ __glGetPixelMap_size(GLenum map) default: return -1; } - CALL_GetIntegerv(GET_DISPATCH(), (query, &size)); + glGetIntegerv(query, &size); return size; } -- cgit v1.2.3