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 <gert.wollny@collabora.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/gallium/drivers/softpipe/sp_tex_sample.c b/src/gallium/drivers/softpipe/sp_tex_sample.c
index d20b7f9e51802cd8c3fbcf537c7a1cbd54d8ccc6..5b6274e2ba4309f98ca5a8c67fea1d4aaf582716 100644 (file)
--- 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];
          }