From f701a5a0feac9e5cbc1205142e4ef27d65326343 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Fri, 19 Apr 2013 22:34:47 +0100 Subject: [PATCH] gallivm: Disable LLVM 2.7 workaround on other versions. 2.7 was a particularly trouble ridden release. Furthermore, the bug no longer can be reproduced ever since the first_level state was taken in account. Reviewed-by: Brian Paul --- src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c index ced2103fca2..beefdaed513 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c @@ -1149,11 +1149,10 @@ lp_build_sample_common(struct lp_build_sample_context *bld, /* fall-through */ case PIPE_TEX_MIPFILTER_NONE: /* always use mip level 0 */ - if (target == PIPE_TEXTURE_CUBE) { + 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. - * XXX should probably disable that on other llvm versions. */ assert(*lod_ipart); lp_build_nearest_mip_level(bld, texture_index, *lod_ipart, ilevel0); -- 2.11.0