From 6870c081572fcf32997e7906a54d09da0ca58ac3 Mon Sep 17 00:00:00 2001
From: Keith Packard <keithp@keithp.com>
Date: Thu, 15 Jan 2004 09:19:56 +0000
Subject: Oops, lost a diff needed for the non-screen format pixmap code

---
 hw/kdrive/mach64/mach64.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'hw')

diff --git a/hw/kdrive/mach64/mach64.h b/hw/kdrive/mach64/mach64.h
index 68e762b3b..ca042c282 100644
--- a/hw/kdrive/mach64/mach64.h
+++ b/hw/kdrive/mach64/mach64.h
@@ -559,11 +559,14 @@ typedef struct _mach64PortPriv {
 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;
-- 
cgit v1.2.3