vulkan: Add gskvulkanprivate.h

It's the new place for all the common stuff.

Because the old place is about to go away.

diff --git a/gsk/vulkan/gskvulkanblendmodeop.c b/gsk/vulkan/gskvulkanblendmodeop.c
index a8d0930614d92654a5aa8b8f90697e205d7f6250..ee50ca26e684f05740d820dc7cb9bbdbe4513756 100644 (file)
--- a/gsk/vulkan/gskvulkanblendmodeop.c
+++ b/gsk/vulkan/gskvulkanblendmodeop.c
@@ -2,6 +2,8 @@
 
 #include "gskvulkanblendmodeopprivate.h"
 
+#include "gskvulkanprivate.h"
+
 #include "vulkan/resources/blend-mode.vert.h"
 
 typedef struct _GskVulkanBlendModeOp GskVulkanBlendModeOp;

diff --git a/gsk/vulkan/gskvulkanblurop.c b/gsk/vulkan/gskvulkanblurop.c
index 84cd66b97d1d7e072062fd0a198a1101dd7ecb7e..df2eb427bf9e8a9f3ff80978a13ea74b98dcc495 100644 (file)
--- a/gsk/vulkan/gskvulkanblurop.c
+++ b/gsk/vulkan/gskvulkanblurop.c
@@ -2,6 +2,8 @@
 
 #include "gskvulkanbluropprivate.h"
 
+#include "gskvulkanprivate.h"
+
 #include "vulkan/resources/blur.vert.h"
 
 typedef struct _GskVulkanBlurOp GskVulkanBlurOp;

diff --git a/gsk/vulkan/gskvulkanborderop.c b/gsk/vulkan/gskvulkanborderop.c
index 9f1f3120968486338ffeef8942d7bc96729d27e5..0855ea485d371b6035439c4f49daee42f118c64c 100644 (file)
--- a/gsk/vulkan/gskvulkanborderop.c
+++ b/gsk/vulkan/gskvulkanborderop.c
@@ -2,10 +2,11 @@
 
 #include "gskvulkanborderopprivate.h"
 
-#include "vulkan/resources/border.vert.h"
-
+#include "gskvulkanprivate.h"
 #include "gsk/gskroundedrectprivate.h"
 
+#include "vulkan/resources/border.vert.h"
+
 typedef struct _GskVulkanBorderOp GskVulkanBorderOp;
 
 struct _GskVulkanBorderOp

diff --git a/gsk/vulkan/gskvulkanbuffer.c b/gsk/vulkan/gskvulkanbuffer.c
index cd7b8a01cba293241bdb9c11a0debf38bc17fd9f..a2e850da22b97775dab6bf479e27ebc7ef7e3cb2 100644 (file)
--- a/gsk/vulkan/gskvulkanbuffer.c
+++ b/gsk/vulkan/gskvulkanbuffer.c
@@ -1,8 +1,9 @@
 #include "config.h"
 
 #include "gskvulkanbufferprivate.h"
+
 #include "gskvulkanmemoryprivate.h"
