summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2010-06-25 17:20:46 -0700
committerEric Anholt <eric@anholt.net>2010-06-25 17:20:46 -0700
commitb2d7ed2aba916a995af9037c955930524977d310 (patch)
treed3f61afef9bdf9ded440984a8f0bd6299d22b83f
parent78062273de65bf8133f2550aa2a26040a82a65aa (diff)
glsl2: Don't clear swizzles for Mesa IR constants after fetching them.
Missed this while hacking in constants support. Fixes: glsl-algebraic-mul-* glsl-algebraic-rcp-* glsl-vs-swizzle-swizzle-lhs glsl-vs-vec4-indexing-6
-rw-r--r--src/mesa/shader/ir_to_mesa.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/mesa/shader/ir_to_mesa.cpp b/src/mesa/shader/ir_to_mesa.cpp
index a46286e82b4..456f69cd36f 100644
--- a/src/mesa/shader/ir_to_mesa.cpp
+++ b/src/mesa/shader/ir_to_mesa.cpp
@@ -349,7 +349,6 @@ ir_to_mesa_visitor::src_reg_for_float(float val)
src_reg.file = PROGRAM_CONSTANT;
src_reg.index = _mesa_add_unnamed_constant(this->prog->Parameters,
&val, 1, &src_reg.swizzle);
- src_reg.swizzle = SWIZZLE_NOOP;
return src_reg;
}
@@ -994,7 +993,6 @@ ir_to_mesa_visitor::visit(ir_constant *ir)
_mesa_add_unnamed_constant(this->prog->Parameters,
&ir->value.f[0], ir->type->vector_elements,
&src_reg.swizzle);
- src_reg.swizzle = SWIZZLE_NOOP;
} else {
assert(!"FINISHME: non-float constants");
}