Fix a regression due to the previous commit

adobe · Jan 22, 2013 · 3e9ba93 · 3e9ba93
1 parent 84362b2
commit 3e9ba93
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/bin/glsl2agal.swc b/bin/glsl2agal.swc
diff --git a/bin/glsl2agalopt b/bin/glsl2agalopt
diff --git a/bin/glsl2agalopt.exe b/bin/glsl2agalopt.exe
diff --git a/src/glsl/ir_print_agal_visitor.cpp b/src/glsl/ir_print_agal_visitor.cpp
@@ -471,8 +471,8 @@ void ir_print_agal_visitor::visit(ir_swizzle *ir)
    int p=0;
    for (unsigned i = 0; i < 4; i++) {
 		ralloc_asprintf_append (&buffer, "%c", "xyzw"[swiz[p]]);
-		if(writeMask & (1 << i))
-			p = std::min(p+1, writeComponents-1);
+		if(writeMask & (1 << i) && p+1 < ir->mask.num_components)
+			p++;
    }
 }