summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-12-03 07:38:02 -0700
committerBrian Paul <brianp@vmware.com>2010-12-03 07:38:02 -0700
commit14746b1d4fc7ae30b557dacc819b81756df2f72f (patch)
treea1ebcfd4b1599d6834874bd5c8fa5b1cc35595ed
parent5be631ce83c3801421c79240be2f422958b206a5 (diff)
gallivm: fix null builder pointers
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
index ab86cc4ab7a..1b5a8a5903b 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_soa.c
@@ -535,7 +535,7 @@ emit_mask_scatter(struct lp_build_tgsi_soa_context *bld,
LLVMValueRef pred)
{
struct gallivm_state *gallivm = bld->base.gallivm;
- LLVMBuilderRef builder = builder;
+ LLVMBuilderRef builder = gallivm->builder;
unsigned i;
/* Mix the predicate and execution mask */
@@ -895,6 +895,7 @@ emit_store(
LLVMValueRef value)
{
struct gallivm_state *gallivm = bld->base.gallivm;
+ LLVMBuilderRef builder = gallivm->builder;
const struct tgsi_full_dst_register *reg = &inst->Dst[index];
struct lp_build_context *uint_bld = &bld->uint_bld;
LLVMValueRef indirect_index = NULL;
@@ -929,7 +930,6 @@ emit_store(
switch( reg->Register.File ) {
case TGSI_FILE_OUTPUT:
if (reg->Register.Indirect) {
- LLVMBuilderRef builder = builder;
LLVMValueRef chan_vec =
lp_build_const_int_vec(gallivm, uint_bld->type, chan_index);
LLVMValueRef length_vec =
@@ -972,7 +972,6 @@ emit_store(
case TGSI_FILE_TEMPORARY:
if (reg->Register.Indirect) {
- LLVMBuilderRef builder = builder;
LLVMValueRef chan_vec =
lp_build_const_int_vec(gallivm, uint_bld->type, chan_index);
LLVMValueRef length_vec =