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/nouveau/nv04_context.c | |
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/nouveau/nv04_context.c')
-rw-r--r-- | src/mesa/drivers/dri/nouveau/nv04_context.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nv04_context.c b/src/mesa/drivers/dri/nouveau/nv04_context.c index cd6e876f3d6..3cc219beab4 100644 --- a/src/mesa/drivers/dri/nouveau/nv04_context.c +++ b/src/mesa/drivers/dri/nouveau/nv04_context.c @@ -53,9 +53,9 @@ nv04_context_engine(struct gl_context *ctx) struct nouveau_pushbuf *push = context_push(ctx); struct nouveau_object *fahrenheit; - if ((ctx->Texture.Unit[0]._ReallyEnabled && + if ((ctx->Texture.Unit[0]._Current && texunit_needs_combiners(&ctx->Texture.Unit[0])) || - ctx->Texture.Unit[1]._ReallyEnabled || + ctx->Texture.Unit[1]._Current || ctx->Stencil.Enabled || !(ctx->Color.ColorMask[0][RCOMP] && ctx->Color.ColorMask[0][GCOMP] && |