diff options
author | Brian Paul <brianp@vmware.com> | 2010-12-16 18:17:20 -0700 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2010-12-16 18:18:57 -0700 |
commit | 42a0967a36ff3331de96289125243e6afeb5d560 (patch) | |
tree | 78143ad66ace38a2fa024e226742dd3576fefd36 /src/gallium/drivers/softpipe/sp_tex_sample.c | |
parent | 9d9f8aba0aa51f707ac1d451fb8a89bb95676ab1 (diff) |
softpipe: remove sp_tex_tile_cache_border_color()
With swizzling done at the end of texture sampling, we can greatly
simplify swizzling of the border color.
Fixes http://bugs.freedesktop.org/show_bug.cgi?id=32460
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_tex_sample.c')
-rw-r--r-- | src/gallium/drivers/softpipe/sp_tex_sample.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.c b/src/gallium/drivers/softpipe/sp_tex_sample.c index 70fa74b7e4..cbc40d4b44 100644 --- a/src/gallium/drivers/softpipe/sp_tex_sample.c +++ b/src/gallium/drivers/softpipe/sp_tex_sample.c @@ -659,8 +659,7 @@ get_texel_2d(const struct sp_sampler_variant *samp, if (x < 0 || x >= (int) u_minify(texture->width0, level) || y < 0 || y >= (int) u_minify(texture->height0, level)) { - return sp_tex_tile_cache_border_color(samp->cache, - samp->sampler->border_color); + return samp->sampler->border_color; } else { return get_texel_2d_no_border( samp, addr, x, y ); @@ -754,8 +753,7 @@ get_texel_3d(const struct sp_sampler_variant *samp, if (x < 0 || x >= (int) u_minify(texture->width0, level) || y < 0 || y >= (int) u_minify(texture->height0, level) || z < 0 || z >= (int) u_minify(texture->depth0, level)) { - return sp_tex_tile_cache_border_color(samp->cache, - samp->sampler->border_color); + return samp->sampler->border_color; } else { return get_texel_3d_no_border( samp, addr, x, y, z ); |