summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorMathias Fröhlich <Mathias.Froehlich@web.de>2010-03-27 13:40:38 +0100
committerMarek Olšák <maraeo@gmail.com>2010-03-27 14:06:41 +0100
commita43618fdc4e046f946d5f0de6dd8a421b66e9498 (patch)
treed15c99d8321c948ff8660f281e16a3b4e64606bd /src/gallium
parent29ec84b0a80e1fe2e6f58f91ab63f2f9ebd012a6 (diff)
r300g: fix macrotiling for non-square textures
FDO bug #27338. Signed-off-by: Marek Olšák <maraeo@gmail.com>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/r300/r300_texture.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c
index 1b796257e4f..7c86bdb4bdc 100644
--- a/src/gallium/drivers/r300/r300_texture.c
+++ b/src/gallium/drivers/r300/r300_texture.c
@@ -692,7 +692,8 @@ static void r300_setup_miptree(struct r300_screen* screen,
/* Let's see if this miplevel can be macrotiled. */
tex->mip_macrotile[i] =
(tex->macrotile == R300_BUFFER_TILED &&
- r300_texture_macro_switch(tex, i, rv350_mode, TILE_WIDTH)) ?
+ r300_texture_macro_switch(tex, i, rv350_mode, TILE_WIDTH) &&
+ r300_texture_macro_switch(tex, i, rv350_mode, TILE_HEIGHT)) ?
R300_BUFFER_TILED : R300_BUFFER_LINEAR;
stride = r300_texture_get_stride(screen, tex, i);