Module: Mesa Branch: master Commit: ca55a1aaa78a79ed0bc4b2410d4a8b52ef05c5b2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ca55a1aaa78a79ed0bc4b2410d4a8b52ef05c5b2
Author: Ville Syrjälä <[email protected]> Date: Mon Jun 16 20:54:32 2014 +0300 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]> --- src/mesa/drivers/dri/i915/i830_texblend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i915/i830_texblend.c b/src/mesa/drivers/dri/i915/i830_texblend.c index 6e991c4..236be59 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); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
