[xserver-commit] xserver/hw/kdrive/mach64 mach64.h,1.10,1.11

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/hw/kdrive/mach64
In directory pdx:/tmp/cvs-serv19945/hw/kdrive/mach64

Modified Files:
	mach64.h 
Log Message:
2004-01-15  Keith Packard  <keithp@keithp.com>
	* hw/kdrive/mach64/mach64.h:
	Oops, lost a diff needed for the non-screen format pixmap
	code


Index: mach64.h
===================================================================
RCS file: /cvs/xserver/xserver/hw/kdrive/mach64/mach64.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- mach64.h	2 Nov 2003 19:56:10 -0000	1.10
+++ mach64.h	15 Jan 2004 09:19:56 -0000	1.11
@@ -559,11 +559,14 @@
 Bool mach64InitVideo(ScreenPtr pScreen);
 void mach64FiniVideo(ScreenPtr pScreen);
 
+/*
+ * These values are per-format, which is essentially per-depth/per-bpp.
+ * Because bpp is fixed for the screen by depth, they're computed
+ * per-screen per-depth.
+ */
+
 typedef struct _mach64ScreenInfo {
     VesaScreenPrivRec		vesa;
-    CARD32			DP_PIX_WIDTH;
-    CARD32			DP_SET_GUI_ENGINE;
-    Bool			bpp24;
     Mach64Cursor		cursor;
     CARD32			colorKey;
     KdVideoAdaptorPtr		pAdaptor;