diff options
author | José Fonseca <[email protected]> | 2014-05-08 13:25:28 +0100 |
---|---|---|
committer | José Fonseca <[email protected]> | 2014-05-14 11:04:59 +0100 |
commit | 9cf67e51b06b4b136d03e642b18b4a4e36a1dabb (patch) | |
tree | a79ebd49f932318ed663e6eb59629d780dffeaa4 /src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c | |
parent | ecef2da0b2035b1043441ffd322802cfa4a9f36f (diff) |
gallivm,draw,llvmpipe: Remove support for versions of LLVM prior to 3.1.
Older versions haven't been tested probably don't work anyway. But more
importantly, code supporting it is hindering further work.
Reviewed-by: Roland Scheidegger <[email protected]>
Diffstat (limited to 'src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c')
-rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c index e8c04d1e6c5..e29f5034452 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c @@ -1775,20 +1775,10 @@ lp_build_sample_common(struct lp_build_sample_context *bld, /* fall-through */ case PIPE_TEX_MIPFILTER_NONE: /* always use mip level 0 */ - if (HAVE_LLVM == 0x0207 && target == PIPE_TEXTURE_CUBE) { - /* XXX this is a work-around for an apparent bug in LLVM 2.7. - * We should be able to set ilevel0 = const(0) but that causes - * bad x86 code to be emitted. - */ - assert(lod_ipart); - lp_build_nearest_mip_level(bld, texture_index, lod_ipart, ilevel0, NULL); - } - else { - first_level = bld->dynamic_state->first_level(bld->dynamic_state, - bld->gallivm, texture_index); - first_level = lp_build_broadcast_scalar(&bld->leveli_bld, first_level); - *ilevel0 = first_level; - } + first_level = bld->dynamic_state->first_level(bld->dynamic_state, + bld->gallivm, texture_index); + first_level = lp_build_broadcast_scalar(&bld->leveli_bld, first_level); + *ilevel0 = first_level; break; case PIPE_TEX_MIPFILTER_NEAREST: assert(lod_ipart); |