[WIP] bumpmaps - rework and turn on

src/st/st-background-effect.h

@@ -2,70 +2,99 @@
 #define __ST_BACKGROUND_EFFECT_H__
 
 #include <clutter/clutter.h>
+
 G_BEGIN_DECLS
-#define ST_TYPE_BACKGROUND_EFFECT        (st_background_effect_get_type ())
-#define ST_BACKGROUND_EFFECT(obj)        (G_TYPE_CHECK_INSTANCE_CAST ((obj), ST_TYPE_BACKGROUND_EFFECT, StBackgroundEffect))
-#define ST_IS_BACKGROUND_EFFECT(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ST_TYPE_BACKGROUND_EFFECT))
+#define ST_TYPE_BACKGROUND_BLUR_EFFECT        (st_background_blur_effect_get_type ())
+#define ST_TYPE_BACKGROUND_BUMPMAP_EFFECT        (st_background_bumpmap_effect_get_type ())
+
+#define ST_BACKGROUND_BLUR_EFFECT(obj)        (G_TYPE_CHECK_INSTANCE_CAST ((obj), ST_TYPE_BACKGROUND_BLUR_EFFECT, StBackgroundBlurEffect))
+#define ST_IS_BACKGROUND_BLUR_EFFECT(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ST_TYPE_BACKGROUND_EFFECT))
+
+#define ST_BACKGROUND_BUMPMAP_EFFECT(obj)        (G_TYPE_CHECK_INSTANCE_CAST ((obj), ST_TYPE_BACKGROUND_BUMPMAP_EFFECT, StBackgroundBumpmapEffect))
+#define ST_IS_BACKGROUND_BUMPMAP_EFFECT(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ST_TYPE_BACKGROUND_BUMPMAP_EFFECT))
 
-typedef struct _StBackgroundEffect        StBackgroundEffect;
-typedef struct _StBackgroundEffectClass   StBackgroundEffectClass;
+typedef struct _StBackgroundBlurEffect        StBackgroundBlurEffect;
+typedef struct _StBackgroundBlurEffectClass   StBackgroundBlurEffectClass;
 
+typedef struct _StBackgroundBumpmapEffect        StBackgroundBumpmapEffect;
+typedef struct _StBackgroundBumpmapEffectClass   StBackgroundBumpmapEffectClass;
 /* object */
 
-struct _StBackgroundEffect
+struct _StBackgroundBlurEffect
 {
     ClutterOffscreenEffect parent_instance;
 
     ClutterActor *actor;
-    CoglHandle bg_texture;
-    CoglHandle bg_sub_texture;
-    CoglHandle bg_bumpmap;
-    gchar* bumpmap_location;
+    CoglTexture  *bg_texture;
+    CoglTexture *corner_texture;
 
-    gint pixel_step_uniform0;
-    gint pixel_step_uniform1;
-    gint pixel_step_uniform2;
-    gint BumpTex_uniform;
-    gint bump_step_uniform;
+    gint pixel_step_uniform;
+    gint blur_size;
+    int border_radius[4];
 
-    gint bg_posx_i;
-    gint bg_posy_i;
+    gint bg_posx;
+    gint bg_posy;
 
-    gint bg_width_i;
-    gint bg_height_i;
+    gint bg_width;
+    gint bg_height;
 
-    gint fg_width_i;
-    gint fg_height_i;
+    CoglPipeline *pipeline1;
+};
 
-    gint bumptex_width_i;
-    gint bumptex_height_i;
+struct _StBackgroundBumpmapEffect
+{
+    ClutterOffscreenEffect parent_instance;
 
-    gfloat posx_old;
-    gfloat posy_old;
-    gfloat width_old;
-    gfloat height_old;
+    ClutterActor *actor;
+    CoglTexture  *bg_texture;
+    CoglTexture *corner_texture;
+    CoglHandle    bg_bumpmap;
+    char         *bumpmap_path;
 
-    CoglPipeline *pipeline0;
-    CoglPipeline *pipeline1;
-    CoglPipeline *pipeline2;
-    CoglPipeline *pipeline3;
-    CoglPipeline *pipeline4;
+    gint pixel_step_uniform0;
+    gint BumpTex_uniform;
+    gint bump_step_uniform;
+    int border_radius[4];
+
+    gint bg_posx;
+    gint bg_posy;
+
+    gint bg_width;
+    gint bg_height;
+
+    gint bumptex_width;
+    gint bumptex_height;
 
-    glong old_time;
-    guint8 opacity;
+    CoglPipeline *pipeline0;
 };
 
 /* class */
 
-struct _StBackgroundEffectClass
+struct _StBackgroundBlurEffectClass
+{
+    ClutterOffscreenEffectClass parent_class;
+    CoglPipeline *base_pipeline;
+    gboolean changed;
+};
+struct _StBackgroundBumpmapEffectClass
 {
     ClutterOffscreenEffectClass parent_class;
     CoglPipeline *base_pipeline;
+    gboolean changed;
 };
 
