summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorFrancisco Jerez <[email protected]>2010-03-01 01:56:38 +0100
committerFrancisco Jerez <[email protected]>2010-03-01 02:07:01 +0100
commite7ca0e126e1b838d7650eb480adfd548723bcea9 (patch)
tree58056b0df0f9e347d6ce3e69561fc385efa9edfb /src/mesa
parentc7955f1341fd01be68c73b8a79c4b720b0645064 (diff)
dri/nouveau: Combine the dummy texture more deterministically on nv0x.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/nouveau/nv04_state_raster.c5
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 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)