diff options
author | José Fonseca <[email protected]> | 2014-10-22 13:09:59 +0100 |
---|---|---|
committer | José Fonseca <[email protected]> | 2014-10-23 10:18:56 +0100 |
commit | 013ff2fae13da41c2f5619c4698b0a7b5aa6a06d (patch) | |
tree | 27ba16255c5ee8cf8671b892fdfdcc53b0831010 /src/gallium/drivers/llvmpipe | |
parent | 9ad80d1d1876493b45428b5f81b03add3ae8150e (diff) |
gallivm,llvmpipe,clover: Bump required LLVM version to 3.3.
We'll need to update gallivm for the interface changes in LLVM 3.6, and
the fewer the number of older LLVM versions we support the less hairy that
will be.
As consequence HAVE_AVX define can disappear. (Note HAVE_AVX meant
whether LLVM version supports AVX or not. Runtime support for AVX is
always checked and enforced independently.)
Verified llvmpipe builds and runs with with LLVM 3.3, 3.4, and 3.5.
Reviewed-by: Roland Scheidegger <[email protected]>
Diffstat (limited to 'src/gallium/drivers/llvmpipe')
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_screen.c | 6 | ||||
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_state_fs.c | 8 |
2 files changed, 0 insertions, 14 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index a264f990d02..ad716b70ca5 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -551,12 +551,6 @@ llvmpipe_create_screen(struct sw_winsys *winsys) util_cpu_detect(); -#if defined(PIPE_ARCH_X86) && HAVE_LLVM < 0x0302 - /* require SSE2 due to LLVM PR6960. */ - if (!util_cpu_caps.has_sse2) - return NULL; -#endif - #ifdef DEBUG LP_DEBUG = debug_get_flags_option("LP_DEBUG", lp_debug_flags, 0 ); #endif diff --git a/src/gallium/drivers/llvmpipe/lp_state_fs.c b/src/gallium/drivers/llvmpipe/lp_state_fs.c index a7a55f8301c..0fc3686ba13 100644 --- a/src/gallium/drivers/llvmpipe/lp_state_fs.c +++ b/src/gallium/drivers/llvmpipe/lp_state_fs.c @@ -1666,15 +1666,7 @@ generate_unswizzled_blend(struct gallivm_state *gallivm, partial_mask |= !variant->opaque; i32_zero = lp_build_const_int32(gallivm, 0); -#if HAVE_LLVM < 0x0302 - /* - * undef triggers a crash in LLVMBuildTrunc in convert_from_blend_type in some - * cases (seen with r10g10b10a2, 128bit wide vectors) (only used for 1d case). - */ - undef_src_val = lp_build_zero(gallivm, fs_type); -#else undef_src_val = lp_build_undef(gallivm, fs_type); -#endif row_type.length = fs_type.length; vector_width = dst_type.floating ? lp_native_vector_width : lp_integer_vector_width; |