-GType   st_background_effect_get_type (void) G_GNUC_CONST;
+GType   st_background_blur_effect_get_type (void) G_GNUC_CONST;
+GType   st_background_bumpmap_effect_get_type (void) G_GNUC_CONST;
+
+ClutterEffect *st_background_blur_effect_new (void);
+ClutterEffect *st_background_bumpmap_effect_new (void);
 
-ClutterEffect *st_background_effect_new (void);
+gboolean st_paint_background_blur_effect (StBackgroundBlurEffect *background_blur_effect,
+                                     CoglFramebuffer     *fb,
+                                     const ClutterActorBox *box);
+gboolean st_paint_background_bumpmap_effect (StBackgroundBumpmapEffect *background_blur_effect,
+                                     CoglFramebuffer     *fb,
+                                     const ClutterActorBox *box);
 
 G_END_DECLS
 #endif /* __ST_BACKGROUND_EFFECT_H__ */

src/st/st-theme-node-drawing.c

@@ -36,6 +36,7 @@
 #include "st-texture-cache.h"
 #include "st-theme-node-private.h"
 #include "st-cogl-wrapper.h"
+#include "st-background-effect.h"
 
 /****
  * Rounded corners
@@ -1999,7 +2000,9 @@ void
 st_theme_node_paint (StThemeNode           *node,
                      CoglFramebuffer       *fb,
                      const ClutterActorBox *box,
-                     guint8                 paint_opacity)
+                     guint8                 paint_opacity,
+                     StBackgroundBlurEffect    *background_blur_effect,
+                     StBackgroundBumpmapEffect *background_bumpmap_effect)
 {
   float width, height;
   ClutterActorBox allocation;
@@ -2043,6 +2046,18 @@ st_theme_node_paint (StThemeNode           *node,
    *    such that it's aligned to the outside edges)
    */
 
+
+  /* if there is a background effect then paint it first as a bottom layer
+     i.e. the existing background under the actor will be found, an effect
+     generated and applied to it, and then the new background is written out
+     over the existing background. */
+
+  if (background_blur_effect)
+      st_paint_background_blur_effect (background_blur_effect, fb, box);
+
+  if (background_bumpmap_effect)
+      st_paint_background_bumpmap_effect (background_bumpmap_effect, fb, box);
+
   if (node->box_shadow_material)
     _st_paint_shadow_with_opacity (node->box_shadow,
                                    node->box_shadow_material,

src/st/st-theme-node-private.h

@@ -71,6 +71,7 @@ struct _StThemeNode {
 
   char *background_image;
   char *background_bumpmap;
+  int background_blur;
   StBorderImage *border_image;
   StShadow *box_shadow;
   StShadow *background_image_shadow;

src/st/st-theme-node-transition.c

@@ -314,10 +314,9 @@ setup_framebuffers (StThemeNodeTransition *transition,
                                  priv->offscreen_box.x2,
                                  priv->offscreen_box.y2, 0.0, 1.0);
 
-  st_theme_node_paint (priv->old_theme_node, priv->old_offscreen, allocation, 255);
-
-  st_theme_node_paint (priv->new_theme_node, priv->new_offscreen, allocation, 255);
+  st_theme_node_paint (priv->old_theme_node, priv->old_offscreen, allocation, 255, NULL, NULL);
 
+  st_theme_node_paint (priv->new_theme_node, priv->new_offscreen, allocation, 255, NULL, NULL);
   return TRUE;
 }
 

src/st/st-theme-node.c

@@ -1810,6 +1810,7 @@ _st_theme_node_ensure_background (StThemeNode *node)
   node->background_gradient_type = ST_GRADIENT_NONE;
   node->background_position_set = FALSE;
   node->background_size = ST_BACKGROUND_SIZE_AUTO;
+  node->background_blur = 0;
 
   ensure_properties (node);
 
@@ -2070,6 +2071,10 @@ _st_theme_node_ensure_background (StThemeNode *node)
         {
           get_color_from_term (node, decl->value, &node->background_gradient_end);
         }
+      else if (strcmp (property_name, "-blur") == 0)
+        {
+          get_length_from_term_int (node, decl->value, FALSE, &node->background_blur);
+        }
     }
 }
 

src/st/st-theme-node.h

@@ -27,6 +27,7 @@
 #include "st-border-image.h"
 #include "st-icon-colors.h"
 #include "st-shadow.h"
+#include "st-background-effect.h"
 
 G_BEGIN_DECLS
 
@@ -248,7 +249,9 @@ gboolean st_theme_node_paint_equal    (StThemeNode *node,
 void st_theme_node_paint (StThemeNode            *node,
                           CoglFramebuffer        *framebuffer,
                           const ClutterActorBox  *box,
-                          guint8                  paint_opacity);
+                          guint8                  paint_opacity,
+                          StBackgroundBlurEffect    *background_blur_effect,
+                          StBackgroundBumpmapEffect *background_bumpmap_effect);
 
 void st_theme_node_copy_cached_paint_state (StThemeNode *node,
                                             StThemeNode *other);