mesa: Branch 'master' - 2 commits

[Dave Airlie]

 src/mesa/drivers/dri/r300/r300_emit.h  |    2 +-
 src/mesa/drivers/dri/r300/r300_ioctl.c |   17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

New commits:
diff-tree 8d8a3cc39816168e5f04a668ae184cafe64d4fd2 (from fb1d22d23d0f2db518f10e6e1aeaea357de61cd9)
Author: Dave Airlie <airlied at nx6125b.(none)>
Date:   Sat Apr 14 17:44:33 2007 +1000

    r300: emit different clear paths for non-TCL, this gets the clear color correct

diff --git a/src/mesa/drivers/dri/r300/r300_ioctl.c b/src/mesa/drivers/dri/r300/r300_ioctl.c
index 4177415..90ac988 100644
--- a/src/mesa/drivers/dri/r300/r300_ioctl.c
+++ b/src/mesa/drivers/dri/r300/r300_ioctl.c
@@ -186,7 +186,10 @@ static void r300EmitClearState(GLcontext
 		
 	R300_STATECHANGE(r300, vir[0]);
 	reg_start(R300_VAP_INPUT_ROUTE_0_0, 0);
-	e32(0x21030003);
+	if (!has_tcl)
+	  e32(0x22030003);
+	else
+	  e32(0x21030003);
 	
 	/* disable fog */
 	R300_STATECHANGE(r300, fogs);
@@ -201,7 +204,17 @@ static void r300EmitClearState(GLcontext
 	reg_start(R300_VAP_INPUT_CNTL_0, 1);
 	e32(0x00000001);
 	e32(0x00000405);
-	
+
+	if (!has_tcl) {
+	  /* comes from fglrx startup of clear */
+	  reg_start(R300_SE_VTE_CNTL, 1);
+	  e32(0x043f);
+	  e32(0x8);
+	  
+	  reg_start(0x21dc, 0);
+	  e32(0xaaaaaaaa);
+	}
+
 	R300_STATECHANGE(r300, vof);
 	reg_start(R300_VAP_OUTPUT_VTX_FMT_0, 1);
 	e32(R300_VAP_OUTPUT_VTX_FMT_0__POS_PRESENT | R300_VAP_OUTPUT_VTX_FMT_0__COLOR_PRESENT);
diff-tree fb1d22d23d0f2db518f10e6e1aeaea357de61cd9 (from 3d59042afdaff9e67c6422cd8fa73d1bbbfbe940)
Author: Dave Airlie <airlied at nx6125b.(none)>
Date:   Sat Apr 14 17:42:59 2007 +1000

    r300: remove unneeded semicolon from macro

diff --git a/src/mesa/drivers/dri/r300/r300_emit.h b/src/mesa/drivers/dri/r300/r300_emit.h
index 1101a35..16ea2c6 100644
--- a/src/mesa/drivers/dri/r300/r300_emit.h
+++ b/src/mesa/drivers/dri/r300/r300_emit.h
@@ -162,7 +162,7 @@ static __inline__ uint32_t cmdpacify(voi
 				cmd_written, cmd_reserved);		\
 			exit(-1);					\
 		}							\
-	} while(0);
+	} while(0)
 
 #define	efloat(f) e32(r300PackFloat32(f))