[clutter/f15/master] Fix icon corruption in gnome-shell

Matthias Clasen mclasen at fedoraproject.org
Thu Mar 3 00:32:32 UTC 2011


commit b31d8c6e600adb99869f7c8dbc9992c2a02a37ff
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Wed Mar 2 19:31:44 2011 -0500

    Fix icon corruption in gnome-shell

 texture-blending.patch |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/texture-blending.patch b/texture-blending.patch
new file mode 100644
index 0000000..7e763c2
--- /dev/null
+++ b/texture-blending.patch
@@ -0,0 +1,30 @@
+From 4dd20f2678195524dd147db3fe902d0a93de3df0 Mon Sep 17 00:00:00 2001
+From: Neil Roberts <neil at linux.intel.com>
+Date: Thu, 24 Feb 2011 18:42:47 +0000
+Subject: cogl-blit: Disable blending when using texture render
+
+When using a pipeline and the journal to blit images between
+framebuffers, it should disable blending. Otherwise it will end up
+blending the source texture with uninitialised garbage in the
+destination texture.
+---
+diff --git a/clutter/cogl/cogl/cogl-blit.c b/clutter/cogl/cogl/cogl-blit.c
+index 1c40e34..255f77c 100644
+--- a/clutter/cogl/cogl/cogl-blit.c
++++ b/clutter/cogl/cogl/cogl-blit.c
+@@ -78,6 +78,12 @@ _cogl_blit_texture_render_begin (CoglBlitData *data)
+       cogl_pipeline_set_layer_filters (ctx->blit_texture_pipeline, 0,
+                                        COGL_PIPELINE_FILTER_NEAREST,
+                                        COGL_PIPELINE_FILTER_NEAREST);
++
++      /* Disable blending by just directly taking the contents of the
++         source texture */
++      cogl_pipeline_set_blend (ctx->blit_texture_pipeline,
++                               "RGBA = ADD(SRC_COLOR, 0)",
++                               NULL);
+     }
+ 
+   pipeline = ctx->blit_texture_pipeline;
+--
+cgit v0.8.3.1-30-gff3a
+


More information about the scm-commits mailing list