[xserver-commit] xserver/include picturestr.h,1.24,1.25

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/include
In directory pdx:/tmp/cvs-serv14580/include

Modified Files:
	picturestr.h 
Log Message:
	* include/picturestr.h:
	* render/picture.c: (PictureCreateDefaultFormats),
	(PictureFindVisual), (PictureInitIndexedFormats),
	(PictureMatchVisual), (PictureInit):
	Switch from having a VisualPtr in an indexed picture format
	to a Visual ID.  Necessary because Composite reallocates the
	visual array which scrambles our pointers.  Only used during
	server startup, so there's no performance impact at all.


Index: picturestr.h
===================================================================
RCS file: /cvs/xserver/xserver/include/picturestr.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- picturestr.h	5 Nov 2003 05:45:31 -0000	1.24
+++ picturestr.h	18 Nov 2003 07:10:14 -0000	1.25
@@ -38,7 +38,7 @@
 } DirectFormatRec;
 
 typedef struct _IndexFormat {
-    VisualPtr	    pVisual;
+    VisualID	    vid;
     ColormapPtr	    pColormap;
     int		    nvalues;
     xIndexValue	    *pValues;