Mesa (master): r300g: do not allocate a zmask block for 3D textures and cubemaps

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 363b74f132a5a329fac25322f3c5c227c55b94a8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=363b74f132a5a329fac25322f3c5c227c55b94a8

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sun Aug  8 18:21:53 2010 +0200

r300g: do not allocate a zmask block for 3D textures and cubemaps

---

 src/gallium/drivers/r300/r300_hyperz.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_hyperz.c b/src/gallium/drivers/r300/r300_hyperz.c
index 523d547..3b0adc3 100644
--- a/src/gallium/drivers/r300/r300_hyperz.c
+++ b/src/gallium/drivers/r300/r300_hyperz.c
@@ -338,6 +338,12 @@ void r300_zmask_alloc_block(struct r300_context *r300, struct r300_surface *surf
 
     tex = r300_texture(surf->base.texture);
 
+    /* We currently don't handle decompression for 3D textures and cubemaps
+     * correctly. */
+    if (tex->desc.b.b.target != PIPE_TEXTURE_1D &&
+        tex->desc.b.b.target != PIPE_TEXTURE_2D)
+        return;
+
     if (tex->zmask_mem[level])
         return;