xserver ChangeLog,3.271,3.272

Committed by: anholt

Update of /cvs/xserver/xserver
In directory gabe:/tmp/cvs-serv18843

Modified Files:
	ChangeLog 
Log Message:
Fix r200 render (for real this time?) by setting tex1_comp_cnt right for
non-mask rendering.  Reenable it.  Also, R200TexFormats was used instead
of R100 in one place.  Harmless so far, because the formats were in the
same order.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.271
retrieving revision 3.272
diff -u -d -r3.271 -r3.272
--- ChangeLog	6 Dec 2004 22:29:31 -0000	3.271
+++ ChangeLog	21 Dec 2004 09:51:47 -0000	3.272
@@ -1,3 +1,13 @@
+2004-12-21  Eric Anholt  <[email protected]>
+
+	* hw/kdrive/ati/ati_draw.c: (ATIDrawEnable):
+	* hw/kdrive/ati/radeon_composite.c: (R200TextureSetup),
+	(R200PrepareComposite):
+	Fix r200 render (for real this time?) by setting tex1_comp_cnt right for
+	non-mask rendering.  Reenable it.  Also, R200TexFormats was used instead
+	of R100 in one place.  Harmless so far, because the formats were in the
+	same order.
+
 2004-12-06  mallum  <mallum-RWuK6r/[email protected]>
 
 	* hw/kdrive/ephyr/hostx.c: (hostx_load_keymap):