diff options
| author | Keith Whitwell <[email protected]> | 2010-03-15 09:44:52 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2010-03-15 09:44:52 +0000 |
| commit | 42910ebe7b9748c0ecb6a597bae3e7d43c7e170f (patch) | |
| tree | b2b9c72dc47a0473304dc2db1b078d13b658df34 /src/gallium/auxiliary/gallivm | |
| parent | 47bfbd452c93e6a8db013fb90d9f42210cf24889 (diff) | |
| parent | 68e58a96e80865878e6881dc4d34fcc3ec24eb19 (diff) | |
Merge commit 'origin/master' into gallium-sampler-view
Conflicts:
src/gallium/drivers/nv30/nv30_context.h
src/gallium/drivers/nv30/nv30_state.c
src/gallium/drivers/nv40/nv40_context.h
src/gallium/drivers/nv40/nv40_state.c
src/gallium/drivers/r300/r300_emit.c
Diffstat (limited to 'src/gallium/auxiliary/gallivm')
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_sample.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.c b/src/gallium/auxiliary/gallivm/lp_bld_sample.c index 543fd5fea3f..2f74aa5e00a 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_sample.c +++ b/src/gallium/auxiliary/gallivm/lp_bld_sample.c @@ -84,8 +84,12 @@ lp_sampler_static_state(struct lp_sampler_static_state *state, state->wrap_t = sampler->wrap_t; state->wrap_r = sampler->wrap_r; state->min_img_filter = sampler->min_img_filter; - state->min_mip_filter = sampler->min_mip_filter; state->mag_img_filter = sampler->mag_img_filter; + if (texture->last_level) { + state->min_mip_filter = sampler->min_mip_filter; + } else { + state->min_mip_filter = PIPE_TEX_MIPFILTER_NONE; + } state->compare_mode = sampler->compare_mode; if (sampler->compare_mode != PIPE_TEX_COMPARE_NONE) { |