summaryrefslogtreecommitdiff
path: root/src/gallium/auxiliary/gallivm
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-03-08 11:43:20 -0700
committerBrian Paul <brianp@vmware.com>2010-03-08 11:43:20 -0700
commite5923a1240d8b32f5af080b0b4191d3b9299a630 (patch)
treeb186ab69c91eeb1be91c9f3705db82fead819728 /src/gallium/auxiliary/gallivm
parent39ab5ae30c303dd561252cb592d4de35814b6a70 (diff)
parente1762fb870f86afc4f6bd000b4a1c059d161f10d (diff)
Merge branch '7.8'
Diffstat (limited to 'src/gallium/auxiliary/gallivm')
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
index bc2f307c33..9058f76c1d 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
@@ -538,6 +538,9 @@ lp_build_sample_wrap_linear(struct lp_build_sample_context *bld,
default:
assert(0);
+ coord0 = NULL;
+ coord1 = NULL;
+ weight = NULL;
}
*x0_out = coord0;
@@ -700,6 +703,7 @@ lp_build_sample_wrap_nearest(struct lp_build_sample_context *bld,
default:
assert(0);
+ icoord = NULL;
}
return icoord;