diff options
author | Keith Whitwell <keithw@vmware.com> | 2010-03-16 09:02:38 +0000 |
---|---|---|
committer | Keith Whitwell <keithw@vmware.com> | 2010-03-16 09:02:38 +0000 |
commit | 8cdfd1219a2d13d252a8691ee6dddb0d773bdc77 (patch) | |
tree | 087318efba7eb0fb5e1c1d8422eca611abdee3e7 /src/gallium/auxiliary/gallivm/lp_bld_swizzle.c | |
parent | 6420aca08ba6910dce22ab9f813cc57d611b0aa8 (diff) | |
parent | e0ce4a4a0994211ead8e5a77cccdd2a084e8a288 (diff) |
Merge commit 'origin/master' into gallium-sampler-view
This branch already seems to have the nv50_tex.c fix.
Conflicts:
src/gallium/drivers/nv50/nv50_tex.c
Diffstat (limited to 'src/gallium/auxiliary/gallivm/lp_bld_swizzle.c')
-rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_swizzle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c index 64e81f7b1f..278c838eac 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_swizzle.c @@ -144,9 +144,9 @@ lp_build_broadcast_aos(struct lp_build_context *bld, #endif if(shift > 0) - tmp = LLVMBuildLShr(bld->builder, a, lp_build_int_const_scalar(type4, shift*type.width), ""); + tmp = LLVMBuildLShr(bld->builder, a, lp_build_const_int_vec(type4, shift*type.width), ""); if(shift < 0) - tmp = LLVMBuildShl(bld->builder, a, lp_build_int_const_scalar(type4, -shift*type.width), ""); + tmp = LLVMBuildShl(bld->builder, a, lp_build_const_int_vec(type4, -shift*type.width), ""); assert(tmp); if(tmp) |