diff options
author | Roland Scheidegger <sroland@vmware.com> | 2009-11-27 17:15:47 +0100 |
---|---|---|
committer | Roland Scheidegger <sroland@vmware.com> | 2009-11-27 17:15:47 +0100 |
commit | c95cbd45c657ac47e908a4d99d118737034bde43 (patch) | |
tree | 68e6c2b91f97fadbe4dd073b9f7acaf5ee8d79cf /src/gallium/drivers/softpipe/sp_tex_tile_cache.c | |
parent | 884007546c98b1779bf266ec5111b1e7e2b68b2e (diff) | |
parent | d509f84543d0979e9bb53c20c195f378dd61e728 (diff) |
Merge branch 'width0'
Conflicts:
src/gallium/drivers/r300/r300_texture.c
src/gallium/state_trackers/xorg/xorg_exa.c
src/mesa/state_tracker/st_cb_texture.c
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_tex_tile_cache.c')
-rw-r--r-- | src/gallium/drivers/softpipe/sp_tex_tile_cache.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gallium/drivers/softpipe/sp_tex_tile_cache.c b/src/gallium/drivers/softpipe/sp_tex_tile_cache.c index 407a22a9f4..e50a76a73b 100644 --- a/src/gallium/drivers/softpipe/sp_tex_tile_cache.c +++ b/src/gallium/drivers/softpipe/sp_tex_tile_cache.c @@ -35,6 +35,7 @@ #include "pipe/p_inlines.h" #include "util/u_memory.h" #include "util/u_tile.h" +#include "util/u_math.h" #include "sp_context.h" #include "sp_surface.h" #include "sp_texture.h" @@ -246,9 +247,9 @@ sp_find_cached_tile_tex(struct softpipe_tex_tile_cache *tc, addr.bits.level, addr.bits.z, PIPE_TRANSFER_READ, 0, 0, - tc->texture->width[addr.bits.level], - tc->texture->height[addr.bits.level]); - + u_minify(tc->texture->width0, addr.bits.level), + u_minify(tc->texture->height0, addr.bits.level)); + tc->tex_trans_map = screen->transfer_map(screen, tc->tex_trans); tc->tex_face = addr.bits.face; |