From: Markus Amsler <markus.amsler@oribi.org>
Date: Mon, 17 Mar 2008 11:03:54 +0000 (+0100)
Subject: r300: Simplify r300VAPInputRoute1.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c48212fe5861291efd134b35e67568c79b15f960;p=mesa.git

r300: Simplify r300VAPInputRoute1.
---

diff --git a/src/mesa/drivers/dri/r300/r300_emit.c b/src/mesa/drivers/dri/r300/r300_emit.c
index 8e1d801a8d1..deb62b27621 100644
--- a/src/mesa/drivers/dri/r300/r300_emit.c
+++ b/src/mesa/drivers/dri/r300/r300_emit.c
@@ -238,14 +238,10 @@ static GLuint r300VAPInputRoute1Swizzle(int swizzle[4])
 GLuint r300VAPInputRoute1(uint32_t * dst, int swizzle[][4], GLuint nr)
 {
 	GLuint i;
+	uint16_t * dst16 = (uint16_t *) dst;
 
-	for (i = 0; i + 1 < nr; i += 2) {
-		dst[i >> 1] = r300VAPInputRoute1Swizzle(swizzle[i]) | R300_INPUT_ROUTE_ENABLE;
-		dst[i >> 1] |= (r300VAPInputRoute1Swizzle(swizzle[i + 1]) | R300_INPUT_ROUTE_ENABLE) << 16;
-	}
-
-	if (nr & 1) {
-		dst[nr >> 1] = r300VAPInputRoute1Swizzle(swizzle[nr - 1]) | R300_INPUT_ROUTE_ENABLE;
+	for (i = 0; i < nr; i++) {
+		dst16[i] = r300VAPInputRoute1Swizzle(swizzle[i]) | R300_INPUT_ROUTE_ENABLE;
 	}
 
 	return (nr + 1) >> 1;