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

This commit is contained in:
Francisco Jerez 2010-03-01 01:56:38 +01:00
parent c7955f1341
commit e7ca0e126e
1 changed files with 4 additions and 1 deletions

View File

@ -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)