Merge branch '7.8'

Conflicts:

	src/mesa/state_tracker/st_gen_mipmap.c

diff --cc src/mesa/state_tracker/st_cb_texture.c
Simple merge

diff --cc src/mesa/state_tracker/st_gen_mipmap.c
index 24a072ee12e16c3472225dc2a289d629b61cc7a9,4a3e38de449a6348d877372fa7a16f97f2bd8438..b8b75c7de629189ae5d35b8e54eaf6ddfb7b5b88
--- 1/src/mesa/state_tracker/st_gen_mipmap.c
--- 2/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);
     }
  }