diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2013-02-06 09:29:55 -0800 |
|---|---|---|
| committer | Andreas Boll <andreas.boll.dev@gmail.com> | 2013-02-13 21:48:37 +0100 |
| commit | 71e3ee38aca50b6954cc7e341aa082797741f02d (patch) | |
| tree | 3899a2b6331d8d4b9945819f425e0de1de74bdad | |
| parent | fdfb299c22318ad54520de86fade5754848f8366 (diff) | |
softpipe: fix using optimized filter function
This optimized filter (when using repeat wrap modes,
linear min/mag/mip filters, pot textures) only applies to 2d textures,
but nothing prevented it from being used for other textures (likely
leading to very bogus sample results).
Note: This is a candidate for the 9.0 branch.
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
(cherry picked from commit 66b6d5121475ecdd6b76ff660e28dfa6cc3f727c)
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_tex_sample.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.c b/src/gallium/drivers/softpipe/sp_tex_sample.c index 0aeb8e244c4..f679230570f 100644 --- a/src/gallium/drivers/softpipe/sp_tex_sample.c +++ b/src/gallium/drivers/softpipe/sp_tex_sample.c @@ -2680,6 +2680,7 @@ sp_create_sampler_variant( const struct pipe_sampler_state *sampler, case PIPE_TEX_MIPFILTER_LINEAR: if (key.bits.is_pot && + key.bits.target == PIPE_TEXTURE_2D && sampler->min_img_filter == sampler->mag_img_filter && sampler->normalized_coords && sampler->wrap_s == PIPE_TEX_WRAP_REPEAT && |