xserver/hw/xgl xglglx.c,1.2,1.3

[David Reveman]

Committed by: davidr

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

Modified Files:
	xglglx.c 
Log Message:
Add scissor based clipping to Xgl GLX

Index: xglglx.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglglx.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xglglx.c	19 Apr 2005 14:51:29 -0000	1.2
+++ xglglx.c	25 Apr 2005 17:18:01 -0000	1.3
@@ -92,12 +92,38 @@
     ScreenPtr		pScreen;
     DrawablePtr		pDrawable;
     PixmapPtr		pPixmap;
-    GCPtr		pGC;
+    GCPtr		pGC, swapGC;
+    RegionRec		damage;
     void	        *private;
 } xglGLBufferRec, *xglGLBufferPtr;
 
 typedef int xglGLXVisualConfigRec, *xglGLXVisualConfigPtr;
 
[...1146 lines suppressed...]
@@ -1976,6 +2722,9 @@
 
     if (pBufferPriv->pGC)
 	FreeGC (pBufferPriv->pGC, (GContext) 0);
+
+    if (pBufferPriv->swapGC)
+	FreeGC (pBufferPriv->swapGC, (GContext) 0);
     
     xfree (pBufferPriv);
 }
@@ -2001,6 +2750,9 @@
     pBufferPriv->pDrawable = pDrawable;
     pBufferPriv->pPixmap = NULL;
     pBufferPriv->pGC = NULL;
+    pBufferPriv->swapGC = NULL;
+
+    REGION_INIT (pScreen, &pBufferPriv->damage, NullBox, 0);
     
     if (glxPriv->pGlxVisual->doubleBuffer)
 	pBufferPriv->pPixmap =