diff options
| author | Brian <[email protected]> | 2007-10-23 10:55:24 -0600 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-10-23 10:55:24 -0600 |
| commit | c9d495c6f064aacd1e072033b9c17a83b8c37fa1 (patch) | |
| tree | 4c3e164299b74391cac37b2b45397e2604635681 /src | |
| parent | 2a8e9bb00f8cf830783cbc20a2a57f31b19491ea (diff) | |
properly init dst reg's CondMask/Swizzle fields
Diffstat (limited to 'src')
| -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 935eb44a321..38be0390841 100644 --- a/src/mesa/main/texenvprogram.c +++ b/src/mesa/main/texenvprogram.c @@ -461,8 +461,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 6a6db06285e..b7bc1977237 100644 --- a/src/mesa/tnl/t_vp_build.c +++ b/src/mesa/tnl/t_vp_build.c @@ -489,8 +489,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; } @@ -513,7 +513,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, |