From: Brian Paul <brianp@vmware.com>
Date: Wed, 28 Apr 2010 16:10:51 +0000 (-0600)
Subject: Merge branch '7.8'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c7f5c9a3dc6350252e73b541bb85ab3ed9e64a9c;p=mesa.git

Merge branch '7.8'

Conflicts:

	src/mesa/state_tracker/st_gen_mipmap.c
---

c7f5c9a3dc6350252e73b541bb85ab3ed9e64a9c
diff --cc src/mesa/state_tracker/st_gen_mipmap.c
index 24a072ee12e,4a3e38de449..b8b75c7de62
--- a/src/mesa/state_tracker/st_gen_mipmap.c
+++ b/src/mesa/state_tracker/st_gen_mipmap.c
@@@ -377,7 -297,9 +377,9 @@@ st_generate_mipmap(GLcontext *ctx, GLen
  
        dstImage->TexFormat = srcImage->TexFormat;
  
-       stImage = (struct st_texture_image *) dstImage;
+       stImage = st_texture_image(dstImage);
+       stImage->level = dstLevel;
+ 
 -      pipe_texture_reference(&stImage->pt, pt);
 +      pipe_resource_reference(&stImage->pt, pt);
     }
  }