diff options
| author | Brian Paul <[email protected]> | 2010-08-31 19:14:18 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2010-08-31 19:15:07 -0600 |
| commit | 3fa3c33844b8491a204cda6ae8d67cd6ada78b3b (patch) | |
| tree | 0419a2456b454d3603bfcbbec4e546b4a2dccff3 /src/gallium/auxiliary | |
| parent | 16c733495d74d8c2443aa915a55df97c02b415c7 (diff) | |
gallivm: fix bug in nested conditionals
This, plus the previous commit fix fd.o bug 29806.
Diffstat (limited to 'src/gallium/auxiliary')
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c index ca8db9ce01d..0e07f7f3f38 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c @@ -200,8 +200,10 @@ static void lp_exec_mask_cond_push(struct lp_exec_mask *mask, } mask->cond_stack[mask->cond_stack_size++] = mask->cond_mask; assert(LLVMTypeOf(val) == mask->int_vec_type); - mask->cond_mask = val; - + mask->cond_mask = LLVMBuildAnd(mask->bld->builder, + mask->cond_mask, + val, + ""); lp_exec_mask_update(mask); } |