Better ShmPutImage support in Xgl

4 files changed, 135 insertions, 1 deletions

diff --git a/hw/xgl/Makefile.am b/hw/xgl/Makefile.am
index 8ae1a47fd..f63e0cc3b 100644
--- a/hw/xgl/Makefile.am
+++ b/hw/xgl/Makefile.am
@@ -26,6 +26,7 @@ libxgl_a_SOURCES =     \
 	xglbstore.c    \
 	xglget.c       \
 	xglgc.c	       \
+	xglshm.c       \
 	xglcomp.c      \
 	xglpict.c      \
 	xglglyph.c     \
diff --git a/hw/xgl/xgl.h b/hw/xgl/xgl.h
index bf463bd48..6bbc7b975 100644
--- a/hw/xgl/xgl.h
+++ b/hw/xgl/xgl.h
@@ -1206,6 +1206,28 @@ xglPushPixels (GCPtr	   pGC,
 	       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 */
diff --git a/hw/xgl/xglscreen.c b/hw/xgl/xglscreen.c
index 7ce02c1b1..0ccd772ee 100644
--- a/hw/xgl/xglscreen.c
+++ b/hw/xgl/xglscreen.c
@@ -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 @@ xglScreenInit (ScreenPtr        pScreen,
 	return FALSE;
 
 #ifdef MITSHM
-    ShmRegisterFuncs (pScreen, NULL);
+    ShmRegisterFuncs (pScreen, &shmFuncs);
 #endif
 
 #ifdef RENDER
diff --git a/hw/xgl/xglshm.c b/hw/xgl/xglshm.c
new file mode 100644
index 000000000..574c1095a
--- /dev/null
+++ b/hw/xgl/xglshm.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2005 Novell, Inc.
+ * 
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Novell, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Novell, Inc. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, 
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, 
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: David Reveman <davidr@novell.com>
+ */
+
+#include "xgl.h"
+#include "gcstruct.h"
+
+#ifdef MITSHM
+
+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)
+{
+    ScreenPtr pScreen = pDrawable->pScreen;
+    PixmapPtr pPixmapHeader = NULL;
+    PixmapPtr pPixmap;
+
+    if ((format == ZPixmap) || (depth == 1))
+    {
+	pPixmap = pPixmapHeader =
+	    GetScratchPixmapHeader (pScreen, w, h, depth,
+				    BitsPerPixel (depth),
+				    PixmapBytePad (w, depth),
+				    (pointer) data);
+    }
+    else
+    {
+	pPixmap = (*pScreen->CreatePixmap) (pScreen, sw, sh, depth);
+	if (pPixmap)
+	{
+	    GCPtr pScratchGC;
+
+	    XGL_PIXMAP_PRIV (pPixmap);
+
+	    if (!xglAllocatePixmapBits (pPixmap))
+	    {
+		(*pScreen->DestroyPixmap) (pPixmap);
+		return;
+	    }
+	    pPixmapPriv->format = NULL;
+	    pPixmapPriv->target = xglPixmapTargetNo;
+	    
+	    pScratchGC = GetScratchGC (depth, pScreen);
+	    if (!pScratchGC)
+	    {
+		(*pScreen->DestroyPixmap) (pPixmap);
+		return;
+	    }
+	
+	    ValidateGC ((DrawablePtr) pPixmap, pScratchGC);
+	    (*pGC->ops->PutImage) ((DrawablePtr) pPixmap, pScratchGC, depth,
+				   -sx, -sy, w, h, 0,
+				   (format == XYPixmap) ? XYPixmap : ZPixmap,
+				   data);
+
+	    FreeScratchGC (pScratchGC);
+
+	    sx = sy = 0;
+	}
+    }
+    
+    if (!pPixmap)
+	return;
+
+    if (format == XYBitmap)
+	(*pGC->ops->CopyPlane) ((DrawablePtr) pPixmap, pDrawable, pGC,
+				sx, sy, sw, sh, dx, dy, 1L);
+    else
+	(*pGC->ops->CopyArea) ((DrawablePtr) pPixmap, pDrawable, pGC,
+			       sx, sy, sw, sh, dx, dy);
+
+    if (pPixmapHeader)
+	FreeScratchPixmapHeader (pPixmapHeader);
+    else
+	(*pScreen->DestroyPixmap) (pPixmap);
+}
+
+#endif