diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-11-12 15:27:52 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-11-12 15:27:52 +0000 |
| commit | 57857ca0925116d6d254fef7e705cfe0b650d77f (patch) | |
| tree | 64d4b8ed52bafda589d9abf66a460402f92c97a4 /src/mesa/main/blend.c | |
| parent | 80ee4b1e9dbf62f9aa86c3b8531615d14f077dd9 (diff) | |
Ville Syrjala's logic op patch
Diffstat (limited to 'src/mesa/main/blend.c')
| -rw-r--r-- | src/mesa/main/blend.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c index e3cdbffcd10..e5032bf1bb6 100644 --- a/src/mesa/main/blend.c +++ b/src/mesa/main/blend.c @@ -334,8 +334,9 @@ _mesa_BlendEquation( GLenum mode ) /* This is needed to support 1.1's RGB logic ops AND * 1.0's blending logicops. */ - ctx->Color.ColorLogicOpEnabled = (mode==GL_LOGIC_OP && - ctx->Color.BlendEnabled); + ctx->Color._LogicOpEnabled = (ctx->Color.ColorLogicOpEnabled || + (ctx->Color.BlendEnabled && + mode == GL_LOGIC_OP)); if (ctx->Driver.BlendEquation) (*ctx->Driver.BlendEquation)( ctx, mode ); @@ -572,6 +573,7 @@ void _mesa_init_color( GLcontext * ctx ) ASSIGN_4V( ctx->Color.BlendColor, 0.0, 0.0, 0.0, 0.0 ); ctx->Color.IndexLogicOpEnabled = GL_FALSE; ctx->Color.ColorLogicOpEnabled = GL_FALSE; + ctx->Color._LogicOpEnabled = GL_FALSE; ctx->Color.LogicOp = GL_COPY; ctx->Color.DitherFlag = GL_TRUE; |