summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2010-07-07 11:38:55 -0700
committerEric Anholt <[email protected]>2010-07-07 11:39:21 -0700
commit8bb15c1ed55eb71533d2af94a6afbf01e3d23610 (patch)
tree26338503f9c17beee956f03f3cf6425779abc28a
parentd674ebcee0d2731e50d6530502cefcebc39dcdb6 (diff)
ir_to_mesa: Fill in some uninitialized fields that sometimes contained junk.
-rw-r--r--src/mesa/shader/ir_to_mesa.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/shader/ir_to_mesa.cpp b/src/mesa/shader/ir_to_mesa.cpp
index 2ffff60065d..d1796920725 100644
--- a/src/mesa/shader/ir_to_mesa.cpp
+++ b/src/mesa/shader/ir_to_mesa.cpp
@@ -192,11 +192,11 @@ ir_to_mesa_src_reg ir_to_mesa_undef = {
};
ir_to_mesa_dst_reg ir_to_mesa_undef_dst = {
- PROGRAM_UNDEFINED, 0, SWIZZLE_NOOP
+ PROGRAM_UNDEFINED, 0, SWIZZLE_NOOP, COND_TR
};
ir_to_mesa_dst_reg ir_to_mesa_address_reg = {
- PROGRAM_ADDRESS, 0, WRITEMASK_X
+ PROGRAM_ADDRESS, 0, WRITEMASK_X, COND_TR
};
static int swizzle_for_size(int size)
@@ -375,6 +375,8 @@ 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.reladdr = GL_FALSE;
+ src_reg.negate = 0;
return src_reg;
}