From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 15 Dec 2009 20:38:01 +0000 (-0800)
Subject: Merge branch 'mesa_7_6_branch' into mesa_7_7_branch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=11522b74b318db9d099466ff226124c23595e8e2;p=mesa.git

Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
	src/gallium/drivers/softpipe/sp_quad_blend.c
---

11522b74b318db9d099466ff226124c23595e8e2
diff --cc src/mesa/swrast/s_triangle.c
index d80a6761f40,a65b7b3e228..5bec6066967
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@@ -540,19 -528,21 +540,22 @@@ affine_span(GLcontext *ctx, SWspan *spa
  #define SETUP_CODE							\
     struct affine_info info;						\
     struct gl_texture_unit *unit = ctx->Texture.Unit+0;			\
 -   struct gl_texture_object *obj = 					\
 +   const struct gl_texture_object *obj = 				\
        ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];		\
 -   const GLint b = obj->BaseLevel;					\
 -   const GLfloat twidth = (GLfloat) obj->Image[0][b]->Width;		\
 -   const GLfloat theight = (GLfloat) obj->Image[0][b]->Height;		\
 -   info.texture = (const GLchan *) obj->Image[0][b]->Data;		\
 -   info.twidth_log2 = obj->Image[0][b]->WidthLog2;			\
 -   info.smask = obj->Image[0][b]->Width - 1;				\
 -   info.tmask = obj->Image[0][b]->Height - 1;				\
 -   info.format = obj->Image[0][b]->_BaseFormat;				\
 +   const struct gl_texture_image *texImg = 				\
 +      obj->Image[0][obj->BaseLevel]; 					\
 +   const GLfloat twidth = (GLfloat) texImg->Width;			\
 +   const GLfloat theight = (GLfloat) texImg->Height;			\
 +   info.texture = (const GLchan *) texImg->Data;			\
 +   info.twidth_log2 = texImg->WidthLog2;				\
 +   info.smask = texImg->Width - 1;					\
 +   info.tmask = texImg->Height - 1;					\
 +   info.format = texImg->TexFormat;					\
     info.filter = obj->MinFilter;					\
     info.envmode = unit->EnvMode;					\
+    info.er = 0;					\
+    info.eg = 0;					\
+    info.eb = 0;					\
     span.arrayMask |= SPAN_RGBA;						\
  									\
     if (info.envmode == GL_BLEND) {					\
@@@ -804,17 -802,19 +807,20 @@@ fast_persp_span(GLcontext *ctx, SWspan 
  #define SETUP_CODE							\
     struct persp_info info;						\
     const struct gl_texture_unit *unit = ctx->Texture.Unit+0;		\
 -   struct gl_texture_object *obj = 					\
 +   const struct gl_texture_object *obj = 				\
        ctx->Texture.Unit[0].CurrentTex[TEXTURE_2D_INDEX];		\
 -   const GLint b = obj->BaseLevel;					\
 -   info.texture = (const GLchan *) obj->Image[0][b]->Data;		\
 -   info.twidth_log2 = obj->Image[0][b]->WidthLog2;			\
 -   info.smask = obj->Image[0][b]->Width - 1;				\
 -   info.tmask = obj->Image[0][b]->Height - 1;				\
 -   info.format = obj->Image[0][b]->_BaseFormat;				\
 +   const struct gl_texture_image *texImg = 				\
 +      obj->Image[0][obj->BaseLevel];			 		\
 +   info.texture = (const GLchan *) texImg->Data;			\
 +   info.twidth_log2 = texImg->WidthLog2;				\
 +   info.smask = texImg->Width - 1;					\
 +   info.tmask = texImg->Height - 1;					\
 +   info.format = texImg->TexFormat;					\
     info.filter = obj->MinFilter;					\
     info.envmode = unit->EnvMode;					\
+    info.er = 0;					\
+    info.eg = 0;					\
+    info.eb = 0;					\
  									\
     if (info.envmode == GL_BLEND) {					\
        /* potential off-by-one error here? (1.0f -> 2048 -> 0) */	\