diff options
| author | José Fonseca <jfonseca@vmware.com> | 2009-08-09 17:22:01 +0100 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2009-08-29 09:21:27 +0100 |
| commit | 0318f3e53eed88f0feea6e7a4fd8a8d9becc9774 (patch) | |
| tree | 7d272621843aa2b66d299ab6c759d5a901b5eece /src/gallium/drivers/llvmpipe/lp_tex_sample.c | |
| parent | b836b2593c0450125bef6b88b02c7d6c20e9eff8 (diff) | |
llvmpipe: Split the texture cache from the color/depth/stencil cache.
Diffstat (limited to 'src/gallium/drivers/llvmpipe/lp_tex_sample.c')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_tex_sample.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_tex_sample.c b/src/gallium/drivers/llvmpipe/lp_tex_sample.c index d24845cac9..ff2dbce66b 100644 --- a/src/gallium/drivers/llvmpipe/lp_tex_sample.c +++ b/src/gallium/drivers/llvmpipe/lp_tex_sample.c @@ -38,7 +38,7 @@ #include "lp_surface.h" #include "lp_texture.h" #include "lp_tex_sample.h" -#include "lp_tile_cache.h" +#include "lp_tex_cache.h" #include "pipe/p_context.h" #include "pipe/p_defines.h" #include "util/u_math.h" @@ -680,17 +680,17 @@ get_texel(const struct tgsi_sampler *tgsi_sampler, rgba[3][j] = sampler->border_color[3]; } else { - const unsigned tx = x % TILE_SIZE; - const unsigned ty = y % TILE_SIZE; - const struct llvmpipe_cached_tile *tile; + const unsigned tx = x % TEX_TILE_SIZE; + const unsigned ty = y % TEX_TILE_SIZE; + const struct llvmpipe_cached_tex_tile *tile; - tile = lp_get_cached_tile_tex(samp->cache, - tile_address(x, y, z, face, level)); + tile = lp_get_cached_tex_tile(samp->cache, + tex_tile_address(x, y, z, face, level)); - rgba[0][j] = tile->data.color[ty][tx][0]; - rgba[1][j] = tile->data.color[ty][tx][1]; - rgba[2][j] = tile->data.color[ty][tx][2]; - rgba[3][j] = tile->data.color[ty][tx][3]; + rgba[0][j] = tile->color[ty][tx][0]; + rgba[1][j] = tile->color[ty][tx][1]; + rgba[2][j] = tile->color[ty][tx][2]; + rgba[3][j] = tile->color[ty][tx][3]; if (0) { debug_printf("Get texel %f %f %f %f from %s\n", |