diff options
| author | Ville Syrjälä <[email protected]> | 2014-06-16 20:54:32 +0300 |
|---|---|---|
| committer | Ville Syrjälä <[email protected]> | 2014-06-23 12:42:00 +0300 |
| commit | ca55a1aaa78a79ed0bc4b2410d4a8b52ef05c5b2 (patch) | |
| tree | 72964778188298591a52e979a7ef1c3b3edc273b /src | |
| parent | c822db6a05d6f9919e6f0acf6cf6242c173ce21a (diff) | |
i915: Fix gen2 texblend setup
Fix an off by one in the texture unit walk during texblend
setup on gen2. This caused the last enabled texunit to be
skipped resulting in totally messed up texturing.
This is a regression introduced here:
commit 1ad443ecdd694dd9bf3c4a5050d749fb80db6fa2
Author: Eric Anholt <[email protected]>
Date: Wed Apr 23 15:35:27 2014 -0700
i915: Redo texture unit walking on i830.
Reviewed-by: Ian Romanick <[email protected]>
Cc: "10.2" <[email protected]>
Signed-off-by: Ville Syrjälä <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i830_texblend.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915/i830_texblend.c b/src/mesa/drivers/dri/i915/i830_texblend.c index 6e991c45774..236be59e239 100644 --- a/src/mesa/drivers/dri/i915/i830_texblend.c +++ b/src/mesa/drivers/dri/i915/i830_texblend.c @@ -445,7 +445,7 @@ i830EmitTextureBlend(struct i830_context *i830) I830_ACTIVESTATE(i830, I830_UPLOAD_TEXBLEND_ALL, false); if (ctx->Texture._MaxEnabledTexImageUnit != -1) { - for (unit = 0; unit < ctx->Texture._MaxEnabledTexImageUnit; unit++) + for (unit = 0; unit <= ctx->Texture._MaxEnabledTexImageUnit; unit++) if (ctx->Texture.Unit[unit]._Current) emit_texblend(i830, unit, blendunit++, unit == ctx->Texture._MaxEnabledTexImageUnit); |