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/render2.c | 69 ++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 40 deletions(-) (limited to 'xorg-server/glx/render2.c') diff --git a/xorg-server/glx/render2.c b/xorg-server/glx/render2.c index 8cf74a691..5a2f4827e 100644 --- a/xorg-server/glx/render2.c +++ b/xorg-server/glx/render2.c @@ -36,10 +36,6 @@ #include "unpack.h" #include "indirect_size.h" #include "indirect_dispatch.h" -#include "glapitable.h" -#include "glapi.h" -#include "glthread.h" -#include "dispatch.h" void __glXDisp_Map1f(GLbyte * pc) @@ -55,7 +51,7 @@ __glXDisp_Map1f(GLbyte * pc) points = (GLfloat *) (pc + 16); k = __glMap1f_size(target); - CALL_Map1f(GET_DISPATCH(), (target, u1, u2, k, order, points)); + glMap1f(target, u1, u2, k, order, points); } void @@ -78,9 +74,7 @@ __glXDisp_Map2f(GLbyte * pc) ustride = vorder * k; vstride = k; - CALL_Map2f(GET_DISPATCH(), - (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, - points)); + glMap2f(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points); } void @@ -126,7 +120,7 @@ __glXDisp_Map1d(GLbyte * pc) #else points = (GLdouble *) pc; #endif - CALL_Map1d(GET_DISPATCH(), (target, u1, u2, k, order, points)); + glMap1d(target, u1, u2, k, order, points); } void @@ -178,9 +172,7 @@ __glXDisp_Map2d(GLbyte * pc) #else points = (GLdouble *) pc; #endif - CALL_Map2d(GET_DISPATCH(), - (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, - points)); + glMap2d(target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points); } void @@ -215,39 +207,36 @@ __glXDisp_DrawArrays(GLbyte * pc) switch (component) { case GL_VERTEX_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_VERTEX_ARRAY)); - CALL_VertexPointer(GET_DISPATCH(), (numVals, datatype, stride, pc)); + glEnableClientState(GL_VERTEX_ARRAY); + glVertexPointer(numVals, datatype, stride, pc); break; case GL_NORMAL_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_NORMAL_ARRAY)); - CALL_NormalPointer(GET_DISPATCH(), (datatype, stride, pc)); + glEnableClientState(GL_NORMAL_ARRAY); + glNormalPointer(datatype, stride, pc); break; case GL_COLOR_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_COLOR_ARRAY)); - CALL_ColorPointer(GET_DISPATCH(), (numVals, datatype, stride, pc)); + glEnableClientState(GL_COLOR_ARRAY); + glColorPointer(numVals, datatype, stride, pc); break; case GL_INDEX_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_INDEX_ARRAY)); - CALL_IndexPointer(GET_DISPATCH(), (datatype, stride, pc)); + glEnableClientState(GL_INDEX_ARRAY); + glIndexPointer(datatype, stride, pc); break; case GL_TEXTURE_COORD_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_TEXTURE_COORD_ARRAY)); - CALL_TexCoordPointer(GET_DISPATCH(), - (numVals, datatype, stride, pc)); + glEnableClientState(GL_TEXTURE_COORD_ARRAY); + glTexCoordPointer(numVals, datatype, stride, pc); break; case GL_EDGE_FLAG_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_EDGE_FLAG_ARRAY)); - CALL_EdgeFlagPointer(GET_DISPATCH(), - (stride, (const GLboolean *) pc)); + glEnableClientState(GL_EDGE_FLAG_ARRAY); + glEdgeFlagPointer(stride, (const GLboolean *) pc); break; case GL_SECONDARY_COLOR_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY)); - CALL_SecondaryColorPointerEXT(GET_DISPATCH(), - (numVals, datatype, stride, pc)); + glEnableClientState(GL_SECONDARY_COLOR_ARRAY); + glSecondaryColorPointerEXT(numVals, datatype, stride, pc); break; case GL_FOG_COORD_ARRAY: - CALL_EnableClientState(GET_DISPATCH(), (GL_FOG_COORD_ARRAY)); - CALL_FogCoordPointerEXT(GET_DISPATCH(), (datatype, stride, pc)); + glEnableClientState(GL_FOG_COORD_ARRAY); + glFogCoordPointerEXT(datatype, stride, pc); break; default: break; @@ -256,15 +245,15 @@ __glXDisp_DrawArrays(GLbyte * pc) pc += __GLX_PAD(numVals * __glXTypeSize(datatype)); } - CALL_DrawArrays(GET_DISPATCH(), (primType, 0, numVertexes)); + glDrawArrays(primType, 0, numVertexes); /* turn off anything we might have turned on */ - CALL_DisableClientState(GET_DISPATCH(), (GL_VERTEX_ARRAY)); - CALL_DisableClientState(GET_DISPATCH(), (GL_NORMAL_ARRAY)); - CALL_DisableClientState(GET_DISPATCH(), (GL_COLOR_ARRAY)); - CALL_DisableClientState(GET_DISPATCH(), (GL_INDEX_ARRAY)); - CALL_DisableClientState(GET_DISPATCH(), (GL_TEXTURE_COORD_ARRAY)); - CALL_DisableClientState(GET_DISPATCH(), (GL_EDGE_FLAG_ARRAY)); - CALL_DisableClientState(GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY)); - CALL_DisableClientState(GET_DISPATCH(), (GL_FOG_COORD_ARRAY)); + glDisableClientState(GL_VERTEX_ARRAY); + glDisableClientState(GL_NORMAL_ARRAY); + glDisableClientState(GL_COLOR_ARRAY); + glDisableClientState(GL_INDEX_ARRAY); + glDisableClientState(GL_TEXTURE_COORD_ARRAY); + glDisableClientState(GL_EDGE_FLAG_ARRAY); + glDisableClientState(GL_SECONDARY_COLOR_ARRAY); + glDisableClientState(GL_FOG_COORD_ARRAY); } -- cgit v1.2.3