Mesa (master): dri/nouveau: Fix up the ADD texture environment on nv0x.

[Francisco Jerez]

Module: Mesa
Branch: master
Commit: c7955f1341fd01be68c73b8a79c4b720b0645064
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c7955f1341fd01be68c73b8a79c4b720b0645064

Author: Francisco Jerez <curroje...@riseup.net>
Date:   Mon Mar  1 01:53:22 2010 +0100

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

---

 src/mesa/drivers/dri/nouveau/nv04_context.c      |    1 +
 src/mesa/drivers/dri/nouveau/nv04_state_raster.c |    2 --
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/nouveau/nv04_context.c 
b/src/mesa/drivers/dri/nouveau/nv04_context.c
index 1056171..1acd41d 100644
--- 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 6d0b262..b52922e 100644
--- 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:

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit