summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoland Scheidegger <[email protected]>2015-04-01 13:25:56 +0200
committerRoland Scheidegger <[email protected]>2015-04-01 13:26:19 +0200
commite3252defd2eabb6bcc8eb14f16d534e964fd8884 (patch)
treeae5859c7395d3d1017e152496c3bf12978e0dc0b
parent59af7ed28cd1b44b525a7d6a324c4e00092104b6 (diff)
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.
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c4
1 files changed, 1 insertions, 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 378c562bb9f..1a60ca9d3cb 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);
}