xserver/hw/xgl xglglx.c,1.10,1.11

[Dave Airlie]

Committed by: airlied

Update of /cvs/xserver/xserver/hw/xgl
In directory gabe:/tmp/cvs-serv9410/hw/xgl

Modified Files:
	xglglx.c 
Log Message:
fix glx up for newest glitz interface


Index: xglglx.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglglx.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- xglglx.c	1 Jul 2005 03:14:54 -0000	1.10
+++ xglglx.c	23 Dec 2005 01:13:28 -0000	1.11
@@ -3671,9 +3671,10 @@
 static void
 xglSetCurrentContext (xglGLContextPtr pContext)
 {
+    XGL_SCREEN_PRIV (pContext->pDrawBuffer->pGC->pScreen);
     cctx = pContext;
 
-    glitz_context_make_current (cctx->context);
+    glitz_context_make_current (cctx->context, pScreenPriv->drawable);
 
     __glRenderTable = &__glNativeRenderTable;
     __glRenderTableEXT = &cctx->glRenderTableEXT;
@@ -4759,8 +4760,7 @@
 
 	glitz_surface_attach (pScreenPriv->backSurface,
 			      pScreenPriv->drawable,
-			      GLITZ_DRAWABLE_BUFFER_BACK_COLOR,
-			      0, 0);
+			      GLITZ_DRAWABLE_BUFFER_BACK_COLOR);
 
 	numConfig *= 2;
     }