Mesa (master): gallivm: (trivial) fix the logic deciding if function call should be used...

[Roland Scheidegger]

Module: Mesa
Branch: master
Commit: e3252defd2eabb6bcc8eb14f16d534e964fd8884
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e3252defd2eabb6bcc8eb14f16d534e964fd8884

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Wed Apr  1 13:25:56 2015 +0200

gallivm: (trivial) fix the logic deciding if function call should be used...

Copy and paste bug with the img filter decision. Since there's only 2 different
filters anyway just drop this bit.

---

 src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
index 378c562..1a60ca9 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
@@ -3330,9 +3330,7 @@ lp_build_sample_soa(const struct lp_static_texture_state *static_texture_state,
          op_type != LP_SAMPLER_OP_TEXTURE ||
            ((static_sampler_state->min_mip_filter == PIPE_TEX_MIPFILTER_NONE ||
              static_texture_state->level_zero_only == TRUE) &&
-            static_sampler_state->min_img_filter == static_sampler_state->mag_img_filter &&
-            (static_sampler_state->min_img_filter == PIPE_TEX_FILTER_NEAREST ||
-             static_sampler_state->min_img_filter == PIPE_TEX_FILTER_NEAREST));
+            static_sampler_state->min_img_filter == static_sampler_state->mag_img_filter);
 
       use_tex_func = format_desc && !(simple_format && simple_tex);
    }