diff options
| author | Brian <[email protected]> | 2007-10-23 10:54:50 -0600 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-10-23 10:54:50 -0600 |
| commit | 112a1580f658948e553fe04399a20958dca67c16 (patch) | |
| tree | 94d1fe79b5641c643d08fa81965907e1980c7f3a | |
| parent | e69943e6dda102df8418a8261b95155350181a2f (diff) | |
properly init dst reg's CondMask/Swizzle fields
| -rw-r--r-- | src/mesa/main/texenvprogram.c | 4 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vp_build.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c index 2614440a747..abc25671341 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -462,8 +462,8 @@ static void emit_dst( struct prog_dst_register *dst, dst->File = ureg.file; dst->Index = ureg.idx; dst->WriteMask = mask; - dst->CondMask = 0; - dst->CondSwizzle = 0; + dst->CondMask = COND_TR; /* always pass cond test */ + dst->CondSwizzle = SWIZZLE_NOOP; } static struct prog_instruction * diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c index cbffed5155d..dc2d5e0065a 100644 --- a/src/mesa/tnl/t_vp_build.c +++ b/src/mesa/tnl/t_vp_build.c @@ -488,8 +488,8 @@ static void emit_dst( struct prog_dst_register *dst, dst->Index = reg.idx; /* allow zero as a shorthand for xyzw */ dst->WriteMask = mask ? mask : WRITEMASK_XYZW; - dst->CondMask = COND_TR; - dst->CondSwizzle = 0; + dst->CondMask = COND_TR; /* always pass cond test */ + dst->CondSwizzle = SWIZZLE_NOOP; dst->CondSrc = 0; dst->pad = 0; } @@ -512,7 +512,7 @@ static void debug_insn( struct prog_instruction *inst, const char *fn, static void emit_op3fn(struct tnl_program *p, - GLuint op, + enum prog_opcode op, struct ureg dest, GLuint mask, struct ureg src0, |