From: Oliver McFadden <z3ro.geek@gmail.com>
Date: Sat, 26 May 2007 21:38:52 +0000 (+0000)
Subject: r300: Rearranged the DWORD construction in r300VAPInputRoute0 for clarity.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d42c8ab630af1ee7a153823f23a46a0e05c01019;p=mesa.git

r300: Rearranged the DWORD construction in r300VAPInputRoute0 for clarity.

Doesn't actually change anything; just makes it easier to read.
---

diff --git a/src/mesa/drivers/dri/r300/r300_emit.c b/src/mesa/drivers/dri/r300/r300_emit.c
index f42bcd9e45a..2390d9be653 100644
--- a/src/mesa/drivers/dri/r300/r300_emit.c
+++ b/src/mesa/drivers/dri/r300/r300_emit.c
@@ -212,10 +212,10 @@ static GLuint r300VAPInputRoute0(uint32_t * dst, GLvector4f ** attribptr,
 {
 	GLuint i, dw;
 
-	/* dw: size, inputs, stop bit, type */
+	/* type, inputs, stop bit, size */
 	for (i = 0; i + 1 < nr; i += 2) {
-		dw = (attribptr[tab[i]]->size - 1) | (inputs[tab[i]] << 8) | R300_INPUT_ROUTE_FLOAT;
-		dw |= ((attribptr[tab[i + 1]]->size - 1) | (inputs[tab[i + 1]] << 8) | R300_INPUT_ROUTE_FLOAT) << 16;
+		dw = R300_INPUT_ROUTE_FLOAT | (inputs[tab[i]] << 8) | (attribptr[tab[i]]->size - 1);
+		dw |= (R300_INPUT_ROUTE_FLOAT | (inputs[tab[i + 1]] << 8) | (attribptr[tab[i + 1]]->size - 1)) << 16;
 		if (i + 2 == nr) {
 			dw |= (1 << (13 + 16));
 		}
@@ -223,7 +223,7 @@ static GLuint r300VAPInputRoute0(uint32_t * dst, GLvector4f ** attribptr,
 	}
 
 	if (nr & 1) {
-		dw = (attribptr[tab[nr - 1]]->size - 1) | (inputs[tab[nr - 1]] << 8) | R300_INPUT_ROUTE_FLOAT;
+		dw = R300_INPUT_ROUTE_FLOAT | (inputs[tab[nr - 1]] << 8) | (attribptr[tab[nr - 1]]->size - 1);
 		dw |= 1 << 13;
 		dst[nr >> 1] = dw;
 	}