Mesa (master): nv50: fix bogus error message about 3d surfaces

[Christoph Bumiller]

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

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Sat Jul 16 13:00:52 2011 +0200

nv50: fix bogus error message about 3d surfaces

---

 src/gallium/drivers/nv50/nv50_miptree.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/nv50/nv50_miptree.c b/src/gallium/drivers/nv50/nv50_miptree.c
index 115a98d..bc81604 100644
--- a/src/gallium/drivers/nv50/nv50_miptree.c
+++ b/src/gallium/drivers/nv50/nv50_miptree.c
@@ -409,7 +409,9 @@ nv50_miptree_surface_new(struct pipe_context *pipe,
       if (mt->layout_3d) {
          ns->offset += nv50_mt_zslice_offset(mt, l, z);
 
-         if (z & (NV50_TILE_SIZE_Z(mt->level[l].tile_mode) - 1))
+         /* TODO: switch to depth 1 tiles; but actually this shouldn't happen */
+         if (ns->depth > 1 &&
+             (z & (NV50_TILE_SIZE_Z(mt->level[l].tile_mode) - 1)))
             NOUVEAU_ERR("Creating unsupported 3D surface !\n");
       } else {
          ns->offset += mt->layer_stride * z;