From: Keith Whitwell <keithw@vmware.com>
Date: Thu, 19 Nov 2009 22:47:24 +0000 (-0800)
Subject: i965g: fix initialization of texture width/height/depth arrays
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=25cbf9b4da7be45218f645102d6be5144be4291f;p=mesa.git

i965g: fix initialization of texture width/height/depth arrays

Will remove these arrays in another branch - they're completely redundant.
---

diff --git a/src/gallium/drivers/i965/brw_screen_tex_layout.c b/src/gallium/drivers/i965/brw_screen_tex_layout.c
index bcdf8d8074f..f793fa8859e 100644
--- a/src/gallium/drivers/i965/brw_screen_tex_layout.c
+++ b/src/gallium/drivers/i965/brw_screen_tex_layout.c
@@ -101,16 +101,17 @@ brw_tex_set_level_info(struct brw_texture *tex,
 		       GLuint x, GLuint y,
 		       GLuint w, GLuint h, GLuint d)
 {
-   assert(tex->base.width[level] == w);
-   assert(tex->base.height[level] == h);
-   assert(tex->base.depth[level] == d);
-   assert(tex->image_offset[level] == NULL);
-   assert(nr_images >= 1);
 
    if (BRW_DEBUG & DEBUG_TEXTURE)
       debug_printf("%s level %d size: %d,%d,%d offset %d,%d (0x%x)\n", __FUNCTION__,
 		   level, w, h, d, x, y, tex->level_offset[level]);
 
+   assert(tex->image_offset[level] == NULL);
+   assert(nr_images >= 1);
+
+   tex->base.width[level] = w;
+   tex->base.height[level] = h;
+   tex->base.depth[level] = d;
 
    tex->level_offset[level] = (x + y * tex->pitch) * tex->cpp;
    tex->nr_images[level] = nr_images;