diff options
| author | Keith Whitwell <[email protected]> | 2010-03-13 15:06:35 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2010-03-13 15:06:35 +0000 |
| commit | 47bfbd452c93e6a8db013fb90d9f42210cf24889 (patch) | |
| tree | e3cebba97261f567f461769d891aa77707b57bd7 /src/gallium/auxiliary/gallivm/lp_bld_pack.c | |
| parent | faa14818856e1e9a4ee624c2bc04d7aecabd07ab (diff) | |
| parent | a80e33f40731f07e8a39896bfdcd1b1504aedc1f (diff) | |
Merge commit 'origin/master' into gallium-sampler-view
Conflicts:
src/gallium/auxiliary/util/u_tile.c
src/gallium/auxiliary/util/u_tile.h
src/gallium/drivers/identity/id_context.c
src/gallium/drivers/llvmpipe/lp_setup.c
src/gallium/drivers/llvmpipe/lp_setup.h
src/gallium/drivers/softpipe/sp_tex_tile_cache.c
src/gallium/include/pipe/p_context.h
src/mesa/state_tracker/st_cb_bitmap.c
src/mesa/state_tracker/st_cb_drawpixels.c
Diffstat (limited to 'src/gallium/auxiliary/gallivm/lp_bld_pack.c')
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_pack.c b/src/gallium/auxiliary/gallivm/lp_bld_pack.c index 4c61d107494..23398f41f99 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_pack.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_pack.c @@ -256,7 +256,7 @@ lp_build_pack2(LLVMBuilderRef builder, LLVMValueRef lo, LLVMValueRef hi) { -#if !(HAVE_LLVM >= 0x0207) +#if HAVE_LLVM < 0x0207 LLVMTypeRef src_vec_type = lp_build_vec_type(src_type); #endif LLVMTypeRef dst_vec_type = lp_build_vec_type(dst_type); |