diff options
| author | Francisco Jerez <currojerez@riseup.net> | 2010-03-01 01:53:22 +0100 |
|---|---|---|
| committer | Francisco Jerez <currojerez@riseup.net> | 2010-03-01 02:07:01 +0100 |
| commit | c7955f1341fd01be68c73b8a79c4b720b0645064 (patch) | |
| tree | 6ffda5fb61dc15fdf1e8b1fd58083e43f9e35434 /src | |
| parent | 394672659ddc1175747bae29fbf9957365d61e4c (diff) | |
dri/nouveau: Fix up the ADD texture environment on nv0x.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv04_context.c | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nv04_state_raster.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv04_context.c b/src/mesa/drivers/dri/nouveau/nv04_context.c index 1056171342..1acd41de54 100644 --- a/src/mesa/drivers/dri/nouveau/nv04_context.c +++ b/src/mesa/drivers/dri/nouveau/nv04_context.c @@ -40,6 +40,7 @@ nv04_context_engine(GLcontext *ctx) if (ctx->Texture.Unit[0].EnvMode == GL_COMBINE || ctx->Texture.Unit[0].EnvMode == GL_BLEND || + ctx->Texture.Unit[0].EnvMode == GL_ADD || ctx->Texture.Unit[1]._ReallyEnabled || ctx->Stencil.Enabled) fahrenheit = hw->eng3dm; diff --git a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c index 6d0b262a4d..b52922ea11 100644 --- a/src/mesa/drivers/dri/nouveau/nv04_state_raster.c +++ b/src/mesa/drivers/dri/nouveau/nv04_state_raster.c @@ -82,8 +82,6 @@ get_texenv_mode(unsigned mode) switch (mode) { case GL_REPLACE: return 0x1; - case GL_ADD: - return 0x2; case GL_DECAL: return 0x3; case GL_MODULATE: |