From 7b7845a076c933e096ac511b4184141ba194449a Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@bitplanet.net>
Date: Thu, 22 Jul 2010 22:24:00 -0400
Subject: glx: Move WaitGL, WaitX, UseXFont to context vtable functions

---
 src/glx/xfont.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/glx/xfont.c')

diff --git a/src/glx/xfont.c b/src/glx/xfont.c
index 797fd7a490..db3a570110 100644
--- a/src/glx/xfont.c
+++ b/src/glx/xfont.c
@@ -212,9 +212,8 @@ isvalid(XFontStruct * fs, int which)
 }
 
 _X_HIDDEN void
-DRI_glXUseXFont(Font font, int first, int count, int listbase)
+DRI_glXUseXFont(GLXContext CC, Font font, int first, int count, int listbase)
 {
-   GLXContext CC;
    Display *dpy;
    Window win;
    Pixmap pixmap;
@@ -231,7 +230,6 @@ DRI_glXUseXFont(Font font, int first, int count, int listbase)
 
    int i;
 
-   CC = __glXGetCurrentContext();
    dpy = CC->currentDpy;
    win = CC->currentDrawable;
 
-- 
cgit v1.2.3