dri/nouveau: Fix up the ADD texture environment on nv0x.

diff --git a/src/mesa/drivers/dri/nouveau/nv04_context.c b/src/mesa/drivers/dri/nouveau/nv04_context.c
index 1056171342ced506c3023ef3d9c7a5fbd64d693c..1acd41de54d43df7ae4688fd2295801527eeb085 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv04_context.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_context.c
@@ -40,6 +40,7 @@ nv04_context_engine(GLcontext *ctx)
 
        if (ctx->Texture.Unit[0].EnvMode == GL_COMBINE ||
            ctx->Texture.Unit[0].EnvMode == GL_BLEND ||
+           ctx->Texture.Unit[0].EnvMode == GL_ADD ||
            ctx->Texture.Unit[1]._ReallyEnabled ||
            ctx->Stencil.Enabled)
                fahrenheit = hw->eng3dm;

diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c
index 6d0b262a4d3670de6f7870271a23e6f7da79fb55..b52922ea111170fadb99b36c11af52f592a03791 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c
@@ -82,8 +82,6 @@ get_texenv_mode(unsigned mode)
        switch (mode) {
        case GL_REPLACE:
                return 0x1;
-       case GL_ADD:
-               return 0x2;
        case GL_DECAL:
                return 0x3;
        case GL_MODULATE: