Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

[mesa.git] / src / mesa / swrast / s_triangle.c

diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index d80a6761f406d45aca3b3dc2f22a85239361b99d..5bec6066967232a3cd5521eaeca89539c58f4cce 100644 (file)
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -553,6 +553,9 @@ affine_span(GLcontext *ctx, SWspan *span,
    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) {                                     \
@@ -815,6 +818,9 @@ fast_persp_span(GLcontext *ctx, SWspan *span,
    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) */       \