xserver ChangeLog,3.272,3.273

Committed by: anholt

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

Modified Files:
	ChangeLog 
Log Message:
Back out the previous day's broken R200 "fix" -- the same number of
coords are always emitted.  Fix the real problem, which was not enough
regs being initialized in ati_draw.c.  Fix a typo that was resulting in
alpha coming out as 0 * src or 0 * broken instead of src * 1 or src *
mask.  Assign the blending results to R0, as appears to be necessary.
Unbreak the dst-alpha-blend-with-no-dst-alpha code.  Yow.  And set the
right DMA count for the r200 traps code.


Index: ChangeLog
===================================================================
RCS file: /cvs/xserver/xserver/ChangeLog,v
retrieving revision 3.272
retrieving revision 3.273
diff -u -d -r3.272 -r3.273
--- ChangeLog	21 Dec 2004 09:51:47 -0000	3.272
+++ ChangeLog	22 Dec 2004 18:39:41 -0000	3.273
@@ -1,3 +1,28 @@
+2004-12-22  Eric Anholt  <[email protected]>
+
+	* hw/kdrive/ati/ati_draw.c: (ATIDrawSetup):
+	* hw/kdrive/ati/ati_reg.h:
+	* hw/kdrive/ati/radeon_composite.c: (R200TextureSetup),
+	(R200PrepareComposite), (RadeonPrepareTrapezoids):
+	Back out the previous day's broken R200 "fix" -- the same number of
+	coords are always emitted.  Fix the real problem, which was not enough
+	regs being initialized in ati_draw.c.  Fix a typo that was resulting in
+	alpha coming out as 0 * src or 0 * broken instead of src * 1 or src *
+	mask.  Assign the blending results to R0, as appears to be necessary.
+	Unbreak the dst-alpha-blend-with-no-dst-alpha code.  Yow.  And set the
+	right DMA count for the r200 traps code.
+
+2004-12-21  Eric Anholt  <[email protected]>
+
+	* hw/kdrive/ati/radeon_composite.c: (R200TextureSetup),
+	(R200PrepareComposite):
+	Revert last night's r200 render fix.  Something went wrong in my
+	testing, because that "fix" could have only made the situation worse.
+	Remember, coords are emitted even when they aren't needed.  Set
+	TX[CA]BLEND2_0 correctly, after rereading the X.org code, and remove a
+	couple of XXXs on code that appears correct.  R200 render is still
+	broken -- working on it.
+
 2004-12-21  Eric Anholt  <[email protected]>
 
 	* hw/kdrive/ati/ati_draw.c: (ATIDrawEnable):