From: Ian Romanick <ian.d.romanick@intel.com>
Date: Fri, 25 Mar 2011 01:01:37 +0000 (-0700)
Subject: i965/fs: Use different name for inner loop counter
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4e994e150f65c854229b4af12eae5519ebd9dda1;p=mesa.git

i965/fs: Use different name for inner loop counter

'i' is already used for the outer loop.  This caused some problems
while doing other work in this area.  No bug exists here... until you
want to use the outer loop counter in the inner loop.
---

diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index ecc4d482b60..74596e91c35 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -440,8 +440,8 @@ fs_visitor::setup_builtin_uniform_values(ir_variable *ir)
 	  * the array/matrix/structure we're trying to fill in.
 	  */
 	 int last_swiz = -1;
-	 for (unsigned int i = 0; i < 4; i++) {
-	    int swiz = GET_SWZ(element->swizzle, i);
+	 for (unsigned int j = 0; j < 4; j++) {
+	    int swiz = GET_SWZ(element->swizzle, j);
 	    if (swiz == last_swiz)
 	       break;
 	    last_swiz = swiz;