gpu: Move the pattern code into the nodeprocessor

We need the nodeprocessor infrastructure to create patterns, so keeping
it in a different source file would just cause header headaches.

gsk/gpu/gskgpunodeprocessor.c

@@ -7,7 +7,6 @@
 #include "gskgpuframeprivate.h"
 #include "gskgpuglobalsopprivate.h"
 #include "gskgpuimageprivate.h"
-#include "gskgpupatternprivate.h"
 #include "gskgpurenderpassopprivate.h"
 #include "gskgpuscissoropprivate.h"
 #include "gskgputextureopprivate.h"
@@ -87,8 +86,10 @@ struct _GskGpuNodeProcessor
   GskGpuGlobals          pending_globals;
 };
 
-static void
+static void             gsk_gpu_node_processor_add_node                 (GskGpuNodeProcessor            *self,
-gsk_gpu_node_processor_add_node (GskGpuNodeProcessor *self,
+                                                                         GskRenderNode                  *node);
+static gboolean         gsk_gpu_node_processor_create_node_pattern      (GskGpuNodeProcessor            *self,
+                                                                         GskGpuBufferWriter             *writer,
                                                                          GskRenderNode                  *node);
 
 static void
@@ -587,13 +588,15 @@ gsk_gpu_node_processor_add_color_node (GskGpuNodeProcessor *self,
 
   gsk_gpu_frame_write_buffer_memory (self->frame, &writer);
 
-  if (!gsk_gpu_pattern_create_for_node (&writer, node))
+  if (!gsk_gpu_node_processor_create_node_pattern (self, &writer, node))
     {
       g_assert_not_reached ();
       gsk_gpu_buffer_writer_abort (&writer);
       return;
     }
 
+  gsk_gpu_buffer_writer_append_uint (&writer, GSK_GPU_PATTERN_DONE);
+
   pattern_id = gsk_gpu_buffer_writer_commit (&writer) / sizeof (float);
 
   gsk_gpu_uber_op (self->frame,
@@ -603,6 +606,24 @@ gsk_gpu_node_processor_add_color_node (GskGpuNodeProcessor *self,
                    pattern_id);
 }
 
+static gboolean
+gsk_gpu_node_processor_add_color_pattern (GskGpuNodeProcessor *self,
+                                          GskGpuBufferWriter  *writer,
+                                          GskRenderNode       *node)
+{
+  const GdkRGBA *rgba;
+
+  rgba = gsk_color_node_get_color (node);
+
+  gsk_gpu_buffer_writer_append_uint (writer, GSK_GPU_PATTERN_COLOR);
+  gsk_gpu_buffer_writer_append_float (writer, rgba->red);
+  gsk_gpu_buffer_writer_append_float (writer, rgba->green);
+  gsk_gpu_buffer_writer_append_float (writer, rgba->blue);
+  gsk_gpu_buffer_writer_append_float (writer, rgba->alpha);
+
+  return TRUE;
+}
+
 static void
 gsk_gpu_node_processor_add_texture_node (GskGpuNodeProcessor *self,
                                          GskRenderNode       *node)
@@ -644,7 +665,7 @@ gsk_gpu_node_processor_add_opacity_node (GskGpuNodeProcessor *self,
 
   gsk_gpu_frame_write_buffer_memory (self->frame, &writer);
 
-  if (!gsk_gpu_pattern_create_for_node (&writer, node))
+  if (!gsk_gpu_node_processor_create_node_pattern (self, &writer, node))
     {
       gsk_gpu_buffer_writer_abort (&writer);
       GSK_DEBUG (FALLBACK, "Color node children can't be turned into pattern");
@@ -652,6 +673,8 @@ gsk_gpu_node_processor_add_opacity_node (GskGpuNodeProcessor *self,
       return;
     }
 
+  gsk_gpu_buffer_writer_append_uint (&writer, GSK_GPU_PATTERN_DONE);
+
   pattern_id = gsk_gpu_buffer_writer_commit (&writer) / sizeof (float);
 
   gsk_gpu_uber_op (self->frame,
@@ -661,6 +684,22 @@ gsk_gpu_node_processor_add_opacity_node (GskGpuNodeProcessor *self,
                    pattern_id);
 }
 
+static gboolean
+gsk_gpu_node_processor_create_opacity_pattern (GskGpuNodeProcessor *self,
+                                               GskGpuBufferWriter  *writer,
+                                               GskRenderNode       *node)
+{
+  if (!gsk_gpu_node_processor_create_node_pattern (self,
+                                                   writer,
+                                                   gsk_opacity_node_get_child (node)))
+    return FALSE;
+
+  gsk_gpu_buffer_writer_append_uint (writer, GSK_GPU_PATTERN_OPACITY);
+  gsk_gpu_buffer_writer_append_float (writer, gsk_opacity_node_get_opacity (node));
+
+  return TRUE;
+}
+
 static void
 gsk_gpu_node_processor_add_container_node (GskGpuNodeProcessor *self,
                                            GskRenderNode       *node)
@@ -674,130 +713,164 @@ static const struct
   GskGpuGlobals ignored_globals;
   void                  (* process_node)                        (GskGpuNodeProcessor    *self,
                                                                  GskRenderNode          *node);
+  gboolean              (* create_pattern)                      (GskGpuNodeProcessor    *self,
+                                                                 GskGpuBufferWriter     *writer,
+                                                                 GskRenderNode          *node);
 } nodes_vtable[] = {
   [GSK_NOT_A_RENDER_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_CONTAINER_NODE] = {
     GSK_GPU_GLOBAL_MATRIX | GSK_GPU_GLOBAL_SCALE | GSK_GPU_GLOBAL_CLIP | GSK_GPU_GLOBAL_SCISSOR,
     gsk_gpu_node_processor_add_container_node,
+    NULL,
   },
   [GSK_CAIRO_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_COLOR_NODE] = {
     0,
     gsk_gpu_node_processor_add_color_node,
+    gsk_gpu_node_processor_add_color_pattern,
   },
   [GSK_LINEAR_GRADIENT_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_REPEATING_LINEAR_GRADIENT_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_RADIAL_GRADIENT_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_REPEATING_RADIAL_GRADIENT_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_CONIC_GRADIENT_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_BORDER_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_TEXTURE_NODE] = {
     0,
     gsk_gpu_node_processor_add_texture_node,
+    NULL,
   },
   [GSK_INSET_SHADOW_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_OUTSET_SHADOW_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_TRANSFORM_NODE] = {
     GSK_GPU_GLOBAL_MATRIX | GSK_GPU_GLOBAL_SCALE | GSK_GPU_GLOBAL_CLIP | GSK_GPU_GLOBAL_SCISSOR,
     gsk_gpu_node_processor_add_transform_node,
+    NULL,
   },
   [GSK_OPACITY_NODE] = {
     0,
     gsk_gpu_node_processor_add_opacity_node,
+    gsk_gpu_node_processor_create_opacity_pattern,
   },
   [GSK_COLOR_MATRIX_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_REPEAT_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_CLIP_NODE] = {
     GSK_GPU_GLOBAL_MATRIX | GSK_GPU_GLOBAL_SCALE | GSK_GPU_GLOBAL_CLIP | GSK_GPU_GLOBAL_SCISSOR,
     gsk_gpu_node_processor_add_clip_node,
+    NULL,
   },
   [GSK_ROUNDED_CLIP_NODE] = {
     GSK_GPU_GLOBAL_MATRIX | GSK_GPU_GLOBAL_SCALE | GSK_GPU_GLOBAL_CLIP | GSK_GPU_GLOBAL_SCISSOR,
     gsk_gpu_node_processor_add_rounded_clip_node,
+    NULL,
   },
   [GSK_SHADOW_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_BLEND_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_CROSS_FADE_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_TEXT_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_BLUR_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_DEBUG_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_GL_SHADER_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_TEXTURE_SCALE_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_MASK_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_FILL_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_STROKE_NODE] = {
     0,
     NULL,
+    NULL,
   },
   [GSK_SUBSURFACE_NODE] = {
     0,
     NULL,
+    NULL,
   },
 };
 
@@ -836,3 +909,27 @@ gsk_gpu_node_processor_add_node (GskGpuNodeProcessor *self,
       gsk_gpu_node_processor_add_fallback_node (self, node);
     }
 }
+
+static gboolean
+gsk_gpu_node_processor_create_node_pattern (GskGpuNodeProcessor *self,
+                                            GskGpuBufferWriter  *writer,
+                                            GskRenderNode       *node)
+{
+  GskRenderNodeType node_type;
+
+  node_type = gsk_render_node_get_node_type (node);
+  if (node_type >= G_N_ELEMENTS (nodes_vtable))
+    {
+      g_critical ("unkonwn node type %u for %s", node_type, g_type_name_from_instance ((GTypeInstance *) node));
+      return FALSE;
+    }
+
+  if (nodes_vtable[node_type].create_pattern == NULL)
+    return FALSE;
+
+  if (!nodes_vtable[node_type].create_pattern (self, writer, node))
+    return FALSE;
+
+  return TRUE;
+}
+

gsk/gpu/gskgpupattern.c

@@ -1,169 +0,0 @@
-#include "config.h"
-
-#include "gskgpupatternprivate.h"
-
-#include "gskrendernode.h"
-
-static gboolean
-gsk_gpu_pattern_create_internal (GskGpuBufferWriter *writer,
-                                 GskRenderNode      *node);
-
-static gboolean
-gsk_gpu_pattern_create_for_color_node (GskGpuBufferWriter *writer,
-                                       GskRenderNode      *node)
-{
-  const GdkRGBA *rgba;
-
-  rgba = gsk_color_node_get_color (node);
-
-  gsk_gpu_buffer_writer_append_uint (writer, GSK_GPU_PATTERN_COLOR);
-  gsk_gpu_buffer_writer_append_float (writer, rgba->red);
-  gsk_gpu_buffer_writer_append_float (writer, rgba->green);
-  gsk_gpu_buffer_writer_append_float (writer, rgba->blue);
-  gsk_gpu_buffer_writer_append_float (writer, rgba->alpha);
-
-  return TRUE;
-}
-
-static gboolean
-gsk_gpu_pattern_create_for_opacity_node (GskGpuBufferWriter *writer,
-                                         GskRenderNode      *node)
-{
-  if (!gsk_gpu_pattern_create_internal (writer, gsk_opacity_node_get_child (node)))
-    return FALSE;
-
-  gsk_gpu_buffer_writer_append_uint (writer, GSK_GPU_PATTERN_OPACITY);
-  gsk_gpu_buffer_writer_append_float (writer, gsk_opacity_node_get_opacity (node));
-
-  return TRUE;
-}
-
-static const struct
-{
-  gboolean              (* create_for_node)                     (GskGpuBufferWriter     *writer,
-                                                                 GskRenderNode          *node);
-} nodes_vtable[] = {
-  [GSK_NOT_A_RENDER_NODE] = {
-    NULL,
-  },
-  [GSK_CONTAINER_NODE] = {
-    NULL,
-  },
-  [GSK_CAIRO_NODE] = {
-    NULL,
-  },
-  [GSK_COLOR_NODE] = {
-    gsk_gpu_pattern_create_for_color_node,
-  },
-  [GSK_LINEAR_GRADIENT_NODE] = {
-    NULL,
-  },
-  [GSK_REPEATING_LINEAR_GRADIENT_NODE] = {
-    NULL,
-  },
-  [GSK_RADIAL_GRADIENT_NODE] = {
-    NULL,
-  },
-  [GSK_REPEATING_RADIAL_GRADIENT_NODE] = {
-    NULL,
-  },
-  [GSK_CONIC_GRADIENT_NODE] = {
-    NULL,
-  },
-  [GSK_BORDER_NODE] = {
-    NULL,
-  },
-  [GSK_TEXTURE_NODE] = {
-    NULL,
-  },
-  [GSK_INSET_SHADOW_NODE] = {
-    NULL,
-  },
-  [GSK_OUTSET_SHADOW_NODE] = {
-    NULL,
-  },
-  [GSK_TRANSFORM_NODE] = {
-    NULL,
-  },
-  [GSK_OPACITY_NODE] = {
-    gsk_gpu_pattern_create_for_opacity_node,
-  },
-  [GSK_COLOR_MATRIX_NODE] = {
-    NULL,
-  },
-  [GSK_REPEAT_NODE] = {
-    NULL,
-  },
-  [GSK_CLIP_NODE] = {
-    NULL,
-  },
-  [GSK_ROUNDED_CLIP_NODE] = {
-    NULL,
-  },
-  [GSK_SHADOW_NODE] = {
-    NULL,
-  },
-  [GSK_BLEND_NODE] = {
-    NULL,
-  },
-  [GSK_CROSS_FADE_NODE] = {
-    NULL,
-  },
-  [GSK_TEXT_NODE] = {
-    NULL,
-  },
-  [GSK_BLUR_NODE] = {
-    NULL,
-  },
-  [GSK_DEBUG_NODE] = {
-    NULL,
-  },
-  [GSK_GL_SHADER_NODE] = {
-    NULL,
-  },
-  [GSK_TEXTURE_SCALE_NODE] = {
-    NULL,
-  },
-  [GSK_MASK_NODE] = {
-    NULL,
-  },
-  [GSK_FILL_NODE] = {
-    NULL,
-  },
-  [GSK_STROKE_NODE] = {
-    NULL,
-  },
-};
-
-static gboolean
-gsk_gpu_pattern_create_internal (GskGpuBufferWriter *writer,
-                                 GskRenderNode      *node)
-{
-  GskRenderNodeType node_type;
-
-  node_type = gsk_render_node_get_node_type (node);
-  if (node_type >= G_N_ELEMENTS (nodes_vtable))
-    {
-      g_critical ("unkonwn node type %u for %s", node_type, g_type_name_from_instance ((GTypeInstance *) node));
-      return FALSE;
-    }
-
-  if (nodes_vtable[node_type].create_for_node == NULL)
-    return FALSE;
-
-  if (!nodes_vtable[node_type].create_for_node (writer, node))
-    return FALSE;
-
-  return TRUE;
-}
-
-gboolean
-gsk_gpu_pattern_create_for_node (GskGpuBufferWriter *writer,
-                                 GskRenderNode      *node)
-{
-  if (!gsk_gpu_pattern_create_internal (writer, node))
-    return FALSE;
-
-  gsk_gpu_buffer_writer_append_uint (writer, GSK_GPU_PATTERN_DONE);
-  return TRUE;
-}

gsk/gpu/gskgpupatternprivate.h

@@ -1,20 +0,0 @@
-#pragma once
-
-#include "gskgpubufferwriterprivate.h"
-
-#include "gsktypes.h"
-
-G_BEGIN_DECLS
-
-typedef enum {
-  GSK_GPU_PATTERN_DONE,
-  GSK_GPU_PATTERN_COLOR,
-  GSK_GPU_PATTERN_OPACITY,
-} GskGpuPatternType;
-
-gboolean                gsk_gpu_pattern_create_for_node                 (GskGpuBufferWriter             *writer,
-                                                                         GskRenderNode                  *node);
-
-
-G_END_DECLS
-

gsk/gpu/gskgputypesprivate.h

@@ -27,3 +27,9 @@ typedef enum {
   GSK_GPU_SHADER_CLIP_ROUNDED
 } GskGpuShaderClip;
 
+typedef enum {
+  GSK_GPU_PATTERN_DONE,
+  GSK_GPU_PATTERN_COLOR,
+  GSK_GPU_PATTERN_OPACITY,
+} GskGpuPatternType;
+

gsk/meson.build

@@ -82,7 +82,6 @@ gsk_private_sources = files([
   'gpu/gskgpuimage.c',
   'gpu/gskgpunodeprocessor.c',
   'gpu/gskgpuop.c',
-  'gpu/gskgpupattern.c',
   'gpu/gskgpuprint.c',
   'gpu/gskgpurenderer.c',
   'gpu/gskgpurenderpassop.c',