Merge lp:~unity-team/clutk/clutk.no-effects into lp:clutk

[David Barth]

I tested Neil's branch on my ATI and this allowed it to run Unity without crashing on effects triggers. You'll need to disable the cache in unity as well (see other proposed branch) as well as set the appropriate env. variables to disable both caches and effects:

/etc/X11/Xsession.d/10unity-quirks:
export CLUTK_DISABLE_EFFECTS=1
export UNITY_DISABLE_CACHE=1

Note: there is still an issue with QL not being rendered properly.

[Mikkel Kamstrup Erlandsen (kamstrup)]

For reference: The mentioned unity branch is lp:~dbarth/unity/disable-cache

[Mirco Müller (macslow)]

Approved.

review: Approve

=== modified file 'clutk/ctk-effect-blur.c'
--- clutk/ctk-effect-blur.c	2010-07-23 15:10:41 +0000
+++ clutk/ctk-effect-blur.c	2010-10-05 14:53:44 +0000
@@ -45,6 +45,7 @@
 #include "ctk-effect-blur.h"
 #include "ctk-private.h"
 
+gboolean ctk_get_effects_enabled ();
 
 G_DEFINE_TYPE (CtkEffectBlur, ctk_effect_blur, CTK_TYPE_EFFECT);
 
@@ -112,7 +113,7 @@
 
   if (ctk_has_capability (CTK_CAPABILITY_VERTEX_PROGRAM)
       && ctk_has_capability (CTK_CAPABILITY_FRAGMENT_PROGRAM)
-      && ctk_asm_shaders_compiled_and_ready ())
+      && ctk_asm_shaders_compiled_and_ready ()  && ctk_get_effects_enabled ())
     eff_class->paint = ctk_effect_blur_paint;
   else
     {

=== modified file 'clutk/ctk-effect-cache.c'
--- clutk/ctk-effect-cache.c	2010-09-16 20:18:58 +0000
+++ clutk/ctk-effect-cache.c	2010-10-05 14:53:44 +0000
@@ -77,9 +77,9 @@
                                    CtkEffectPaintFunc func,
                                    gboolean           is_last_effect);
 
