diff options
| author | Eric Anholt <[email protected]> | 2014-04-23 17:14:26 -0700 |
|---|---|---|
| committer | Eric Anholt <[email protected]> | 2014-04-30 14:33:20 -0700 |
| commit | ff9c3e8e5a22597c83505479e918981377f8fdf4 (patch) | |
| tree | dd21df42cde090b65d94cda00de32d4db6c18d89 /src/mesa/drivers/dri/i915 | |
| parent | 62d46332d8ed7a6270bc4e0520cf52668efd33b5 (diff) | |
mesa: Replace use of _ReallyEnabled as a boolean with use of _Current.
I'm probably not the only person that has tried to kill _ReallyEnabled.
This does the mechanical part of the work, and cleans _ReallyEnabled from
i965.
I think that using _Current makes texture management clearer: You can't
have multiple targets in use in the same texture image unit at the same
time, because there's just that one pointer.
Reviewed-by: Matt Turner <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri/i915')
| -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 e5542afa440..6e991c45774 100644 --- a/src/mesa/drivers/dri/i915/i830_texblend.c +++ b/src/mesa/drivers/dri/i915/i830_texblend.c @@ -446,7 +446,7 @@ i830EmitTextureBlend(struct i830_context *i830) if (ctx->Texture._MaxEnabledTexImageUnit != -1) { for (unit = 0; unit < ctx->Texture._MaxEnabledTexImageUnit; unit++) - if (ctx->Texture.Unit[unit]._ReallyEnabled) + if (ctx->Texture.Unit[unit]._Current) emit_texblend(i830, unit, blendunit++, unit == ctx->Texture._MaxEnabledTexImageUnit); } else { |