[clutter/wip/wayland: 24/45] Revert "wayland-surface: Add workaround to ignore alpha channel"



commit 9f2aaf411905bfca992e32f7fcc54a0bdc03fc7d
Author: Robert Bragg <robert linux intel com>
Date:   Tue Jan 10 22:19:26 2012 +0000

    Revert "wayland-surface: Add workaround to ignore alpha channel"
    
    This reverts commit 448af847f02a9aef143ac52abb795765149df679.
    
    We now have a patch for mesa that can fix the root cause of the problem.

 clutter/wayland/clutter-wayland-surface.c |   10 ----------
 1 files changed, 0 insertions(+), 10 deletions(-)
---
diff --git a/clutter/wayland/clutter-wayland-surface.c b/clutter/wayland/clutter-wayland-surface.c
index 843c84e..3f1c28e 100644
--- a/clutter/wayland/clutter-wayland-surface.c
+++ b/clutter/wayland/clutter-wayland-surface.c
@@ -323,16 +323,6 @@ clutter_wayland_surface_paint (ClutterActor *self)
                                   paint_opacity,
                                   paint_opacity,
                                   paint_opacity);
-
-      /* XXX: Currently wayland doesn't have a way to inform the compositor
-       * whether a buffer has a valid alpha component or not so we have
-       * to forcibly override the alpha component in case it contains junk.
-       */
-      cogl_material_set_layer_combine (priv->pipeline, 0,
-                                       "RGB = MODULATE (TEXTURE, PREVIOUS)"
-                                       "A = REPLACE (PREVIOUS)",
-                                       NULL);
-
       cogl_pipeline_set_layer_texture (priv->pipeline, 0,
                                        COGL_TEXTURE (priv->buffer));
     }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]