xserver/hw/xgl Makefile.am, 1.3, 1.4 xgl.h, 1.8, 1.9 xglscreen.c, 1.4, 1.5 xglshm.c, NONE, 1.1

[David Reveman]

Committed by: davidr

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

Modified Files:
	Makefile.am xgl.h xglscreen.c 
Added Files:
	xglshm.c 
Log Message:
Better ShmPutImage support in Xgl

Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	26 Jan 2005 10:58:52 -0000	1.3
+++ Makefile.am	8 Mar 2005 09:12:17 -0000	1.4
@@ -26,6 +26,7 @@
 	xglbstore.c    \
 	xglget.c       \
 	xglgc.c	       \
+	xglshm.c       \
 	xglcomp.c      \
 	xglpict.c      \
 	xglglyph.c     \

Index: xgl.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xgl.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- xgl.h	1 Mar 2005 16:34:31 -0000	1.8
+++ xgl.h	8 Mar 2005 09:12:17 -0000	1.9
@@ -1206,6 +1206,28 @@
 	       int	   y);
 
 
+#ifdef MITSHM
+
+/* xglshm.c */
+
+void
+xglShmPutImage (DrawablePtr  pDrawable,
+		GCPtr	     pGC,
+		int	     depth,
+		unsigned int format,
+		int	     w,
+		int	     h,
+		int	     sx,
+		int	     sy,
+		int	     sw,
+		int	     sh,
+		int	     dx,
+		int	     dy,
+		char	     *data);
+
+#endif
+
+
 #ifdef RENDER
 
 /* xglcomp.c */

Index: xglscreen.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglscreen.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xglscreen.c	26 Jan 2005 10:58:52 -0000	1.4
+++ xglscreen.c	8 Mar 2005 09:12:17 -0000	1.5
@@ -30,6 +30,7 @@
 #include "fb.h"
 #ifdef MITSHM
 #include "shmint.h"
+static ShmFuncs shmFuncs = { NULL, xglShmPutImage };
 #endif
 #ifdef RENDER
 #include "glyphstr.h"
@@ -201,7 +202,7 @@
 	return FALSE;
 
 #ifdef MITSHM
-    ShmRegisterFuncs (pScreen, NULL);
+    ShmRegisterFuncs (pScreen, &shmFuncs);
 #endif
 
 #ifdef RENDER

--- NEW FILE: xglshm.c ---
(This appears to be a binary file; contents omitted.)