Attachment 123796 Details for Bug 63397 – glamor: Disable logic ops when doing compositing

[patch] glamor: Disable logic ops when doing compositing

0001-glamor-Disable-logic-ops-when-doing-compositing-v4.patch (text/plain), 1.96 KB, created by Keith Packard on 2016-05-16 21:05:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Packard

Created: 2016-05-16 21:05:13 UTC

Size: 1.96 KB

patch

obsolete

>From ec73fe2ca7a14990318bd38086acbf695de99e08 Mon Sep 17 00:00:00 2001
>From: Keith Packard <keithp@keithp.com>
>Date: Fri, 13 May 2016 04:25:43 -0700
>Subject: [PATCH xserver] glamor: Disable logic ops when doing compositing [v4]
>
>If the logic op gets left enabled, it overrides the blending
>operation, causing incorrect contents on the display.
>
>v2: Disable only on non-ES2, but disable even for PictOpSrc
>
>v3: Found another place this is needed in
>    glamor_composite_set_shader_blend
>
>v4: Remove change dependent on new glamor_set_composite_texture
>    API. This belongs in a different patch.
>    Found by Emil Velikov <emil.l.velikov@gmail.com>
>
>Signed-off-by: Keith Packard <keithp@keithp.com>
>---
> glamor/glamor_program.c | 4 ++++
> glamor/glamor_render.c  | 3 +++
> 2 files changed, 7 insertions(+)
>
>diff --git a/glamor/glamor_program.c b/glamor/glamor_program.c
>index 0a94de6..322d198 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 65f7059..4e06ff6 100644
>--- a/glamor/glamor_render.c
>+++ b/glamor/glamor_render.c
>@@ -1079,6 +1079,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);
>     }
>-- 
>2.8.0.rc3
>

Actions: View | Splinter Review

Attachments on bug 63397: 77771 | 77772 | 77773 | 77774 | 77775 | 77776 | 77777 | 81169 | 81170 | 122545 | 123796

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.