diff options
Diffstat (limited to 'glamor')
| -rw-r--r-- | glamor/glamor_program.c | 4 | ||||
| -rw-r--r-- | glamor/glamor_render.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/glamor/glamor_program.c b/glamor/glamor_program.c index 0a94de62f..322d1983d 100644 --- a/glamor/glamor_program.c +++ b/glamor/glamor_program.c @@ -445,6 +445,7 @@ static struct blendinfo composite_op_info[] = { static void glamor_set_blend(CARD8 op, glamor_program_alpha alpha, PicturePtr dst) { + glamor_screen_private *glamor_priv = glamor_get_screen_private(dst->pDrawable->pScreen); GLenum src_blend, dst_blend; struct blendinfo *op_info; @@ -459,6 +460,9 @@ glamor_set_blend(CARD8 op, glamor_program_alpha alpha, PicturePtr dst) break; } + if (glamor_priv->gl_flavor != GLAMOR_GL_ES2) + glDisable(GL_COLOR_LOGIC_OP); + if (op == PictOpSrc) return; diff --git a/glamor/glamor_render.c b/glamor/glamor_render.c index 88781d9b8..aa3a56694 100644 --- a/glamor/glamor_render.c +++ b/glamor/glamor_render.c @@ -1091,6 +1091,9 @@ glamor_composite_set_shader_blend(glamor_screen_private *glamor_priv, } } + if (glamor_priv->gl_flavor != GLAMOR_GL_ES2) + glDisable(GL_COLOR_LOGIC_OP); + if (op_info->source_blend == GL_ONE && op_info->dest_blend == GL_ZERO) { glDisable(GL_BLEND); } |