Merge branch 'matthiasc/for-master' into 'master'

gsk: Rename resource paths

See merge request GNOME/gtk!3399

118 files changed, 41 insertions, 41 deletions

diff --git a/gsk/gen-gsk-gresources-xml.py b/gsk/gen-gsk-gresources-xml.py
index 16a2c4042a..25dc35a3b7 100644
--- a/gsk/gen-gsk-gresources-xml.py
+++ b/gsk/gen-gsk-gresources-xml.py
@@ -45,7 +45,7 @@ xml = '''<?xml version='1.0' encoding='UTF-8'?>
 '''
 
 for f in gl_source_shaders:
-  xml += '    <file alias=\'glsl/{0}\'>resources/glsl/{0}</file>\n'.format(os.path.basename(f))
+  xml += '    <file alias=\'gl/{0}\'>gl/resources/{0}</file>\n'.format(os.path.basename(f))
 
 xml += '\n'
 
@@ -55,12 +55,12 @@ for f in ngl_source_shaders:
 xml += '\n'
 
 for f in vulkan_compiled_shaders:
-  xml += '    <file alias=\'vulkan/{0}\'>resources/vulkan/{0}</file>\n'.format(os.path.basename(f))
+  xml += '    <file alias=\'vulkan/{0}\'>vulkan/resources/{0}</file>\n'.format(os.path.basename(f))
 
 xml += '\n'
 
 for f in vulkan_shaders:
