diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/blend.c | 19 | ||||
| -rw-r--r-- | src/mesa/main/extensions.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/state.h | 3 |
4 files changed, 8 insertions, 17 deletions
diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c index 4214a661bb8..4dcc0b9d2a3 100644 --- a/src/mesa/main/blend.c +++ b/src/mesa/main/blend.c @@ -285,8 +285,7 @@ _mesa_BlendFuncSeparatei(GLuint buf, GLenum sfactorRGB, GLenum dfactorRGB, * \return GL_TRUE if legal, GL_FALSE otherwise. */ static GLboolean -legal_blend_equation(const struct gl_context *ctx, - GLenum mode, GLboolean is_separate) +legal_blend_equation(const struct gl_context *ctx, GLenum mode) { switch (mode) { case GL_FUNC_ADD: @@ -294,10 +293,6 @@ legal_blend_equation(const struct gl_context *ctx, case GL_MIN: case GL_MAX: return ctx->Extensions.EXT_blend_minmax; - case GL_LOGIC_OP: - /* glBlendEquationSeparate cannot take GL_LOGIC_OP as a parameter. - */ - return ctx->Extensions.EXT_blend_logic_op && !is_separate; case GL_FUNC_SUBTRACT: case GL_FUNC_REVERSE_SUBTRACT: return ctx->Extensions.EXT_blend_subtract; @@ -320,7 +315,7 @@ _mesa_BlendEquation( GLenum mode ) _mesa_debug(ctx, "glBlendEquation(%s)\n", _mesa_lookup_enum_by_nr(mode)); - if (!legal_blend_equation(ctx, mode, GL_FALSE)) { + if (!legal_blend_equation(ctx, mode)) { _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquation"); return; } @@ -370,7 +365,7 @@ _mesa_BlendEquationi(GLuint buf, GLenum mode) return; } - if (!legal_blend_equation(ctx, mode, GL_FALSE)) { + if (!legal_blend_equation(ctx, mode)) { _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationi"); return; } @@ -408,12 +403,12 @@ _mesa_BlendEquationSeparateEXT( GLenum modeRGB, GLenum modeA ) return; } - if (!legal_blend_equation(ctx, modeRGB, GL_TRUE)) { + if (!legal_blend_equation(ctx, modeRGB)) { _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparateEXT(modeRGB)"); return; } - if (!legal_blend_equation(ctx, modeA, GL_TRUE)) { + if (!legal_blend_equation(ctx, modeA)) { _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparateEXT(modeA)"); return; } @@ -464,12 +459,12 @@ _mesa_BlendEquationSeparatei(GLuint buf, GLenum modeRGB, GLenum modeA) return; } - if (!legal_blend_equation(ctx, modeRGB, GL_TRUE)) { + if (!legal_blend_equation(ctx, modeRGB)) { _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparatei(modeRGB)"); return; } - if (!legal_blend_equation(ctx, modeA, GL_TRUE)) { + if (!legal_blend_equation(ctx, modeA)) { _mesa_error(ctx, GL_INVALID_ENUM, "glBlendEquationSeparatei(modeA)"); return; } diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index a3b6f5611e9..e1b8f8df03a 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -153,7 +153,6 @@ static const struct extension extension_table[] = { { "GL_EXT_blend_color", o(EXT_blend_color), GL, 1995 }, { "GL_EXT_blend_equation_separate", o(EXT_blend_equation_separate), GL, 2003 }, { "GL_EXT_blend_func_separate", o(EXT_blend_func_separate), GL, 1999 }, - { "GL_EXT_blend_logic_op", o(EXT_blend_logic_op), GL, 1995 }, { "GL_EXT_blend_minmax", o(EXT_blend_minmax), GL | ES1 | ES2, 1995 }, { "GL_EXT_blend_subtract", o(EXT_blend_subtract), GL, 1995 }, { "GL_EXT_clip_volume_hint", o(EXT_clip_volume_hint), GL, 1996 }, @@ -471,7 +470,6 @@ _mesa_enable_sw_extensions(struct gl_context *ctx) ctx->Extensions.EXT_blend_color = GL_TRUE; ctx->Extensions.EXT_blend_equation_separate = GL_TRUE; ctx->Extensions.EXT_blend_func_separate = GL_TRUE; - ctx->Extensions.EXT_blend_logic_op = GL_TRUE; ctx->Extensions.EXT_blend_minmax = GL_TRUE; ctx->Extensions.EXT_blend_subtract = GL_TRUE; ctx->Extensions.EXT_depth_bounds_test = GL_TRUE; diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 429c8b43075..d25d1a021a9 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2826,7 +2826,6 @@ struct gl_extensions GLboolean EXT_blend_color; GLboolean EXT_blend_equation_separate; GLboolean EXT_blend_func_separate; - GLboolean EXT_blend_logic_op; GLboolean EXT_blend_minmax; GLboolean EXT_blend_subtract; GLboolean EXT_clip_volume_hint; diff --git a/src/mesa/main/state.h b/src/mesa/main/state.h index a48c777567f..7ff1c5b59b3 100644 --- a/src/mesa/main/state.h +++ b/src/mesa/main/state.h @@ -79,8 +79,7 @@ _mesa_need_secondary_color(const struct gl_context *ctx) static INLINE GLboolean _mesa_rgba_logicop_enabled(const struct gl_context *ctx) { - return ctx->Color.ColorLogicOpEnabled || - (ctx->Color.BlendEnabled && ctx->Color.Blend[0].EquationRGB == GL_LOGIC_OP); + return ctx->Color.ColorLogicOpEnabled; } |