From: Francisco Jerez <currojerez@riseup.net>
Date: Mon, 1 Mar 2010 00:56:38 +0000 (+0100)
Subject: dri/nouveau: Combine the dummy texture more deterministically on nv0x.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e7ca0e126e1b838d7650eb480adfd548723bcea9;p=mesa.git

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

diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c
index b52922ea111..89c6753694c 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)