[mutter] Remove the workaround for multi-texturing with old intel drivers
- From: Tomas Frydrych <tomasf src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] Remove the workaround for multi-texturing with old intel drivers
- Date: Wed, 17 Mar 2010 16:15:02 +0000 (UTC)
commit 452025e9844e4fd0edb8769440e859b7d5e9a590
Author: Robert Bragg <robert linux intel com>
Date: Mon Jun 29 15:56:52 2009 +0100
Remove the workaround for multi-texturing with old intel drivers
The 2009 Q2 release of the drivers includes the relevent bug fix.
https://bugzilla.gnome.org/show_bug.cgi?id=613121
src/compositor/mutter-shaped-texture.c | 32 --------------------------------
1 files changed, 0 insertions(+), 32 deletions(-)
---
diff --git a/src/compositor/mutter-shaped-texture.c b/src/compositor/mutter-shaped-texture.c
index 347af0c..984374a 100644
--- a/src/compositor/mutter-shaped-texture.c
+++ b/src/compositor/mutter-shaped-texture.c
@@ -299,9 +299,6 @@ mutter_shaped_texture_paint (ClutterActor *actor)
guint tex_width, tex_height;
ClutterActorBox alloc;
CoglHandle material;
-#if 1 /* please see comment below about workaround */
- guint depth;
-#endif
if (priv->clip_region && gdk_region_empty (priv->clip_region))
return;
@@ -363,35 +360,6 @@ mutter_shaped_texture_paint (ClutterActor *actor)
}
material = priv->material;
-#if 1
- /* This was added as a workaround. It seems that with the intel
- * drivers when multi-texturing using an RGB TFP texture, the
- * texture is actually setup internally as an RGBA texture, where
- * the alpha channel is mostly 0.0 so you only see a shimmer of the
- * window. This workaround forcibly defines the alpha channel as
- * 1.0. Maybe there is some clutter/cogl state that is interacting
- * with this that is being overlooked, but for now this seems to
- * work. */
- g_object_get (stex, "pixmap-depth", &depth, NULL);
- if (depth == 24)
- {
- if (priv->material_workaround == COGL_INVALID_HANDLE)
- {
- material = priv->material_workaround = cogl_material_new ();
-
- cogl_material_set_layer_combine (material, 0,
- "RGB = MODULATE (TEXTURE, PREVIOUS)"
- "A = REPLACE (PREVIOUS)",
- NULL);
- cogl_material_set_layer_combine (material, 1,
- "RGBA = MODULATE (PREVIOUS, TEXTURE[A])",
- NULL);
- }
-
- material = priv->material_workaround;
- }
-#endif
-
cogl_material_set_layer (material, 1, priv->mask_texture);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]