From: Roland Scheidegger Date: Wed, 6 Feb 2013 17:29:55 +0000 (-0800) Subject: softpipe: fix using optimized filter function X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=66b6d5121475ecdd6b76ff660e28dfa6cc3f727c;p=mesa.git 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 --- diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.c b/src/gallium/drivers/softpipe/sp_tex_sample.c index ab032902aec..7f7e5aa3b9e 100644 --- a/src/gallium/drivers/softpipe/sp_tex_sample.c +++ b/src/gallium/drivers/softpipe/sp_tex_sample.c @@ -2963,6 +2963,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 &&