i965/vec4: Remove swizzle_for_size() in favour of brw_swizzle_for_size().

[mesa.git] / src / mesa / drivers / dri / nouveau / nv04_context.c

diff --git a/src/mesa/drivers/dri/nouveau/nv04_context.c b/src/mesa/drivers/dri/nouveau/nv04_context.c
index cd6e876f3d6611b87c6fb87b73e4374d99e21eca..3cc219beab44697cabb78efee6501d0c50c62449 100644 (file)
--- 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] &&