aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/swrast/s_context.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-20 10:51:44 +0200
committermarha <marha@users.sourceforge.net>2011-09-20 10:51:44 +0200
commit5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1 (patch)
treeb7206e85fd135f1cf45c1db3ad85d3dc7c2fa2d3 /mesalib/src/mesa/swrast/s_context.c
parent97f357506241a5314de9071befcd01be731f1dbb (diff)
parent0470a59df89ab453bdbe0fc2f820278cfffdc61c (diff)
downloadvcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.gz
vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.tar.bz2
vcxsrv-5921af43b0a9b04c0c6b7d3c1e042e05bd3acbb1.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/swrast/s_context.c')
-rw-r--r--mesalib/src/mesa/swrast/s_context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/swrast/s_context.c b/mesalib/src/mesa/swrast/s_context.c
index 7651eaf22..0c33dff12 100644
--- a/mesalib/src/mesa/swrast/s_context.c
+++ b/mesalib/src/mesa/swrast/s_context.c
@@ -72,7 +72,7 @@ _swrast_update_rasterflags( struct gl_context *ctx )
break;
}
}
- if (ctx->Color._LogicOpEnabled) rasterMask |= LOGIC_OP_BIT;
+ if (ctx->Color.ColorLogicOpEnabled) rasterMask |= LOGIC_OP_BIT;
if (ctx->Texture._EnabledUnits) rasterMask |= TEXTURE_BIT;
if ( ctx->Viewport.X < 0
|| ctx->Viewport.X + ctx->Viewport.Width > (GLint) ctx->DrawBuffer->Width