xserver/hw/xgl xgl.h, 1.4, 1.5 xglpixmap.c, 1.4, 1.5 xglscreen.c, 1.2, 1.3

[David Reveman]

Committed by: davidr

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

Modified Files:
	xgl.h xglpixmap.c xglscreen.c 
Log Message:
Add xglPixmapToRegion

Index: xgl.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xgl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xgl.h	5 Nov 2004 13:26:06 -0000	1.4
+++ xgl.h	14 Nov 2004 23:21:29 -0000	1.5
@@ -129,6 +129,7 @@
     CreateGCProcPtr		  CreateGC;
     CloseScreenProcPtr		  CloseScreen;
     SetWindowPixmapProcPtr	  SetWindowPixmap;
+    BitmapToRegionProcPtr	  BitmapToRegion;
 
 #ifdef RENDER
     CompositeProcPtr		  Composite;
@@ -615,6 +616,9 @@
 		       int	 devKind,
 		       pointer	 pPixData);
 
+RegionPtr
+xglPixmapToRegion (PixmapPtr pPixmap);
+
 Bool
 xglCreatePixmapSurface (PixmapPtr pPixmap);
 

Index: xglpixmap.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglpixmap.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- xglpixmap.c	5 Nov 2004 13:26:06 -0000	1.4
+++ xglpixmap.c	14 Nov 2004 23:21:29 -0000	1.5
@@ -356,6 +356,24 @@
     return TRUE;
 }
 
+RegionPtr
+xglPixmapToRegion (PixmapPtr pPixmap)
+{
+    ScreenPtr pScreen = pPixmap->drawable.pScreen;
+    RegionPtr pRegion;
+    
+    XGL_SCREEN_PRIV (pScreen);
+    
+    if (!xglSyncBits (&pPixmap->drawable, NullBox))
+	FatalError (XGL_SW_FAILURE_STRING);
+    
+    XGL_SCREEN_UNWRAP (BitmapToRegion);
+    pRegion = (*pScreen->BitmapToRegion) (pPixmap);
+    XGL_SCREEN_WRAP (BitmapToRegion, xglPixmapToRegion);
+
+    return pRegion;
+}
+
 Bool
 xglCreatePixmapSurface (PixmapPtr pPixmap)
 {

Index: xglscreen.c
===================================================================
RCS file: /cvs/xserver/xserver/hw/xgl/xglscreen.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- xglscreen.c	5 Nov 2004 13:26:06 -0000	1.2
+++ xglscreen.c	14 Nov 2004 23:21:29 -0000	1.3
@@ -56,7 +56,6 @@
 #define xglListInstalledColormaps (void *) NoopDDA
 #define xglStoreColors		  (void *) NoopDDA
 #define xglResolveColor		  (void *) NoopDDA
-#define xglBitmapToRegion	  (void *) NoopDDA
 
 static PixmapPtr
 xglGetWindowPixmap (WindowPtr pWin)
@@ -226,11 +225,9 @@
       pScreen->ResolveColor	      = miResolveColor;
     */
     
-    /*
-      pScreen->BitmapToRegion = xglBitmapToRegion;
-    */
-
     pScreen->ModifyPixmapHeader = xglModifyPixmapHeader;
+    
+    XGL_SCREEN_WRAP (BitmapToRegion, xglPixmapToRegion);
 
     pScreen->GetWindowPixmap = xglGetWindowPixmap;