-#include "gskvulkanpipelineprivate.h"
+#include "gskvulkanprivate.h"
 
 struct _GskVulkanBuffer
 {

diff --git a/gsk/vulkan/gskvulkancolormatrixop.c b/gsk/vulkan/gskvulkancolormatrixop.c
index 1e7972272ef96c3737e9b3294bedad140a1fbdee..f04e96e9e1c7dfe3e3a861913a7d1904ee90df40 100644 (file)
--- a/gsk/vulkan/gskvulkancolormatrixop.c
+++ b/gsk/vulkan/gskvulkancolormatrixop.c
@@ -2,6 +2,8 @@
 
 #include "gskvulkancolormatrixopprivate.h"
 
+#include "gskvulkanprivate.h"
+
 #include "vulkan/resources/color-matrix.vert.h"
 
 typedef struct _GskVulkanColorMatrixOp GskVulkanColorMatrixOp;

diff --git a/gsk/vulkan/gskvulkancommandpool.c b/gsk/vulkan/gskvulkancommandpool.c
index 8adb6c5bf46b446b2318a5f7273171c6cefe0bc4..197e0aec2a68a0a5163688e084b8c9794c341e89 100644 (file)
--- a/gsk/vulkan/gskvulkancommandpool.c
+++ b/gsk/vulkan/gskvulkancommandpool.c
@@ -1,7 +1,7 @@
 #include "config.h"
 
 #include "gskvulkancommandpoolprivate.h"
-#include "gskvulkanpipelineprivate.h"
+#include "gskvulkanprivate.h"
 
 struct _GskVulkanCommandPool
 {

diff --git a/gsk/vulkan/gskvulkancrossfadeop.c b/gsk/vulkan/gskvulkancrossfadeop.c
index 1967d13254ba81c47e17a902bbb8b62f9df9659e..6a229b2281f7bdd77b32160e3d53888708029a7f 100644 (file)
--- a/gsk/vulkan/gskvulkancrossfadeop.c
+++ b/gsk/vulkan/gskvulkancrossfadeop.c
@@ -2,6 +2,8 @@
 
 #include "gskvulkancrossfadeopprivate.h"
 
+#include "gskvulkanprivate.h"
+
 #include "vulkan/resources/cross-fade.vert.h"
 
 typedef struct _GskVulkanCrossFadeOp GskVulkanCrossFadeOp;

diff --git a/gsk/vulkan/gskvulkanglyphop.c b/gsk/vulkan/gskvulkanglyphop.c
index 461780692828152347eeff9d1632e63db208f05a..8f9b0c3afbb79e29af10da23fae0a671aa2fb622 100644 (file)
--- a/gsk/vulkan/gskvulkanglyphop.c
+++ b/gsk/vulkan/gskvulkanglyphop.c
@@ -2,6 +2,8 @@
 
 #include "gskvulkanglyphopprivate.h"
 
+#include "gskvulkanprivate.h"
+
 #include "vulkan/resources/glyph.vert.h"
 
 typedef struct _GskVulkanGlyphOp GskVulkanGlyphOp;

diff --git a/gsk/vulkan/gskvulkanimage.c b/gsk/vulkan/gskvulkanimage.c
index bd31143b93cad60c2c25bb761813406ad8623da1..cee0cb8764997ba15c4feb341450421c0a7a8d4b 100644 (file)
--- a/gsk/vulkan/gskvulkanimage.c
+++ b/gsk/vulkan/gskvulkanimage.c
@@ -4,7 +4,7 @@
 
 #include "gskvulkanbufferprivate.h"
 #include "gskvulkanmemoryprivate.h"
-#include "gskvulkanpipelineprivate.h"
+#include "gskvulkanprivate.h"
 
 #include "gdk/gdkmemoryformatprivate.h"
 

diff --git a/gsk/vulkan/gskvulkaninsetshadowop.c b/gsk/vulkan/gskvulkaninsetshadowop.c
index 78958852eb31f53a5e348838b9b85575f2437346..fa0ceae5039b84fd613199d1e372d7e39f2f2e39 100644 (file)
--- a/gsk/vulkan/gskvulkaninsetshadowop.c
+++ b/gsk/vulkan/gskvulkaninsetshadowop.c
@@ -2,10 +2,11 @@
 
 #include "gskvulkaninsetshadowopprivate.h"
 
-#include "vulkan/resources/inset-shadow.vert.h"
-
+#include "gskvulkanprivate.h"
 #include "gsk/gskroundedrectprivate.h"
 
+#include "vulkan/resources/inset-shadow.vert.h"
+
 typedef struct _GskVulkanInsetShadowOp GskVulkanInsetShadowOp;
 
 struct _GskVulkanInsetShadowOp

diff --git a/gsk/vulkan/gskvulkanlineargradientop.c b/gsk/vulkan/gskvulkanlineargradientop.c
index 22aca436147f6b916ee596e3aa6f2434df717d02..c6803481900ea48ab7adf7478bcfab967b3f468e 100644 (file)
--- a/gsk/vulkan/gskvulkanlineargradientop.c
+++ b/gsk/vulkan/gskvulkanlineargradientop.c
@@ -2,6 +2,8 @@
 
 #include "gskvulkanlineargradientopprivate.h"
 
+#include "gskvulkanprivate.h"
+
 #include "vulkan/resources/linear.vert.h"
 
 typedef struct _GskVulkanLinearGradientOp GskVulkanLinearGradientOp;

diff --git a/gsk/vulkan/gskvulkanmemory.c b/gsk/vulkan/gskvulkanmemory.c
index d5cced20a11308455f99afbd8b8b244204d4590d..26d08e807d68f795fdfe743601da56fef41b222c 100644 (file)
--- a/gsk/vulkan/gskvulkanmemory.c
+++ b/gsk/vulkan/gskvulkanmemory.c
@@ -1,8 +1,9 @@
 #include "config.h"
 
-#include "gskvulkanpipelineprivate.h"
 #include "gskvulkanmemoryprivate.h"
 
+#include "gskvulkanprivate.h"
+
 struct _GskVulkanMemory
 {
   GdkVulkanContext *vulkan;

diff --git a/gsk/vulkan/gskvulkanopprivate.h b/gsk/vulkan/gskvulkanopprivate.h
index 8e8bf8e52fa27b83938f8fb73914626e9f7e1ff6..1d1a7bbdb133a8014c206807927d418502cf0404 100644 (file)
--- a/gsk/vulkan/gskvulkanopprivate.h
+++ b/gsk/vulkan/gskvulkanopprivate.h
@@ -69,45 +69,5 @@ void                    gsk_vulkan_op_command                           (GskVulk
                                                                          VkPipelineLayout        pipeline_layout,
                                                                          VkCommandBuffer         command_buffer);
 
-static inline void
-gsk_vulkan_normalize_tex_coords (graphene_rect_t       *tex_coords,
-                                 const graphene_rect_t *rect,
-                                 const graphene_rect_t *tex)
-{
-  graphene_rect_init (tex_coords,
-                      (rect->origin.x - tex->origin.x) / tex->size.width,
-                      (rect->origin.y - tex->origin.y) / tex->size.height,
-                      rect->size.width / tex->size.width,
-                      rect->size.height / tex->size.height);
-}
-
-static inline void
-gsk_vulkan_rect_to_float (const graphene_rect_t *rect,
-                          float                  values[4])
-{
-  values[0] = rect->origin.x;
-  values[1] = rect->origin.y;
-  values[2] = rect->size.width;
-  values[3] = rect->size.height;
-}
-
-static inline void
-gsk_vulkan_rgba_to_float (const GdkRGBA *rgba,
-                          float          values[4])
-{
-  values[0] = rgba->red;
-  values[1] = rgba->green;
-  values[2] = rgba->blue;
-  values[3] = rgba->alpha;
-}
-
-static inline void
-gsk_vulkan_point_to_float (const graphene_point_t *point,
-                           float                   values[2])
-{
-  values[0] = point->x;
-  values[1] = point->y;
-}
-
 G_END_DECLS
 

diff --git a/gsk/vulkan/gskvulkanoutsetshadowop.c b/gsk/vulkan/gskvulkanoutsetshadowop.c
index 95ac7e38364fc62c4139502539559a25b0211ebf..0cb29cc2e3ac8e59a2716987248338df5b9011f7 100644 (file)
--- a/gsk/vulkan/gskvulkanoutsetshadowop.c
+++ b/gsk/vulkan/gskvulkanoutsetshadowop.c
@@ -2,10 +2,11 @@
 
 #include "gskvulkanoutsetshadowopprivate.h"
 
-#include "vulkan/resources/outset-shadow.vert.h"
-
+#include "gskvulkanprivate.h"
 #include "gsk/gskroundedrectprivate.h"
 
+#include "vulkan/resources/outset-shadow.vert.h"
+
 typedef struct _GskVulkanOutsetShadowOp GskVulkanOutsetShadowOp;
 
 struct _GskVulkanOutsetShadowOp

diff --git a/gsk/vulkan/gskvulkanpipelineprivate.h b/gsk/vulkan/gskvulkanpipelineprivate.h
index 067a6546c046e083186ed841ddad748d981f73bb..771b6afb9f0a9ff881d05b4c792b2eb205c69902 100644 (file)
--- a/gsk/vulkan/gskvulkanpipelineprivate.h
+++ b/gsk/vulkan/gskvulkanpipelineprivate.h
@@ -2,8 +2,6 @@
 
 #include <gdk/gdk.h>
 
-#include "gskdebugprivate.h"
-
 G_BEGIN_DECLS
 
 #define GSK_TYPE_VULKAN_PIPELINE (gsk_vulkan_pipeline_get_type ())
@@ -18,19 +16,6 @@ struct _GskVulkanPipelineClass
                                 (* get_input_state_create_info)         (GskVulkanPipeline              *self);
 };
 
-static inline VkResult
-gsk_vulkan_handle_result (VkResult    res,
-                          const char *called_function)
-{
-  if (res != VK_SUCCESS)
-    {
-      GSK_DEBUG (VULKAN, "%s(): %s (%d)", called_function, gdk_vulkan_strerror (res), res);
-    }
-  return res;
-}
-
-#define GSK_VK_CHECK(func, ...) gsk_vulkan_handle_result (func (__VA_ARGS__), G_STRINGIFY (func))
-
 GskVulkanPipeline *     gsk_vulkan_pipeline_new                         (GType                           pipeline_type,
                                                                          GdkVulkanContext               *context,
                                                                          VkPipelineLayout                layout,

diff --git a/gsk/vulkan/gskvulkanprivate.h b/gsk/vulkan/gskvulkanprivate.h
new file mode 100644 (file)
index 0000000..5cad3ac
--- /dev/null
+++ b/gsk/vulkan/gskvulkanprivate.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include "gskdebugprivate.h"
+
+#include <gdk/gdk.h>
+#include <graphene.h>
+
+static inline VkResult
+gsk_vulkan_handle_result (VkResult    res,
+                          const char *called_function)
+{
+  if (res != VK_SUCCESS)
+    {
+      GSK_DEBUG (VULKAN, "%s(): %s (%d)", called_function, gdk_vulkan_strerror (res), res);
+    }
+  return res;
+}
+
+#define GSK_VK_CHECK(func, ...) gsk_vulkan_handle_result (func (__VA_ARGS__), G_STRINGIFY (func))
+
+static inline void
+gsk_vulkan_normalize_tex_coords (graphene_rect_t       *tex_coords,
+                                 const graphene_rect_t *rect,
+                                 const graphene_rect_t *tex)
+{
+  graphene_rect_init (tex_coords,
+                      (rect->origin.x - tex->origin.x) / tex->size.width,
+                      (rect->origin.y - tex->origin.y) / tex->size.height,
+                      rect->size.width / tex->size.width,
+                      rect->size.height / tex->size.height);
+}
+
+static inline void
+gsk_vulkan_rect_to_float (const graphene_rect_t *rect,
+                          float                  values[4])
+{
+  values[0] = rect->origin.x;
+  values[1] = rect->origin.y;
+  values[2] = rect->size.width;
+  values[3] = rect->size.height;
+}
+
+static inline void
+gsk_vulkan_rgba_to_float (const GdkRGBA *rgba,
+                          float          values[4])
+{
+  values[0] = rgba->red;
+  values[1] = rgba->green;
+  values[2] = rgba->blue;
+  values[3] = rgba->alpha;
+}
+
+static inline void
+gsk_vulkan_point_to_float (const graphene_point_t *point,
+                           float                   values[2])
+{
+  values[0] = point->x;
+  values[1] = point->y;
+}
+

diff --git a/gsk/vulkan/gskvulkanrender.c b/gsk/vulkan/gskvulkanrender.c
index 1714b0815cca56baa1926a9c1c583659b8fef86f..1aa35f258d9e4b52cda456f50a3405b6d476bc5f 100644 (file)
--- a/gsk/vulkan/gskvulkanrender.c
+++ b/gsk/vulkan/gskvulkanrender.c
@@ -9,6 +9,7 @@
 #include "gskvulkancommandpoolprivate.h"
 #include "gskvulkanglyphcacheprivate.h"
 #include "gskvulkanpipelineprivate.h"
+#include "gskvulkanprivate.h"
 #include "gskvulkanpushconstantsopprivate.h"
 #include "gskvulkanrendererprivate.h"
 #include "gskvulkanrenderpassprivate.h"

diff --git a/gsk/vulkan/gskvulkanrenderer.c b/gsk/vulkan/gskvulkanrenderer.c
index e7dac98bb58ca4cdc5b023c9d4f0e1e257effe0a..10b629fab6dd845f9063ce7aadf1e53fd63a1577 100644 (file)
--- a/gsk/vulkan/gskvulkanrenderer.c
+++ b/gsk/vulkan/gskvulkanrenderer.c
@@ -8,7 +8,7 @@
 #include "gskrendernodeprivate.h"
 #include "gskvulkanbufferprivate.h"
 #include "gskvulkanimageprivate.h"
-#include "gskvulkanpipelineprivate.h"
+#include "gskvulkanprivate.h"
 #include "gskvulkanrenderprivate.h"
 #include "gskvulkanglyphcacheprivate.h"
 

diff --git a/gsk/vulkan/gskvulkanrenderpass.c b/gsk/vulkan/gskvulkanrenderpass.c
index 442a96e277b63b372cd4fb26500b7643cc9d9808..92d3060fedcd018de6a230fa28ff2dcb4d96e0f7 100644 (file)
--- a/gsk/vulkan/gskvulkanrenderpass.c
+++ b/gsk/vulkan/gskvulkanrenderpass.c
@@ -20,6 +20,7 @@
 #include "gskvulkaninsetshadowopprivate.h"
 #include "gskvulkanlineargradientopprivate.h"
 #include "gskvulkanopprivate.h"
+#include "gskvulkanprivate.h"
 #include "gskvulkanrendererprivate.h"
 #include "gskvulkanimageprivate.h"
 #include "gskvulkanoffscreenopprivate.h"

diff --git a/gsk/vulkan/gskvulkanrenderprivate.h b/gsk/vulkan/gskvulkanrenderprivate.h
index 41023d5ad823167f7bd74a0062bb87a5e27046b4..aa02b6760a5a261e119c1e1f8b0769a0c4ac2afc 100644 (file)
--- a/gsk/vulkan/gskvulkanrenderprivate.h
+++ b/gsk/vulkan/gskvulkanrenderprivate.h
@@ -4,7 +4,6 @@
 #include <gsk/gskrendernode.h>
 
 #include "gskvulkanimageprivate.h"
-#include "gskvulkanpipelineprivate.h"
 #include "gskvulkanrenderpassprivate.h"
 #include "gsk/gskprivate.h"
 

diff --git a/gsk/vulkan/gskvulkantextureop.c b/gsk/vulkan/gskvulkantextureop.c
index 972f69250202637bdedd5c8d95dd9a67b07e57b4..a68ad977d44ebafb2b562368024dd96a2c87a798 100644 (file)
--- a/gsk/vulkan/gskvulkantextureop.c
+++ b/gsk/vulkan/gskvulkantextureop.c
@@ -2,6 +2,8 @@
 
 #include "gskvulkantextureopprivate.h"
 
+#include "gskvulkanprivate.h"
+
 #include "vulkan/resources/texture.vert.h"
 
 typedef struct _GskVulkanTextureOp GskVulkanTextureOp;