-static void ctk_effect_cache_paint_dummy (CtkEffect          *effect,
-                                         CtkEffectPaintFunc  func,
-                                         gboolean            is_last_effect);
+// static void ctk_effect_cache_paint_dummy (CtkEffect          *effect,
+//                                          CtkEffectPaintFunc  func,
+//                                          gboolean            is_last_effect);
 
 static void ctk_effect_cache_set_property (GObject* gobject,
                                             guint prop,
@@ -118,24 +118,28 @@
 
   GObjectClass*   obj_class = G_OBJECT_CLASS (klass);
 
-  if (ctk_has_capability (CTK_CAPABILITY_VERTEX_PROGRAM)
-      && ctk_has_capability (CTK_CAPABILITY_FRAGMENT_PROGRAM)
-      && ctk_asm_shaders_compiled_and_ready ())
-    eff_class->paint = ctk_effect_cache_paint;
-  else
-    {
-      if (!ctk_has_capability (CTK_CAPABILITY_FBO) || !ctk_has_capability (CTK_CAPABILITY_VERTEX_PROGRAM) || !ctk_has_capability (CTK_CAPABILITY_FRAGMENT_PROGRAM))
-        {
-          g_message ("WARNING: CtkEffectCache cannot work without FBO and assembly shader program capabiltities");
-        }
-      else
-        {
-          if (!ctk_asm_shaders_compiled_and_ready ())
-            g_message ("WARNING: Shaders programs are not ready");
-        }
-      eff_class->paint = ctk_effect_cache_paint_dummy;
-    }
+  // Effect cache does not depend of hardware capability
+  
+//   if (ctk_has_capability (CTK_CAPABILITY_VERTEX_PROGRAM)
+//       && ctk_has_capability (CTK_CAPABILITY_FRAGMENT_PROGRAM)
+//       && ctk_asm_shaders_compiled_and_ready ())
+//     eff_class->paint = ctk_effect_cache_paint;
+//   else
+//     {
+//       if (!ctk_has_capability (CTK_CAPABILITY_FBO) || !ctk_has_capability (CTK_CAPABILITY_VERTEX_PROGRAM) || !ctk_has_capability (CTK_CAPABILITY_FRAGMENT_PROGRAM))
+//         {
+//           g_message ("WARNING: CtkEffectCache cannot work without FBO and assembly shader program capabiltities");
+//         }
+//       else
+//         {
+//           if (!ctk_asm_shaders_compiled_and_ready ())
+//             g_message ("WARNING: Shaders programs are not ready");
+//         }
+//       eff_class->paint = ctk_effect_cache_paint_dummy;
+//     }
 
+  eff_class->paint = ctk_effect_cache_paint;
+  
   obj_class->finalize     = ctk_effect_cache_finalize;
   obj_class->set_property = ctk_effect_cache_set_property;
   obj_class->get_property = ctk_effect_cache_get_property;
@@ -206,15 +210,15 @@
 /*
  * Private Methods
  */
-static void
-ctk_effect_cache_paint_dummy (CtkEffect          *effect,
-                             CtkEffectPaintFunc  paint_func,
-                             gboolean            is_last_effect)
-{
-  ClutterActor *actor = ctk_effect_get_actor (effect);
-
-  paint_func (actor);
-}
+// static void
+// ctk_effect_cache_paint_dummy (CtkEffect          *effect,
+//                              CtkEffectPaintFunc  paint_func,
+//                              gboolean            is_last_effect)
+// {
+//   ClutterActor *actor = ctk_effect_get_actor (effect);
+// 
+//   paint_func (actor);
+// }
 
 static void
 ctk_effect_cache_paint (CtkEffect         *effect,

=== modified file 'clutk/ctk-effect-drop-shadow.c'
--- clutk/ctk-effect-drop-shadow.c	2010-07-23 15:10:41 +0000
+++ clutk/ctk-effect-drop-shadow.c	2010-10-05 14:53:44 +0000
@@ -45,6 +45,8 @@
 #include "ctk-effect-drop-shadow.h"
 #include "ctk-private.h"
 
+gboolean ctk_get_effects_enabled ();
+
 G_DEFINE_TYPE (CtkEffectDropShadow, ctk_effect_drop_shadow, CTK_TYPE_EFFECT);
 
 enum
@@ -114,7 +116,7 @@
 
   if (ctk_has_capability (CTK_CAPABILITY_VERTEX_PROGRAM)
       && ctk_has_capability (CTK_CAPABILITY_FRAGMENT_PROGRAM)
-      && ctk_asm_shaders_compiled_and_ready ())
+      && ctk_asm_shaders_compiled_and_ready () && ctk_get_effects_enabled ())
     eff_class->paint = ctk_effect_drop_shadow_paint;
   else
     {

=== modified file 'clutk/ctk-effect-glow.c'
--- clutk/ctk-effect-glow.c	2010-07-27 21:04:51 +0000
+++ clutk/ctk-effect-glow.c	2010-10-05 14:53:44 +0000
@@ -46,6 +46,8 @@
 #include "ctk-private.h"
 #include "ctk-actor.h"
 
+gboolean ctk_get_effects_enabled ();
+
 G_DEFINE_TYPE (CtkEffectGlow, ctk_effect_glow, CTK_TYPE_EFFECT);
 
 enum
@@ -130,7 +132,7 @@
 
   if (ctk_has_capability (CTK_CAPABILITY_VERTEX_PROGRAM)
       && ctk_has_capability (CTK_CAPABILITY_FRAGMENT_PROGRAM)
-      && ctk_asm_shaders_compiled_and_ready ())
+      && ctk_asm_shaders_compiled_and_ready () && ctk_get_effects_enabled ())
     eff_class->paint = ctk_effect_glow_paint;
   else
     {

=== modified file 'clutk/ctk-effect.c'
--- clutk/ctk-effect.c	2010-05-28 09:31:10 +0000
+++ clutk/ctk-effect.c	2010-10-05 14:53:44 +0000
@@ -34,6 +34,7 @@
 #endif
 
 #include "ctk-effect.h"
+#include "ctk-main.h"
 
 #include <memory.h>
 #include <gobject/gvaluecollector.h>
@@ -476,8 +477,15 @@
   g_return_if_fail (CTK_IS_EFFECT (self));
   klass = CTK_EFFECT_GET_CLASS (self);
 
-  if (klass->paint)
-    klass->paint (self, func, is_last_effect);
+  if (ctk_get_effects_enabled ())
+    {
+      if (klass->paint)
+        klass->paint (self, func, is_last_effect);
+    }
+  else
+    {
+      (func) (self->_actor);
+    }
 }
 
 /**

=== modified file 'clutk/ctk-main.c'
--- clutk/ctk-main.c	2010-08-23 16:04:09 +0000
+++ clutk/ctk-main.c	2010-10-05 14:53:44 +0000
@@ -76,6 +76,8 @@
 
 static gdouble pixel_per_em = 10.0f;
 
+static gboolean effects_enabled = TRUE;
+
 /* Private Methods */
 static void
 get_capabilities ()
@@ -253,6 +255,12 @@
           has_glsl_1_40 = TRUE;
         }
     }
