From: Dave Airlie <airlied@nx6125b.(none)>
Date: Mon, 2 Jul 2007 07:21:45 +0000 (+1000)
Subject: r300: fix compiz crash on swtcl - doesn't fix compiz though.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6257ed8663eddb4ebdf99ba69cfe2ced82182ed3;p=mesa.git

r300: fix compiz crash on swtcl - doesn't fix compiz though.

Compiz for some reason looks like ass, everything with textures
looks like it has a 2x width/height multiplier on the texture coords...
---

diff --git a/src/mesa/drivers/dri/r300/r300_swtcl.c b/src/mesa/drivers/dri/r300/r300_swtcl.c
index 48122546c26..7aea063447a 100644
--- a/src/mesa/drivers/dri/r300/r300_swtcl.c
+++ b/src/mesa/drivers/dri/r300/r300_swtcl.c
@@ -154,13 +154,12 @@ static void r300SetVertexFormat( GLcontext *ctx )
 		offset += 1;
 	}
 
-	rmesa->swtcl.coloroffset = offset;
 	if (RENDERINPUTS_TEST(index_bitset, _TNL_ATTRIB_COLOR0)) {
+	        rmesa->swtcl.coloroffset = offset;
 		InputsRead |= 1 << VERT_ATTRIB_COLOR0;
 		OutputsWritten |= 1 << VERT_RESULT_COL0;
 		EMIT_ATTR( _TNL_ATTRIB_COLOR0, EMIT_4F );
-	} else
-		EMIT_PAD(4*sizeof(float));
+	}
 
 	offset += 4;
 
@@ -193,7 +192,7 @@ static void r300SetVertexFormat( GLcontext *ctx )
 	}
 	
 	/* Fixed, apply to vir0 only */
-	if (InputsRead & VERT_ATTRIB_POS)
+	if (InputsRead & (1 << VERT_ATTRIB_POS))
 		inputs[VERT_ATTRIB_POS] = 0;
 	if (InputsRead & (1 << VERT_ATTRIB_COLOR0))
 		inputs[VERT_ATTRIB_COLOR0] = 2;