diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-03-01 01:56:38 +0100 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2010-03-01 02:07:01 +0100 |
| commit | e7ca0e126e1b838d7650eb480adfd548723bcea9 (patch) | |
| tree | 58056b0df0f9e347d6ce3e69561fc385efa9edfb /src | |
| parent | c7955f1341fd01be68c73b8a79c4b720b0645064 (diff) | |
dri/nouveau: Combine the dummy texture more deterministically on nv0x.
Diffstat (limited to 'src')
| -rw-r--r-- | 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 b52922ea11..89c6753694 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) |