cogl: glBlendEquationSeparate is always available
So we don't need glBlendEquation. https://gitlab.gnome.org/GNOME/mutter/merge_requests/903
This commit is contained in:
parent
6944839ab6
commit
07ca100130
@ -216,16 +216,6 @@ validate_blend_statements (CoglBlendStringStatement *statements,
|
|||||||
|
|
||||||
_COGL_GET_CONTEXT (ctx, 0);
|
_COGL_GET_CONTEXT (ctx, 0);
|
||||||
|
|
||||||
if (n_statements == 2 &&
|
|
||||||
!ctx->glBlendEquationSeparate &&
|
|
||||||
statements[0].function->type != statements[1].function->type)
|
|
||||||
{
|
|
||||||
error_string = "Separate blend functions for the RGB an A "
|
|
||||||
"channels isn't supported by the driver";
|
|
||||||
detail = COGL_BLEND_STRING_ERROR_GPU_UNSUPPORTED_ERROR;
|
|
||||||
goto error;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < n_statements; i++)
|
for (i = 0; i < n_statements; i++)
|
||||||
for (j = 0; j < statements[i].function->argc; j++)
|
for (j = 0; j < statements[i].function->argc; j++)
|
||||||
{
|
{
|
||||||
|
@ -495,14 +495,8 @@ _cogl_pipeline_flush_color_blend_alpha_depth_state (
|
|||||||
GE (ctx, glBlendColor (red, green, blue, alpha));
|
GE (ctx, glBlendColor (red, green, blue, alpha));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ctx->glBlendEquationSeparate &&
|
GE (ctx, glBlendEquationSeparate (blend_state->blend_equation_rgb,
|
||||||
blend_state->blend_equation_rgb !=
|
blend_state->blend_equation_alpha));
|
||||||
blend_state->blend_equation_alpha)
|
|
||||||
GE (ctx,
|
|
||||||
glBlendEquationSeparate (blend_state->blend_equation_rgb,
|
|
||||||
blend_state->blend_equation_alpha));
|
|
||||||
else
|
|
||||||
GE (ctx, glBlendEquation (blend_state->blend_equation_rgb));
|
|
||||||
|
|
||||||
if (ctx->glBlendFuncSeparate &&
|
if (ctx->glBlendFuncSeparate &&
|
||||||
(blend_state->blend_src_factor_rgb !=
|
(blend_state->blend_src_factor_rgb !=
|
||||||
|
@ -121,8 +121,6 @@ COGL_EXT_BEGIN (blending, 1, 2,
|
|||||||
COGL_EXT_IN_GLES2,
|
COGL_EXT_IN_GLES2,
|
||||||
"\0",
|
"\0",
|
||||||
"\0")
|
"\0")
|
||||||
COGL_EXT_FUNCTION (void, glBlendEquation,
|
|
||||||
(GLenum mode))
|
|
||||||
COGL_EXT_FUNCTION (void, glBlendColor,
|
COGL_EXT_FUNCTION (void, glBlendColor,
|
||||||
(GLclampf red,
|
(GLclampf red,
|
||||||
GLclampf green,
|
GLclampf green,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user