From: Michel Dänzer <daenzer@vmware.com>
Date: Fri, 26 Mar 2010 17:42:16 +0000 (+0100)
Subject: Merge branch '7.8'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=feb619b7705897ca723e8fe728f739932f743327;p=mesa.git

Merge branch '7.8'

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

feb619b7705897ca723e8fe728f739932f743327
diff --cc src/mesa/drivers/dri/swrast/swrast_spantemp.h
index 079726ae4ab,84873617147..1e9405eebfb
--- a/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;