Mesa (master): dri/nouveau: Combine the dummy texture more deterministically on nv0x.

[Francisco Jerez]

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

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

dri/nouveau: Combine the dummy texture more deterministically on nv0x.

---

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

diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c 
b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c
index b52922e..89c6753 100644
--- a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c
+++ b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c
@@ -300,7 +300,10 @@ nv04_emit_blend(GLcontext *ctx, int emit)
                        blend |= NV04_TEXTURED_TRIANGLE_BLEND_SHADE_MODE_FLAT;
 
                /* Texture environment. */
-               blend |= get_texenv_mode(ctx->Texture.Unit[0].EnvMode);
+               if (ctx->Texture._EnabledUnits)
+                       blend |= get_texenv_mode(ctx->Texture.Unit[0].EnvMode);
+               else
+                       blend |= get_texenv_mode(GL_MODULATE);
 
                /* Fog. */
                if (ctx->Fog.Enabled)

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