+    
+//   if (ctk_get_effects_enabled () == FALSE)
+//     {
+//         has_vertex_program = 0;
+//         has_fragment_program = 0;
+//     }
 }
 
 static void
@@ -426,14 +434,29 @@
       g_warning ("CluTK has already been intialised");
       return;
     }
-  get_capabilities ();
-
-  create_asm_shader_programs ();
 
   calculate_pixel_per_em ();
 
   set_font_options ();
 
+  if (g_strcmp0 (g_getenv ("CLUTK_DISABLE_EFFECTS"), "1") == 0)
+    {
+      //g_message ("CLUTK_DISABLE_EFFECTS=1 : Disabling effects");
+      effects_enabled = FALSE;
+      get_capabilities ();
+      create_asm_shader_programs ();
+    }
+  else
+    {
+      get_capabilities ();
+      create_asm_shader_programs ();
+    }
+  
+  if (!effects_enabled)
+    {
+      //g_message ("Effects disabled! Some GL-extension support missing or forcefully turned off.");
+    }
+    
   ctk_inited = TRUE;
 }
 
@@ -864,3 +887,9 @@
   cairo_surface_mark_dirty (surface);	
 }
 
+gboolean
+ctk_get_effects_enabled ()
+{
+  return effects_enabled;
+}
+

=== modified file 'clutk/ctk-main.h'
--- clutk/ctk-main.h	2010-02-23 11:11:51 +0000
+++ clutk/ctk-main.h	2010-10-05 14:53:44 +0000
@@ -38,6 +38,7 @@
 gdouble  ctk_pixel_to_em    (gint pixel_value);
 gdouble  ctk_em_to_pixel    (gdouble em_value);
 void     ctk_surface_blur   (cairo_surface_t* surface, guint radius);
+gboolean ctk_get_effects_enabled ();
 
 G_END_DECLS
 

=== modified file 'clutk/ctk-menu-expandable.c'
--- clutk/ctk-menu-expandable.c	2010-09-16 00:12:23 +0000
+++ clutk/ctk-menu-expandable.c	2010-10-05 14:53:44 +0000
@@ -385,9 +385,12 @@
 
   gint Threshold = CTK_MENU_EXPANDABLE_TRANSITION_STEPS;
 
-  ctk_menu_expandable_blurred_bkg (menu, x, y,
+  if (ctk_get_effects_enabled ())
+    {
+      ctk_menu_expandable_blurred_bkg (menu, x, y,
                                    actor_w + 2*ctk_menu_expandable_get_padding (menu),
                                    actor_h + 2*ctk_menu_expandable_get_corner_radius (menu) + 2*ctk_menu_expandable_get_padding (menu));
+    }
 
   //////////////////////////////////////////////////////////////////////////////////////
   // Top Part