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

[David Reveman]

Committed by: davidr

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

Modified Files:
	xglglx.c 
Log Message:
Add glCopy operation and glPushAttrib/glPopAttrib support to Xgl GLX

Index: xglglx.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglglx.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- xglglx.c	25 Apr 2005 17:18:01 -0000	1.3
+++ xglglx.c	26 Apr 2005 11:04:23 -0000	1.4
@@ -103,12 +103,104 @@
 
 #define XGL_LIST_OP_CALLS 0
 #define XGL_LIST_OP_DRAW  1
-#define XGL_LIST_OP_LIST  2
+#define XGL_LIST_OP_COPY  2
+#define XGL_LIST_OP_LIST  3
+
+typedef struct _xglCopyOp {
+    void (*copyProc) (struct _xglCopyOp *pOp);
+    union {
+	struct {
[...1166 lines suppressed...]
 						pDrawable->depth);
@@ -2694,7 +3311,7 @@
 	    XGL_GET_PIXMAP_PRIV (pPixmap)->score = 4000;
 	    pBufferPriv->pPixmap = pPixmap;
 	}
-	ValidateGC (&pPixmap->drawable, pBufferPriv->swapGC);
+	ValidateGC (pDrawable, pBufferPriv->swapGC);
     }
     
     glPriv->private = pBufferPriv->private;
@@ -2743,9 +3360,6 @@
     if (!pBufferPriv)
 	FatalError ("No memory");
 
-    ErrorF ("[glx] createBuffer: %dx%d\n",
-	    pDrawable->width, pDrawable->height);
-    
     pBufferPriv->pScreen = pScreen;
     pBufferPriv->pDrawable = pDrawable;
     pBufferPriv->pPixmap = NULL;