Module: Mesa Branch: master Commit: 8cf8dfe408a7dda5121cefc2fd5d772186484f76 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8cf8dfe408a7dda5121cefc2fd5d772186484f76
Author: Gert Wollny <[email protected]> Date: Sun Apr 7 08:37:45 2019 +0200 softpipe: Add an extra code path for the buffer texel lookup With buffers the addressing is done on a per-byte bases so the code path for normal textures doesn't work properly. Also add an assert to make sure that the bit cound for storing the X coordinate is large enough. Signed-off-by: Gert Wollny <[email protected]> Reviewed-by: Dave Airlie <[email protected]> --- src/gallium/drivers/softpipe/sp_tex_sample.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.c b/src/gallium/drivers/softpipe/sp_tex_sample.c index d20b7f9e518..5b6274e2ba4 100644 --- a/src/gallium/drivers/softpipe/sp_tex_sample.c +++ b/src/gallium/drivers/softpipe/sp_tex_sample.c @@ -574,6 +574,21 @@ compute_lambda_vert(const struct sp_sampler_view *sview, +static inline const float * +get_texel_buffer_no_border(const struct sp_sampler_view *sp_sview, + union tex_tile_address addr, int x, unsigned elmsize) +{ + const struct softpipe_tex_cached_tile *tile; + addr.bits.x = x * elmsize / TEX_TILE_SIZE; + assert(x * elmsize / TEX_TILE_SIZE == addr.bits.x); + + x %= TEX_TILE_SIZE / elmsize; + + tile = sp_get_cached_tile_tex(sp_sview->cache, addr); + + return &tile->data.color[0][x][0]; +} + static inline const float * get_texel_2d_no_border(const struct sp_sampler_view *sp_sview, @@ -3264,7 +3279,7 @@ sp_get_texels(const struct sp_sampler_view *sp_sview, first_element, first_element, last_element); - tx = get_texel_2d_no_border(sp_sview, addr, x, 0); + tx = get_texel_buffer_no_border(sp_sview, addr, x, elem_size); for (c = 0; c < 4; c++) { rgba[c][j] = tx[c]; } _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
