Merge branch 'xa_branch'

[mesa.git] / src / glx / xfont.c

diff --git a/src/glx/xfont.c b/src/glx/xfont.c
index 797fd7a49004fff157968740d7b5ad1f6415e4ac..4ca2c8f868f4afe43ee84d2fd055c9105bbffc2d 100644 (file)
--- 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(struct glx_context *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;