Merge branch '7.8'

Conflicts:
	src/mesa/drivers/dri/intel/intel_mipmap_tree.c - left what was in master

diff --cc src/mesa/drivers/dri/swrast/swrast_span.c
Simple merge

diff --cc src/mesa/drivers/dri/swrast/swrast_spantemp.h
index 079726ae4abfc2488da04ad1b34d432281587f9f,8487361714746ccf2ed51d358e57ba578ae8dc87..1e9405eebfba725d47373a3416f9e7fbf0c19171
--- 1/src/mesa/drivers/dri/swrast/swrast_spantemp.h
--- 2/src/mesa/drivers/dri/swrast/swrast_spantemp.h
+++ b/src/mesa/drivers/dri/swrast/swrast_spantemp.h
@@@ -37,10 -37,10 +37,10 @@@
  #define _SWRAST_SPANTEMP_ONCE
  
  static INLINE void
- PUT_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLubyte *p )
+ PUT_PIXEL( GLcontext *glCtx, GLint x, GLint y, GLvoid *p )
  {
 -    __DRIcontext *ctx = swrast_context(glCtx);
 -    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer);
 +    __DRIcontext *ctx = swrast_context(glCtx)->cPriv;
 +    __DRIdrawable *draw = swrast_drawable(glCtx->DrawBuffer)->dPriv;
  
      __DRIscreen *screen = ctx->driScreenPriv;