diff options
| author | Eric Anholt <eric@anholt.net> | 2007-10-29 13:24:27 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-10-29 13:24:27 -0700 |
| commit | b0edb9c38a6c63175e4fafdbb54102c4f4a94e2c (patch) | |
| tree | 7dfa294a9c9f40f5f2e81a95dfd0d59cd4d6fbea /src/mesa/tnl/t_vp_build.c | |
| parent | 919f617d08a34d01dd916b08ca4f315bae84f21c (diff) | |
| parent | ad8ee7db3b406b23136873fc8c87a22e4d8b94de (diff) | |
Merge branch 'origin'
Diffstat (limited to 'src/mesa/tnl/t_vp_build.c')
| -rw-r--r-- | src/mesa/tnl/t_vp_build.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/tnl/t_vp_build.c b/src/mesa/tnl/t_vp_build.c index 6a6db06285..b7bc197723 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, |