From: Patrice Mandin <patmandin@gmail.com>
Date: Sun, 8 Feb 2009 16:03:47 +0000 (+0100)
Subject: nouveau: include and calc offset before changing dimensions for next level
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b907d4cd8fafe719b4f87d877562829548937485;p=mesa.git

nouveau: include and calc offset before changing dimensions for next level
---

diff --git a/src/gallium/drivers/nv04/nv04_surface_2d.c b/src/gallium/drivers/nv04/nv04_surface_2d.c
index 1892055418b..1b5d980468d 100644
--- a/src/gallium/drivers/nv04/nv04_surface_2d.c
+++ b/src/gallium/drivers/nv04/nv04_surface_2d.c
@@ -1,6 +1,7 @@
 #include "pipe/p_context.h"
 #include "pipe/p_format.h"
 #include "util/u_memory.h"
+#include "util/u_math.h"
 
 #include "nouveau/nouveau_winsys.h"
 #include "nouveau/nouveau_util.h"
@@ -159,10 +160,10 @@ nv04_surface_copy_swizzle(struct nv04_surface_2d *ctx,
 		  }
 		}
 
+		/* FIXME: need to know how many bytes per pixel */
+		offset += align(w * h * 2 /*src->block.size*/, 64);
 		w >>= 1;
 		h >>= 1;
-		/* FIXME: need to know how many bytes per pixel */
-		offset += align(w * h * 2, 64);
 	}
 
 	return 0;