Mesa (gallium-0.2): nouveau: Map correct mip level when using the shadow ( nv30, nv40).

[Younes Manton]

Module: Mesa
Branch: gallium-0.2
Commit: 01cbd764962ff49bf104e5997914ced53360ef81
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=01cbd764962ff49bf104e5997914ced53360ef81

Author: Younes Manton <younes.m at gmail.com>
Date:   Wed Jan 21 16:55:35 2009 -0500

nouveau: Map correct mip level when using the shadow (nv30, nv40).

---

 src/gallium/drivers/nv30/nv30_screen.c |   13 +++++++------
 src/gallium/drivers/nv40/nv40_screen.c |   13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/gallium/drivers/nv30/nv30_screen.c b/src/gallium/drivers/nv30/nv30_screen.c
index 29356e8..1fac6d3 100644
--- a/src/gallium/drivers/nv30/nv30_screen.c
+++ b/src/gallium/drivers/nv30/nv30_screen.c
@@ -145,14 +145,15 @@ nv30_surface_map(struct pipe_screen *screen, struct pipe_surface *surface,
 			surface->texture->tex_usage = old_tex_usage;
 
 			assert(mt->shadow_tex->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR);
-			mt->shadow_surface = screen->get_tex_surface
-			(
-				screen, mt->shadow_tex,
-				surface->face, surface->level, surface->zslice,
-				surface->usage
-			);
 		}
 
+		mt->shadow_surface = screen->get_tex_surface
+		(
+			screen, mt->shadow_tex,
+			surface->face, surface->level, surface->zslice,
+			surface->usage
+		);
+
 		surface_to_map = mt->shadow_surface;
 	}
 	else
diff --git a/src/gallium/drivers/nv40/nv40_screen.c b/src/gallium/drivers/nv40/nv40_screen.c
index 9657a19..ab128fe 100644
--- a/src/gallium/drivers/nv40/nv40_screen.c
+++ b/src/gallium/drivers/nv40/nv40_screen.c
@@ -154,14 +154,15 @@ nv40_surface_map(struct pipe_screen *screen, struct pipe_surface *surface,
 			surface->texture->tex_usage = old_tex_usage;
 
 			assert(mt->shadow_tex->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR);
-			mt->shadow_surface = screen->get_tex_surface
-			(
-				screen, mt->shadow_tex,
-				surface->face, surface->level, surface->zslice,
-				surface->usage
-			);
 		}
 
+		mt->shadow_surface = screen->get_tex_surface
+		(
+			screen, mt->shadow_tex,
+			surface->face, surface->level, surface->zslice,
+			surface->usage
+		);
+
 		surface_to_map = mt->shadow_surface;
 	}
 	else