diff options
Diffstat (limited to 'xorg-server/glx/xfont.c')
| -rw-r--r-- | xorg-server/glx/xfont.c | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/xorg-server/glx/xfont.c b/xorg-server/glx/xfont.c index 83a455d73..d01555fc3 100644 --- a/xorg-server/glx/xfont.c +++ b/xorg-server/glx/xfont.c @@ -31,11 +31,21 @@ #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #endif +#include "glheader.h" #include "glxserver.h" -#include "glxutil.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 "glxutil.h" + #include <GL/gl.h> #include <pixmapstr.h> #include <windowstr.h> @@ -90,8 +100,8 @@ __glXMakeBitmapFromGlyph(FontPtr font, CharInfoPtr pci) pglyph -= widthPadded; p += widthPadded; } - glBitmap(w, h, -pci->metrics.leftSideBearing, pci->metrics.descent, - pci->metrics.characterWidth, 0, allocbuf ? allocbuf : buf); + CALL_Bitmap(GET_DISPATCH(), (w, h, -pci->metrics.leftSideBearing, pci->metrics.descent, + pci->metrics.characterWidth, 0, allocbuf ? allocbuf : buf)); free(allocbuf); return Success; @@ -112,12 +122,12 @@ MakeBitmapsFromFont(FontPtr pFont, int first, int count, int list_base) int rv; /* return value */ int encoding = (FONTLASTROW(pFont) == 0) ? Linear16Bit : TwoD16Bit; - glPixelStorei(GL_UNPACK_SWAP_BYTES, FALSE); - glPixelStorei(GL_UNPACK_LSB_FIRST, BITMAP_BIT_ORDER == LSBFirst); - glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); - glPixelStorei(GL_UNPACK_SKIP_ROWS, 0); - glPixelStorei(GL_UNPACK_SKIP_PIXELS, 0); - glPixelStorei(GL_UNPACK_ALIGNMENT, GLYPHPADBYTES); + CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SWAP_BYTES, FALSE)); + CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_LSB_FIRST, BITMAP_BIT_ORDER == LSBFirst)); + CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ROW_LENGTH, 0)); + CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_ROWS, 0)); + CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_SKIP_PIXELS, 0)); + CALL_PixelStorei(GET_DISPATCH(), (GL_UNPACK_ALIGNMENT, GLYPHPADBYTES)); for (i = 0; i < count; i++) { chs[0] = (first + i) >> 8; /* high byte is first byte */ chs[1] = first + i; @@ -128,14 +138,14 @@ MakeBitmapsFromFont(FontPtr pFont, int first, int count, int list_base) /* ** Define a display list containing just a glBitmap() call. */ - glNewList(list_base + i, GL_COMPILE); + CALL_NewList(GET_DISPATCH(), (list_base + i, GL_COMPILE)); if (nglyphs) { rv = __glXMakeBitmapFromGlyph(pFont, pci); if (rv) { return rv; } } - glEndList(); + CALL_EndList(GET_DISPATCH(), ()); } return Success; } @@ -160,7 +170,7 @@ __glXDisp_UseXFont(__GLXclientState * cl, GLbyte * pc) return error; } - glGetIntegerv(GL_LIST_INDEX, (GLint *) ¤tListIndex); + CALL_GetIntegerv(GET_DISPATCH(), (GL_LIST_INDEX, (GLint *) ¤tListIndex)); if (currentListIndex != 0) { /* ** A display list is currently being made. It is an error |