Mesa (master): gallivm: fix bug in nested conditionals
Brian Paul
brianp at kemper.freedesktop.org
Wed Sep 1 01:17:09 UTC 2010
Module: Mesa
Branch: master
Commit: 3fa3c33844b8491a204cda6ae8d67cd6ada78b3b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3fa3c33844b8491a204cda6ae8d67cd6ada78b3b
Author: Brian Paul <brianp at vmware.com>
Date: Tue Aug 31 19:14:18 2010 -0600
gallivm: fix bug in nested conditionals
This, plus the previous commit fix fd.o bug 29806.
---
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 ca8db9c..0e07f7f 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);
}
More information about the mesa-commit
mailing list