-  xml += '    <file alias=\'vulkan/{0}\'>resources/vulkan/{0}</file>\n'.format(os.path.basename(f))
+  xml += '    <file alias=\'vulkan/{0}\'>vulkan/resources/{0}</file>\n'.format(os.path.basename(f))
 
 xml += '''
   </gresource>
diff --git a/gsk/gl/gskglrenderer.c b/gsk/gl/gskglrenderer.c
index a68b45e663..c72cedaeb4 100644
--- a/gsk/gl/gskglrenderer.c
+++ b/gsk/gl/gskglrenderer.c
@@ -3313,27 +3313,27 @@ gsk_gl_renderer_create_programs (GskGLRenderer  *self,
     const char *resource_path;
     const char *name;
   } program_definitions[] = {
-    { "/org/gtk/libgsk/glsl/blend.glsl",                     "blend" },
-    { "/org/gtk/libgsk/glsl/blit.glsl",                      "blit" },
-    { "/org/gtk/libgsk/glsl/blur.glsl",                      "blur" },
-    { "/org/gtk/libgsk/glsl/border.glsl",                    "border" },
-    { "/org/gtk/libgsk/glsl/color_matrix.glsl",              "color matrix" },
-    { "/org/gtk/libgsk/glsl/color.glsl",                     "color" },
-    { "/org/gtk/libgsk/glsl/coloring.glsl",                  "coloring" },
-    { "/org/gtk/libgsk/glsl/cross_fade.glsl",                "cross fade" },
-    { "/org/gtk/libgsk/glsl/inset_shadow.glsl",              "inset shadow" },
-    { "/org/gtk/libgsk/glsl/linear_gradient.glsl",           "linear gradient" },
-    { "/org/gtk/libgsk/glsl/radial_gradient.glsl",           "radial gradient" },
-    { "/org/gtk/libgsk/glsl/conic_gradient.glsl",            "conic gradient" },
-    { "/org/gtk/libgsk/glsl/outset_shadow.glsl",             "outset shadow" },
-    { "/org/gtk/libgsk/glsl/repeat.glsl",                    "repeat" },
-    { "/org/gtk/libgsk/glsl/unblurred_outset_shadow.glsl",   "unblurred_outset shadow" },
+    { "/org/gtk/libgsk/gl/blend.glsl",                     "blend" },
+    { "/org/gtk/libgsk/gl/blit.glsl",                      "blit" },
+    { "/org/gtk/libgsk/gl/blur.glsl",                      "blur" },
+    { "/org/gtk/libgsk/gl/border.glsl",                    "border" },
+    { "/org/gtk/libgsk/gl/color_matrix.glsl",              "color matrix" },
+    { "/org/gtk/libgsk/gl/color.glsl",                     "color" },
+    { "/org/gtk/libgsk/gl/coloring.glsl",                  "coloring" },
+    { "/org/gtk/libgsk/gl/cross_fade.glsl",                "cross fade" },
+    { "/org/gtk/libgsk/gl/inset_shadow.glsl",              "inset shadow" },
+    { "/org/gtk/libgsk/gl/linear_gradient.glsl",           "linear gradient" },
+    { "/org/gtk/libgsk/gl/radial_gradient.glsl",           "radial gradient" },
+    { "/org/gtk/libgsk/gl/conic_gradient.glsl",            "conic gradient" },
+    { "/org/gtk/libgsk/gl/outset_shadow.glsl",             "outset shadow" },
+    { "/org/gtk/libgsk/gl/repeat.glsl",                    "repeat" },
+    { "/org/gtk/libgsk/gl/unblurred_outset_shadow.glsl",   "unblurred_outset shadow" },
   };
 
   gsk_gl_shader_builder_init (&shader_builder,
-                              "/org/gtk/libgsk/glsl/preamble.glsl",
-                              "/org/gtk/libgsk/glsl/preamble.vs.glsl",
-                              "/org/gtk/libgsk/glsl/preamble.fs.glsl");
+                              "/org/gtk/libgsk/gl/preamble.glsl",
+                              "/org/gtk/libgsk/gl/preamble.vs.glsl",
+                              "/org/gtk/libgsk/gl/preamble.fs.glsl");
 
   g_assert (G_N_ELEMENTS (program_definitions) == GL_N_PROGRAMS);
 
diff --git a/gsk/resources/glsl/blend.glsl b/gsk/gl/resources/blend.glsl
index 22323402ac..22323402ac 100644
--- a/gsk/resources/glsl/blend.glsl
+++ b/gsk/gl/resources/blend.glsl
diff --git a/gsk/resources/glsl/blit.glsl b/gsk/gl/resources/blit.glsl
index f01cd238ec..f01cd238ec 100644
--- a/gsk/resources/glsl/blit.glsl
+++ b/gsk/gl/resources/blit.glsl
diff --git a/gsk/resources/glsl/blur.glsl b/gsk/gl/resources/blur.glsl
index f782ab48cc..f782ab48cc 100644
--- a/gsk/resources/glsl/blur.glsl
+++ b/gsk/gl/resources/blur.glsl
diff --git a/gsk/resources/glsl/border.glsl b/gsk/gl/resources/border.glsl
index 677a0df7cd..677a0df7cd 100644
--- a/gsk/resources/glsl/border.glsl
+++ b/gsk/gl/resources/border.glsl
diff --git a/gsk/resources/glsl/color.glsl b/gsk/gl/resources/color.glsl
index 636456ce0d..636456ce0d 100644
--- a/gsk/resources/glsl/color.glsl
+++ b/gsk/gl/resources/color.glsl
diff --git a/gsk/resources/glsl/color_matrix.glsl b/gsk/gl/resources/color_matrix.glsl
index 79cb36434e..79cb36434e 100644
--- a/gsk/resources/glsl/color_matrix.glsl
+++ b/gsk/gl/resources/color_matrix.glsl
diff --git a/gsk/resources/glsl/coloring.glsl b/gsk/gl/resources/coloring.glsl
index a675493030..a675493030 100644
--- a/gsk/resources/glsl/coloring.glsl
+++ b/gsk/gl/resources/coloring.glsl
diff --git a/gsk/resources/glsl/conic_gradient.glsl b/gsk/gl/resources/conic_gradient.glsl
index 630a42c5e6..630a42c5e6 100644
--- a/gsk/resources/glsl/conic_gradient.glsl
+++ b/gsk/gl/resources/conic_gradient.glsl
diff --git a/gsk/resources/glsl/cross_fade.glsl b/gsk/gl/resources/cross_fade.glsl
index f824430f9d..f824430f9d 100644
--- a/gsk/resources/glsl/cross_fade.glsl
+++ b/gsk/gl/resources/cross_fade.glsl
diff --git a/gsk/resources/glsl/custom.glsl b/gsk/gl/resources/custom.glsl
index d2aed97fc8..d2aed97fc8 100644
--- a/gsk/resources/glsl/custom.glsl
+++ b/gsk/gl/resources/custom.glsl
diff --git a/gsk/resources/glsl/inset_shadow.glsl b/gsk/gl/resources/inset_shadow.glsl
index 9a21cdef09..9a21cdef09 100644
--- a/gsk/resources/glsl/inset_shadow.glsl
+++ b/gsk/gl/resources/inset_shadow.glsl
diff --git a/gsk/resources/glsl/linear_gradient.glsl b/gsk/gl/resources/linear_gradient.glsl
index cc90392c06..cc90392c06 100644
--- a/gsk/resources/glsl/linear_gradient.glsl
+++ b/gsk/gl/resources/linear_gradient.glsl
diff --git a/gsk/resources/glsl/outset_shadow.glsl b/gsk/gl/resources/outset_shadow.glsl
index 373c650179..373c650179 100644
--- a/gsk/resources/glsl/outset_shadow.glsl
+++ b/gsk/gl/resources/outset_shadow.glsl
diff --git a/gsk/resources/glsl/preamble.fs.glsl b/gsk/gl/resources/preamble.fs.glsl
index 3a2fe49240..3a2fe49240 100644
--- a/gsk/resources/glsl/preamble.fs.glsl
+++ b/gsk/gl/resources/preamble.fs.glsl
diff --git a/gsk/resources/glsl/preamble.glsl b/gsk/gl/resources/preamble.glsl
index 8bc007ba67..8bc007ba67 100644
--- a/gsk/resources/glsl/preamble.glsl
+++ b/gsk/gl/resources/preamble.glsl
diff --git a/gsk/resources/glsl/preamble.vs.glsl b/gsk/gl/resources/preamble.vs.glsl
index 89ee6f74e0..89ee6f74e0 100644
--- a/gsk/resources/glsl/preamble.vs.glsl
+++ b/gsk/gl/resources/preamble.vs.glsl
diff --git a/gsk/resources/glsl/radial_gradient.glsl b/gsk/gl/resources/radial_gradient.glsl
index 0ab3fdf07a..0ab3fdf07a 100644
--- a/gsk/resources/glsl/radial_gradient.glsl
+++ b/gsk/gl/resources/radial_gradient.glsl
diff --git a/gsk/resources/glsl/repeat.glsl b/gsk/gl/resources/repeat.glsl
index a9ebcc5e10..a9ebcc5e10 100644
--- a/gsk/resources/glsl/repeat.glsl
+++ b/gsk/gl/resources/repeat.glsl
diff --git a/gsk/resources/glsl/unblurred_outset_shadow.glsl b/gsk/gl/resources/unblurred_outset_shadow.glsl
index f110370412..f110370412 100644
--- a/gsk/resources/glsl/unblurred_outset_shadow.glsl
+++ b/gsk/gl/resources/unblurred_outset_shadow.glsl
diff --git a/gsk/meson.build b/gsk/meson.build
index 24b6be14da..5c381b51c9 100644
--- a/gsk/meson.build
+++ b/gsk/meson.build
@@ -1,23 +1,23 @@
 gsk_private_gl_shaders = [
-  'resources/glsl/preamble.glsl',
-  'resources/glsl/preamble.fs.glsl',
-  'resources/glsl/preamble.vs.glsl',
-  'resources/glsl/border.glsl',
-  'resources/glsl/blit.glsl',
-  'resources/glsl/coloring.glsl',
-  'resources/glsl/color.glsl',
-  'resources/glsl/linear_gradient.glsl',
-  'resources/glsl/radial_gradient.glsl',
-  'resources/glsl/conic_gradient.glsl',
-  'resources/glsl/color_matrix.glsl',
-  'resources/glsl/blur.glsl',
-  'resources/glsl/inset_shadow.glsl',
-  'resources/glsl/outset_shadow.glsl',
-  'resources/glsl/unblurred_outset_shadow.glsl',
-  'resources/glsl/cross_fade.glsl',
-  'resources/glsl/blend.glsl',
-  'resources/glsl/repeat.glsl',
-  'resources/glsl/custom.glsl',
+  'gl/resources/preamble.glsl',
+  'gl/resources/preamble.fs.glsl',
+  'gl/resources/preamble.vs.glsl',
+  'gl/resources/border.glsl',
+  'gl/resources/blit.glsl',
+  'gl/resources/coloring.glsl',
+  'gl/resources/color.glsl',
+  'gl/resources/linear_gradient.glsl',
+  'gl/resources/radial_gradient.glsl',
+  'gl/resources/conic_gradient.glsl',
+  'gl/resources/color_matrix.glsl',
+  'gl/resources/blur.glsl',
+  'gl/resources/inset_shadow.glsl',
+  'gl/resources/outset_shadow.glsl',
+  'gl/resources/unblurred_outset_shadow.glsl',
+  'gl/resources/cross_fade.glsl',
+  'gl/resources/blend.glsl',
+  'gl/resources/repeat.glsl',
+  'gl/resources/custom.glsl',
 ]
 
 gsk_private_ngl_shaders = [
@@ -158,7 +158,7 @@ if have_vulkan
     'vulkan/gskvulkanshader.c',
   ])
 
-  subdir('resources/vulkan')
+  subdir('vulkan/resources')
 endif # have_vulkan
 
 if get_variable('broadway_enabled')
diff --git a/gsk/resources/vulkan/blendmode-clip-rounded.frag.spv b/gsk/vulkan/resources/blendmode-clip-rounded.frag.spv
index 1b8e07c1b5..1b8e07c1b5 100644
--- a/gsk/resources/vulkan/blendmode-clip-rounded.frag.spv
+++ b/gsk/vulkan/resources/blendmode-clip-rounded.frag.spv
diff --git a/gsk/resources/vulkan/blendmode-clip-rounded.vert.spv b/gsk/vulkan/resources/blendmode-clip-rounded.vert.spv
index 499a74abe1..499a74abe1 100644
--- a/gsk/resources/vulkan/blendmode-clip-rounded.vert.spv
+++ b/gsk/vulkan/resources/blendmode-clip-rounded.vert.spv
diff --git a/gsk/resources/vulkan/blendmode-clip.frag.spv b/gsk/vulkan/resources/blendmode-clip.frag.spv
index e74f856174..e74f856174 100644
--- a/gsk/resources/vulkan/blendmode-clip.frag.spv
+++ b/gsk/vulkan/resources/blendmode-clip.frag.spv
diff --git a/gsk/resources/vulkan/blendmode-clip.vert.spv b/gsk/vulkan/resources/blendmode-clip.vert.spv
index 499a74abe1..499a74abe1 100644
--- a/gsk/resources/vulkan/blendmode-clip.vert.spv
+++ b/gsk/vulkan/resources/blendmode-clip.vert.spv
diff --git a/gsk/resources/vulkan/blendmode-rect-rounded.frag.spv b/gsk/vulkan/resources/blendmode-rect-rounded.frag.spv
index 55ce955e83..55ce955e83 100644
--- a/gsk/resources/vulkan/blendmode-rect-rounded.frag.spv
+++ b/gsk/vulkan/resources/blendmode-rect-rounded.frag.spv
diff --git a/gsk/resources/vulkan/blendmode-rect.frag.spv b/gsk/vulkan/resources/blendmode-rect.frag.spv
index 7d0fdd1fa7..7d0fdd1fa7 100644
--- a/gsk/resources/vulkan/blendmode-rect.frag.spv
+++ b/gsk/vulkan/resources/blendmode-rect.frag.spv
diff --git a/gsk/resources/vulkan/blendmode.frag b/gsk/vulkan/resources/blendmode.frag
index a8b23e9891..a8b23e9891 100644
--- a/gsk/resources/vulkan/blendmode.frag
+++ b/gsk/vulkan/resources/blendmode.frag
diff --git a/gsk/resources/vulkan/blendmode.frag.spv b/gsk/vulkan/resources/blendmode.frag.spv
index e74f856174..e74f856174 100644
--- a/gsk/resources/vulkan/blendmode.frag.spv
+++ b/gsk/vulkan/resources/blendmode.frag.spv
diff --git a/gsk/resources/vulkan/blendmode.vert b/gsk/vulkan/resources/blendmode.vert
index 6670475ed8..6670475ed8 100644
--- a/gsk/resources/vulkan/blendmode.vert
+++ b/gsk/vulkan/resources/blendmode.vert
diff --git a/gsk/resources/vulkan/blendmode.vert.spv b/gsk/vulkan/resources/blendmode.vert.spv
index 2a8e9392ae..2a8e9392ae 100644
--- a/gsk/resources/vulkan/blendmode.vert.spv
+++ b/gsk/vulkan/resources/blendmode.vert.spv
diff --git a/gsk/resources/vulkan/blur-clip-rounded.frag.spv b/gsk/vulkan/resources/blur-clip-rounded.frag.spv
index bdec4c9e9b..bdec4c9e9b 100644
--- a/gsk/resources/vulkan/blur-clip-rounded.frag.spv
+++ b/gsk/vulkan/resources/blur-clip-rounded.frag.spv
diff --git a/gsk/resources/vulkan/blur-clip-rounded.vert.spv b/gsk/vulkan/resources/blur-clip-rounded.vert.spv
index 2e3c5ff522..2e3c5ff522 100644
--- a/gsk/resources/vulkan/blur-clip-rounded.vert.spv
+++ b/gsk/vulkan/resources/blur-clip-rounded.vert.spv
diff --git a/gsk/resources/vulkan/blur-clip.frag.spv b/gsk/vulkan/resources/blur-clip.frag.spv
index d6619c9246..d6619c9246 100644
--- a/gsk/resources/vulkan/blur-clip.frag.spv
+++ b/gsk/vulkan/resources/blur-clip.frag.spv
diff --git a/gsk/resources/vulkan/blur-clip.vert.spv b/gsk/vulkan/resources/blur-clip.vert.spv
index 2e3c5ff522..2e3c5ff522 100644
--- a/gsk/resources/vulkan/blur-clip.vert.spv
+++ b/gsk/vulkan/resources/blur-clip.vert.spv
diff --git a/gsk/resources/vulkan/blur.frag b/gsk/vulkan/resources/blur.frag
index 2dd584b0c6..2dd584b0c6 100644
--- a/gsk/resources/vulkan/blur.frag
+++ b/gsk/vulkan/resources/blur.frag
diff --git a/gsk/resources/vulkan/blur.frag.spv b/gsk/vulkan/resources/blur.frag.spv
index d6619c9246..d6619c9246 100644
--- a/gsk/resources/vulkan/blur.frag.spv
+++ b/gsk/vulkan/resources/blur.frag.spv
diff --git a/gsk/resources/vulkan/blur.vert b/gsk/vulkan/resources/blur.vert
index 10dccf7b7f..10dccf7b7f 100644
--- a/gsk/resources/vulkan/blur.vert
+++ b/gsk/vulkan/resources/blur.vert
diff --git a/gsk/resources/vulkan/blur.vert.spv b/gsk/vulkan/resources/blur.vert.spv
index f13264fdcf..f13264fdcf 100644
--- a/gsk/resources/vulkan/blur.vert.spv
+++ b/gsk/vulkan/resources/blur.vert.spv
diff --git a/gsk/resources/vulkan/border-clip-rounded.frag.spv b/gsk/vulkan/resources/border-clip-rounded.frag.spv
index f60047f978..f60047f978 100644
--- a/gsk/resources/vulkan/border-clip-rounded.frag.spv
+++ b/gsk/vulkan/resources/border-clip-rounded.frag.spv
diff --git a/gsk/resources/vulkan/border-clip-rounded.vert.spv b/gsk/vulkan/resources/border-clip-rounded.vert.spv
index 50ce2a23af..50ce2a23af 100644
--- a/gsk/resources/vulkan/border-clip-rounded.vert.spv
+++ b/gsk/vulkan/resources/border-clip-rounded.vert.spv
diff --git a/gsk/resources/vulkan/border-clip.frag.spv b/gsk/vulkan/resources/border-clip.frag.spv
index 2fc1ca1dcb..2fc1ca1dcb 100644
--- a/gsk/resources/vulkan/border-clip.frag.spv
+++ b/gsk/vulkan/resources/border-clip.frag.spv
diff --git a/gsk/resources/vulkan/border-clip.vert.spv b/gsk/vulkan/resources/border-clip.vert.spv
index 50ce2a23af..50ce2a23af 100644
--- a/gsk/resources/vulkan/border-clip.vert.spv
+++ b/gsk/vulkan/resources/border-clip.vert.spv
diff --git a/gsk/resources/vulkan/border.frag b/gsk/vulkan/resources/border.frag
index 193ccfa6eb..193ccfa6eb 100644
--- a/gsk/resources/vulkan/border.frag
+++ b/gsk/vulkan/resources/border.frag
diff --git a/gsk/resources/vulkan/border.frag.spv b/gsk/vulkan/resources/border.frag.spv
index 2fc1ca1dcb..2fc1ca1dcb 100644
--- a/gsk/resources/vulkan/border.frag.spv
+++ b/gsk/vulkan/resources/border.frag.spv
diff --git a/gsk/resources/vulkan/border.vert b/gsk/vulkan/resources/border.vert
index c712796e6b..c712796e6b 100644
--- a/gsk/resources/vulkan/border.vert
+++ b/gsk/vulkan/resources/border.vert
diff --git a/gsk/resources/vulkan/border.vert.spv b/gsk/vulkan/resources/border.vert.spv
index 5cd6c74e2a..5cd6c74e2a 100644
--- a/gsk/resources/vulkan/border.vert.spv
+++ b/gsk/vulkan/resources/border.vert.spv
diff --git a/gsk/resources/vulkan/clip.frag.glsl b/gsk/vulkan/resources/clip.frag.glsl
index 472dc6f58c..472dc6f58c 100644
--- a/gsk/resources/vulkan/clip.frag.glsl
+++ b/gsk/vulkan/resources/clip.frag.glsl
diff --git a/gsk/resources/vulkan/clip.vert.glsl b/gsk/vulkan/resources/clip.vert.glsl
index 0dce1a0fb7..0dce1a0fb7 100644
--- a/gsk/resources/vulkan/clip.vert.glsl
+++ b/gsk/vulkan/resources/clip.vert.glsl
diff --git a/gsk/resources/vulkan/color-clip-rounded.frag.spv b/gsk/vulkan/resources/color-clip-rounded.frag.spv
index 74d6fb9689..74d6fb9689 100644
--- a/gsk/resources/vulkan/color-clip-rounded.frag.spv
+++ b/gsk/vulkan/resources/color-clip-rounded.frag.spv
diff --git a/gsk/resources/vulkan/color-clip-rounded.vert.spv b/gsk/vulkan/resources/color-clip-rounded.vert.spv
index daaf33aa22..daaf33aa22 100644
--- a/gsk/resources/vulkan/color-clip-rounded.vert.spv
+++ b/gsk/vulkan/resources/color-clip-rounded.vert.spv
diff --git a/gsk/resources/vulkan/color-clip.frag.spv b/gsk/vulkan/resources/color-clip.frag.spv
index d3ef64ef49..d3ef64ef49 100644
--- a/gsk/resources/vulkan/color-clip.frag.spv
+++ b/gsk/vulkan/resources/color-clip.frag.spv
diff --git a/gsk/resources/vulkan/color-clip.vert.spv b/gsk/vulkan/resources/color-clip.vert.spv
index daaf33aa22..daaf33aa22 100644
--- a/gsk/resources/vulkan/color-clip.vert.spv
+++ b/gsk/vulkan/resources/color-clip.vert.spv
diff --git a/gsk/resources/vulkan/color-matrix-clip-rounded.frag.spv b/gsk/vulkan/resources/color-matrix-clip-rounded.frag.spv
index d25714ea8f..d25714ea8f 100644
--- a/gsk/resources/vulkan/color-matrix-clip-rounded.frag.spv
+++ b/gsk/vulkan/resources/color-matrix-clip-rounded.frag.spv
diff --git a/gsk/resources/vulkan/color-matrix-clip-rounded.vert.spv b/gsk/vulkan/resources/color-matrix-clip-rounded.vert.spv
index f4951f6530..f4951f6530 100644
--- a/gsk/resources/vulkan/color-matrix-clip-rounded.vert.spv
+++ b/gsk/vulkan/resources/color-matrix-clip-rounded.vert.spv
diff --git a/gsk/resources/vulkan/color-matrix-clip.frag.spv b/gsk/vulkan/resources/color-matrix-clip.frag.spv
index a9bd797c00..a9bd797c00 100644
--- a/gsk/resources/vulkan/color-matrix-clip.frag.spv
+++ b/gsk/vulkan/resources/color-matrix-clip.frag.spv
diff --git a/gsk/resources/vulkan/color-matrix-clip.vert.spv b/gsk/vulkan/resources/color-matrix-clip.vert.spv
index f4951f6530..f4951f6530 100644
--- a/gsk/resources/vulkan/color-matrix-clip.vert.spv
+++ b/gsk/vulkan/resources/color-matrix-clip.vert.spv
diff --git a/gsk/resources/vulkan/color-matrix.frag b/gsk/vulkan/resources/color-matrix.frag
index 8787eb443f..8787eb443f 100644
--- a/gsk/resources/vulkan/color-matrix.frag
+++ b/gsk/vulkan/resources/color-matrix.frag
diff --git a/gsk/resources/vulkan/color-matrix.frag.spv b/gsk/vulkan/resources/color-matrix.frag.spv
index a9bd797c00..a9bd797c00 100644
--- a/gsk/resources/vulkan/color-matrix.frag.spv
+++ b/gsk/vulkan/resources/color-matrix.frag.spv
diff --git a/gsk/resources/vulkan/color-matrix.vert b/gsk/vulkan/resources/color-matrix.vert
index f264d10cde..f264d10cde 100644
--- a/gsk/resources/vulkan/color-matrix.vert
+++ b/gsk/vulkan/resources/color-matrix.vert
diff --git a/gsk/resources/vulkan/color-matrix.vert.spv b/gsk/vulkan/resources/color-matrix.vert.spv
index 640ea057c3..640ea057c3 100644
--- a/gsk/resources/vulkan/color-matrix.vert.spv
+++ b/gsk/vulkan/resources/color-matrix.vert.spv
diff --git a/gsk/resources/vulkan/color.frag b/gsk/vulkan/resources/color.frag
index 6b299dffd0..6b299dffd0 100644
--- a/gsk/resources/vulkan/color.frag
+++ b/gsk/vulkan/resources/color.frag
diff --git a/gsk/resources/vulkan/color.frag.spv b/gsk/vulkan/resources/color.frag.spv
index d3ef64ef49..d3ef64ef49 100644
--- a/gsk/resources/vulkan/color.frag.spv
+++ b/gsk/vulkan/resources/color.frag.spv
diff --git a/gsk/resources/vulkan/color.vert b/gsk/vulkan/resources/color.vert
index 1e1618aef9..1e1618aef9 100644
--- a/gsk/resources/vulkan/color.vert
+++ b/gsk/vulkan/resources/color.vert
diff --git a/gsk/resources/vulkan/color.vert.spv b/gsk/vulkan/resources/color.vert.spv
index cc12e4cfb5..cc12e4cfb5 100644
--- a/gsk/resources/vulkan/color.vert.spv
+++ b/gsk/vulkan/resources/color.vert.spv
diff --git a/gsk/resources/vulkan/constants.glsl b/gsk/vulkan/resources/constants.glsl
index 427f42bc1a..427f42bc1a 100644
--- a/gsk/resources/vulkan/constants.glsl
+++ b/gsk/vulkan/resources/constants.glsl
diff --git a/gsk/resources/vulkan/crossfade-clip-rounded.frag.spv b/gsk/vulkan/resources/crossfade-clip-rounded.frag.spv
index 58eb4f78d8..58eb4f78d8 100644
--- a/gsk/resources/vulkan/crossfade-clip-rounded.frag.spv
+++ b/gsk/vulkan/resources/crossfade-clip-rounded.frag.spv
diff --git a/gsk/resources/vulkan/crossfade-clip-rounded.vert.spv b/gsk/vulkan/resources/crossfade-clip-rounded.vert.spv
index 9ed91e1326..9ed91e1326 100644
--- a/gsk/resources/vulkan/crossfade-clip-rounded.vert.spv
+++ b/gsk/vulkan/resources/crossfade-clip-rounded.vert.spv
diff --git a/gsk/resources/vulkan/crossfade-clip.frag.spv b/gsk/vulkan/resources/crossfade-clip.frag.spv
index 76fa8b02dc..76fa8b02dc 100644
--- a/gsk/resources/vulkan/crossfade-clip.frag.spv
+++ b/gsk/vulkan/resources/crossfade-clip.frag.spv
diff --git a/gsk/resources/vulkan/crossfade-clip.vert.spv b/gsk/vulkan/resources/crossfade-clip.vert.spv
index 9ed91e1326..9ed91e1326 100644
--- a/gsk/resources/vulkan/crossfade-clip.vert.spv
+++ b/gsk/vulkan/resources/crossfade-clip.vert.spv
diff --git a/gsk/resources/vulkan/crossfade-rect.vert.spv b/gsk/vulkan/resources/crossfade-rect.vert.spv
index 9ed91e1326..9ed91e1326 100644
--- a/gsk/resources/vulkan/crossfade-rect.vert.spv
+++ b/gsk/vulkan/resources/crossfade-rect.vert.spv
diff --git a/gsk/resources/vulkan/crossfade.frag b/gsk/vulkan/resources/crossfade.frag
index 8293b1d5d8..8293b1d5d8 100644
--- a/gsk/resources/vulkan/crossfade.frag
+++ b/gsk/vulkan/resources/crossfade.frag
diff --git a/gsk/resources/vulkan/crossfade.frag.spv b/gsk/vulkan/resources/crossfade.frag.spv
index 76fa8b02dc..76fa8b02dc 100644
--- a/gsk/resources/vulkan/crossfade.frag.spv
+++ b/gsk/vulkan/resources/crossfade.frag.spv
diff --git a/gsk/resources/vulkan/crossfade.vert b/gsk/vulkan/resources/crossfade.vert
index 837f0084ee..837f0084ee 100644
--- a/gsk/resources/vulkan/crossfade.vert
+++ b/gsk/vulkan/resources/crossfade.vert
diff --git a/gsk/resources/vulkan/crossfade.vert.spv b/gsk/vulkan/resources/crossfade.vert.spv
index 5df7beaecf..5df7beaecf 100644
--- a/gsk/resources/vulkan/crossfade.vert.spv
+++ b/gsk/vulkan/resources/crossfade.vert.spv
diff --git a/gsk/resources/vulkan/inset-shadow-clip-rounded.frag.spv b/gsk/vulkan/resources/inset-shadow-clip-rounded.frag.spv
index f61cf77d76..f61cf77d76 100644
--- a/gsk/resources/vulkan/inset-shadow-clip-rounded.frag.spv
+++ b/gsk/vulkan/resources/inset-shadow-clip-rounded.frag.spv
diff --git a/gsk/resources/vulkan/inset-shadow-clip-rounded.vert.spv b/gsk/vulkan/resources/inset-shadow-clip-rounded.vert.spv
index 4114f999f8..4114f999f8 100644
--- a/gsk/resources/vulkan/inset-shadow-clip-rounded.vert.spv
+++ b/gsk/vulkan/resources/inset-shadow-clip-rounded.vert.spv
diff --git a/gsk/resources/vulkan/inset-shadow-clip.frag.spv b/gsk/vulkan/resources/inset-shadow-clip.frag.spv
index 466051c47e..466051c47e 100644
--- a/gsk/resources/vulkan/inset-shadow-clip.frag.spv
+++ b/gsk/vulkan/resources/inset-shadow-clip.frag.spv
diff --git a/gsk/resources/vulkan/inset-shadow-clip.vert.spv b/gsk/vulkan/resources/inset-shadow-clip.vert.spv
index 4114f999f8..4114f999f8 100644
--- a/gsk/resources/vulkan/inset-shadow-clip.vert.spv
+++ b/gsk/vulkan/resources/inset-shadow-clip.vert.spv
diff --git a/gsk/resources/vulkan/inset-shadow.frag b/gsk/vulkan/resources/inset-shadow.frag
index 594b325c47..594b325c47 100644
--- a/gsk/resources/vulkan/inset-shadow.frag
+++ b/gsk/vulkan/resources/inset-shadow.frag
diff --git a/gsk/resources/vulkan/inset-shadow.frag.spv b/gsk/vulkan/resources/inset-shadow.frag.spv
index 466051c47e..466051c47e 100644
--- a/gsk/resources/vulkan/inset-shadow.frag.spv
+++ b/gsk/vulkan/resources/inset-shadow.frag.spv
diff --git a/gsk/resources/vulkan/inset-shadow.vert b/gsk/vulkan/resources/inset-shadow.vert
index 5fd8623529..5fd8623529 100644
--- a/gsk/resources/vulkan/inset-shadow.vert
+++ b/gsk/vulkan/resources/inset-shadow.vert
diff --git a/gsk/resources/vulkan/inset-shadow.vert.spv b/gsk/vulkan/resources/inset-shadow.vert.spv
index 8f1d191ac0..8f1d191ac0 100644
--- a/gsk/resources/vulkan/inset-shadow.vert.spv
+++ b/gsk/vulkan/resources/inset-shadow.vert.spv
diff --git a/gsk/resources/vulkan/linear-clip-rounded.frag.spv b/gsk/vulkan/resources/linear-clip-rounded.frag.spv
index 2610f33ea4..2610f33ea4 100644
--- a/gsk/resources/vulkan/linear-clip-rounded.frag.spv
+++ b/gsk/vulkan/resources/linear-clip-rounded.frag.spv
diff --git a/gsk/resources/vulkan/linear-clip-rounded.vert.spv b/gsk/vulkan/resources/linear-clip-rounded.vert.spv
index 9124ffbe41..9124ffbe41 100644
--- a/gsk/resources/vulkan/linear-clip-rounded.vert.spv
+++ b/gsk/vulkan/resources/linear-clip-rounded.vert.spv
diff --git a/gsk/resources/vulkan/linear-clip.frag.spv b/gsk/vulkan/resources/linear-clip.frag.spv
index 86f9ea0cb4..86f9ea0cb4 100644
--- a/gsk/resources/vulkan/linear-clip.frag.spv
+++ b/gsk/vulkan/resources/linear-clip.frag.spv
diff --git a/gsk/resources/vulkan/linear-clip.vert.spv b/gsk/vulkan/resources/linear-clip.vert.spv
index 9124ffbe41..9124ffbe41 100644
--- a/gsk/resources/vulkan/linear-clip.vert.spv
+++ b/gsk/vulkan/resources/linear-clip.vert.spv
diff --git a/gsk/resources/vulkan/linear.frag b/gsk/vulkan/resources/linear.frag
index cb7727f641..cb7727f641 100644
--- a/gsk/resources/vulkan/linear.frag
+++ b/gsk/vulkan/resources/linear.frag
diff --git a/gsk/resources/vulkan/linear.frag.spv b/gsk/vulkan/resources/linear.frag.spv
index 86f9ea0cb4..86f9ea0cb4 100644
--- a/gsk/resources/vulkan/linear.frag.spv
+++ b/gsk/vulkan/resources/linear.frag.spv
diff --git a/gsk/resources/vulkan/linear.vert b/gsk/vulkan/resources/linear.vert
index 7453c0d884..7453c0d884 100644
--- a/gsk/resources/vulkan/linear.vert
+++ b/gsk/vulkan/resources/linear.vert
diff --git a/gsk/resources/vulkan/linear.vert.spv b/gsk/vulkan/resources/linear.vert.spv
index ef426921b6..ef426921b6 100644
--- a/gsk/resources/vulkan/linear.vert.spv
+++ b/gsk/vulkan/resources/linear.vert.spv
diff --git a/gsk/resources/vulkan/mask-clip-rounded.frag.spv b/gsk/vulkan/resources/mask-clip-rounded.frag.spv
index 0e5fd97626..0e5fd97626 100644
--- a/gsk/resources/vulkan/mask-clip-rounded.frag.spv
+++ b/gsk/vulkan/resources/mask-clip-rounded.frag.spv
diff --git a/gsk/resources/vulkan/mask-clip-rounded.vert.spv b/gsk/vulkan/resources/mask-clip-rounded.vert.spv
index 34156b4535..34156b4535 100644
--- a/gsk/resources/vulkan/mask-clip-rounded.vert.spv
+++ b/gsk/vulkan/resources/mask-clip-rounded.vert.spv
diff --git a/gsk/resources/vulkan/mask-clip.frag.spv b/gsk/vulkan/resources/mask-clip.frag.spv
index 5e321e2f28..5e321e2f28 100644
--- a/gsk/resources/vulkan/mask-clip.frag.spv
+++ b/gsk/vulkan/resources/mask-clip.frag.spv
diff --git a/gsk/resources/vulkan/mask-clip.vert.spv b/gsk/vulkan/resources/mask-clip.vert.spv
index 34156b4535..34156b4535 100644
--- a/gsk/resources/vulkan/mask-clip.vert.spv
+++ b/gsk/vulkan/resources/mask-clip.vert.spv
diff --git a/gsk/resources/vulkan/mask.frag b/gsk/vulkan/resources/mask.frag
index 81f6833ef2..81f6833ef2 100644
--- a/gsk/resources/vulkan/mask.frag
+++ b/gsk/vulkan/resources/mask.frag
diff --git a/gsk/resources/vulkan/mask.frag.spv b/gsk/vulkan/resources/mask.frag.spv
index 5e321e2f28..5e321e2f28 100644
--- a/gsk/resources/vulkan/mask.frag.spv
+++ b/gsk/vulkan/resources/mask.frag.spv
diff --git a/gsk/resources/vulkan/mask.vert b/gsk/vulkan/resources/mask.vert
index 03f0329278..03f0329278 100644
--- a/gsk/resources/vulkan/mask.vert
+++ b/gsk/vulkan/resources/mask.vert
diff --git a/gsk/resources/vulkan/mask.vert.spv b/gsk/vulkan/resources/mask.vert.spv
index 4c1bbfcad4..4c1bbfcad4 100644
--- a/gsk/resources/vulkan/mask.vert.spv
+++ b/gsk/vulkan/resources/mask.vert.spv
diff --git a/gsk/resources/vulkan/meson.build b/gsk/vulkan/resources/meson.build
index 3486a8868b..3486a8868b 100644
--- a/gsk/resources/vulkan/meson.build
+++ b/gsk/vulkan/resources/meson.build
diff --git a/gsk/resources/vulkan/outset-shadow-clip-rounded.frag.spv b/gsk/vulkan/resources/outset-shadow-clip-rounded.frag.spv
index a6437204b0..a6437204b0 100644
--- a/gsk/resources/vulkan/outset-shadow-clip-rounded.frag.spv
+++ b/gsk/vulkan/resources/outset-shadow-clip-rounded.frag.spv
diff --git a/gsk/resources/vulkan/outset-shadow-clip-rounded.vert.spv b/gsk/vulkan/resources/outset-shadow-clip-rounded.vert.spv
index d0cd27368d..d0cd27368d 100644
--- a/gsk/resources/vulkan/outset-shadow-clip-rounded.vert.spv
+++ b/gsk/vulkan/resources/outset-shadow-clip-rounded.vert.spv
diff --git a/gsk/resources/vulkan/outset-shadow-clip.frag.spv b/gsk/vulkan/resources/outset-shadow-clip.frag.spv
index 65904aa607..65904aa607 100644
--- a/gsk/resources/vulkan/outset-shadow-clip.frag.spv
+++ b/gsk/vulkan/resources/outset-shadow-clip.frag.spv
diff --git a/gsk/resources/vulkan/outset-shadow-clip.vert.spv b/gsk/vulkan/resources/outset-shadow-clip.vert.spv
index d0cd27368d..d0cd27368d 100644
--- a/gsk/resources/vulkan/outset-shadow-clip.vert.spv
+++ b/gsk/vulkan/resources/outset-shadow-clip.vert.spv
diff --git a/gsk/resources/vulkan/outset-shadow.frag b/gsk/vulkan/resources/outset-shadow.frag
index 30b0f9d94b..30b0f9d94b 100644
--- a/gsk/resources/vulkan/outset-shadow.frag
+++ b/gsk/vulkan/resources/outset-shadow.frag
diff --git a/gsk/resources/vulkan/outset-shadow.frag.spv b/gsk/vulkan/resources/outset-shadow.frag.spv
index 65904aa607..65904aa607 100644
--- a/gsk/resources/vulkan/outset-shadow.frag.spv
+++ b/gsk/vulkan/resources/outset-shadow.frag.spv
diff --git a/gsk/resources/vulkan/outset-shadow.vert b/gsk/vulkan/resources/outset-shadow.vert
index 6fdaf17171..6fdaf17171 100644
--- a/gsk/resources/vulkan/outset-shadow.vert
+++ b/gsk/vulkan/resources/outset-shadow.vert
diff --git a/gsk/resources/vulkan/outset-shadow.vert.spv b/gsk/vulkan/resources/outset-shadow.vert.spv
index 260009fb88..260009fb88 100644
--- a/gsk/resources/vulkan/outset-shadow.vert.spv
+++ b/gsk/vulkan/resources/outset-shadow.vert.spv
diff --git a/gsk/resources/vulkan/rounded-rect.glsl b/gsk/vulkan/resources/rounded-rect.glsl
index e0c2ffc6f9..e0c2ffc6f9 100644
--- a/gsk/resources/vulkan/rounded-rect.glsl
+++ b/gsk/vulkan/resources/rounded-rect.glsl
diff --git a/gsk/resources/vulkan/texture-clip-rounded.frag.spv b/gsk/vulkan/resources/texture-clip-rounded.frag.spv
index 8b4b3b332e..8b4b3b332e 100644
--- a/gsk/resources/vulkan/texture-clip-rounded.frag.spv
+++ b/gsk/vulkan/resources/texture-clip-rounded.frag.spv
diff --git a/gsk/resources/vulkan/texture-clip-rounded.vert.spv b/gsk/vulkan/resources/texture-clip-rounded.vert.spv
index cb6a9dadbb..cb6a9dadbb 100644
--- a/gsk/resources/vulkan/texture-clip-rounded.vert.spv
+++ b/gsk/vulkan/resources/texture-clip-rounded.vert.spv
diff --git a/gsk/resources/vulkan/texture-clip.frag.spv b/gsk/vulkan/resources/texture-clip.frag.spv
index 9d337c7202..9d337c7202 100644
--- a/gsk/resources/vulkan/texture-clip.frag.spv
+++ b/gsk/vulkan/resources/texture-clip.frag.spv
diff --git a/gsk/resources/vulkan/texture-clip.vert.spv b/gsk/vulkan/resources/texture-clip.vert.spv
index cb6a9dadbb..cb6a9dadbb 100644
--- a/gsk/resources/vulkan/texture-clip.vert.spv
+++ b/gsk/vulkan/resources/texture-clip.vert.spv
diff --git a/gsk/resources/vulkan/texture.frag b/gsk/vulkan/resources/texture.frag
index ee9eb459a9..ee9eb459a9 100644
--- a/gsk/resources/vulkan/texture.frag
+++ b/gsk/vulkan/resources/texture.frag
diff --git a/gsk/resources/vulkan/texture.frag.spv b/gsk/vulkan/resources/texture.frag.spv
index 9d337c7202..9d337c7202 100644
--- a/gsk/resources/vulkan/texture.frag.spv
+++ b/gsk/vulkan/resources/texture.frag.spv
diff --git a/gsk/resources/vulkan/texture.vert b/gsk/vulkan/resources/texture.vert
index e1e08bc21a..e1e08bc21a 100644
--- a/gsk/resources/vulkan/texture.vert
+++ b/gsk/vulkan/resources/texture.vert
diff --git a/gsk/resources/vulkan/texture.vert.spv b/gsk/vulkan/resources/texture.vert.spv
index 159680ac36..159680ac36 100644
--- a/gsk/resources/vulkan/texture.vert.spv
+++ b/gsk/vulkan/resources/texture.vert.spv