From ee63b84b6ab6fb8b342d5ea7a0441765a078c33b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 3 Apr 2021 08:10:58 -0400 Subject: [PATCH 1/2] gsk: Rename resource paths Make the shaders of the gl renderer live under /org/gtk/libgsk/gl. This is purely cosmetic. --- gsk/gen-gsk-gresources-xml.py | 2 +- gsk/gl/gskglrenderer.c | 36 +++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gsk/gen-gsk-gresources-xml.py b/gsk/gen-gsk-gresources-xml.py index 16a2c4042a..404380e27b 100644 --- a/gsk/gen-gsk-gresources-xml.py +++ b/gsk/gen-gsk-gresources-xml.py @@ -45,7 +45,7 @@ xml = ''' ''' for f in gl_source_shaders: - xml += ' resources/glsl/{0}\n'.format(os.path.basename(f)) + xml += ' resources/glsl/{0}\n'.format(os.path.basename(f)) xml += '\n' 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); From 900a4e4d3119e0a3cf54dcc9072c90d69728905d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 3 Apr 2021 08:16:50 -0400 Subject: [PATCH 2/2] gsk: Move shader resources Move the resources of each renderer to its subdirectory. We've previously done that for the ngl renderer, but it is better to be consistent and do it for all the renderers. --- gsk/gen-gsk-gresources-xml.py | 6 +-- .../glsl => gl/resources}/blend.glsl | 0 .../glsl => gl/resources}/blit.glsl | 0 .../glsl => gl/resources}/blur.glsl | 0 .../glsl => gl/resources}/border.glsl | 0 .../glsl => gl/resources}/color.glsl | 0 .../glsl => gl/resources}/color_matrix.glsl | 0 .../glsl => gl/resources}/coloring.glsl | 0 .../glsl => gl/resources}/conic_gradient.glsl | 0 .../glsl => gl/resources}/cross_fade.glsl | 0 .../glsl => gl/resources}/custom.glsl | 0 .../glsl => gl/resources}/inset_shadow.glsl | 0 .../resources}/linear_gradient.glsl | 0 .../glsl => gl/resources}/outset_shadow.glsl | 0 .../glsl => gl/resources}/preamble.fs.glsl | 0 .../glsl => gl/resources}/preamble.glsl | 0 .../glsl => gl/resources}/preamble.vs.glsl | 0 .../resources}/radial_gradient.glsl | 0 .../glsl => gl/resources}/repeat.glsl | 0 .../resources}/unblurred_outset_shadow.glsl | 0 gsk/meson.build | 40 +++++++++--------- .../blendmode-clip-rounded.frag.spv | Bin .../blendmode-clip-rounded.vert.spv | Bin .../resources}/blendmode-clip.frag.spv | Bin .../resources}/blendmode-clip.vert.spv | Bin .../blendmode-rect-rounded.frag.spv | Bin .../resources}/blendmode-rect.frag.spv | Bin .../resources}/blendmode.frag | 0 .../resources}/blendmode.frag.spv | Bin .../resources}/blendmode.vert | 0 .../resources}/blendmode.vert.spv | Bin .../resources}/blur-clip-rounded.frag.spv | Bin .../resources}/blur-clip-rounded.vert.spv | Bin .../resources}/blur-clip.frag.spv | Bin .../resources}/blur-clip.vert.spv | Bin .../vulkan => vulkan/resources}/blur.frag | 0 .../vulkan => vulkan/resources}/blur.frag.spv | Bin .../vulkan => vulkan/resources}/blur.vert | 0 .../vulkan => vulkan/resources}/blur.vert.spv | Bin .../resources}/border-clip-rounded.frag.spv | Bin .../resources}/border-clip-rounded.vert.spv | Bin .../resources}/border-clip.frag.spv | Bin .../resources}/border-clip.vert.spv | Bin .../vulkan => vulkan/resources}/border.frag | 0 .../resources}/border.frag.spv | Bin .../vulkan => vulkan/resources}/border.vert | 0 .../resources}/border.vert.spv | Bin .../resources}/clip.frag.glsl | 0 .../resources}/clip.vert.glsl | 0 .../resources}/color-clip-rounded.frag.spv | Bin .../resources}/color-clip-rounded.vert.spv | Bin .../resources}/color-clip.frag.spv | Bin .../resources}/color-clip.vert.spv | Bin .../color-matrix-clip-rounded.frag.spv | Bin .../color-matrix-clip-rounded.vert.spv | Bin .../resources}/color-matrix-clip.frag.spv | Bin .../resources}/color-matrix-clip.vert.spv | Bin .../resources}/color-matrix.frag | 0 .../resources}/color-matrix.frag.spv | Bin .../resources}/color-matrix.vert | 0 .../resources}/color-matrix.vert.spv | Bin .../vulkan => vulkan/resources}/color.frag | 0 .../resources}/color.frag.spv | Bin .../vulkan => vulkan/resources}/color.vert | 0 .../resources}/color.vert.spv | Bin .../resources}/constants.glsl | 0 .../crossfade-clip-rounded.frag.spv | Bin .../crossfade-clip-rounded.vert.spv | Bin .../resources}/crossfade-clip.frag.spv | Bin .../resources}/crossfade-clip.vert.spv | Bin .../resources}/crossfade-rect.vert.spv | Bin .../resources}/crossfade.frag | 0 .../resources}/crossfade.frag.spv | Bin .../resources}/crossfade.vert | 0 .../resources}/crossfade.vert.spv | Bin .../inset-shadow-clip-rounded.frag.spv | Bin .../inset-shadow-clip-rounded.vert.spv | Bin .../resources}/inset-shadow-clip.frag.spv | Bin .../resources}/inset-shadow-clip.vert.spv | Bin .../resources}/inset-shadow.frag | 0 .../resources}/inset-shadow.frag.spv | Bin .../resources}/inset-shadow.vert | 0 .../resources}/inset-shadow.vert.spv | Bin .../resources}/linear-clip-rounded.frag.spv | Bin .../resources}/linear-clip-rounded.vert.spv | Bin .../resources}/linear-clip.frag.spv | Bin .../resources}/linear-clip.vert.spv | Bin .../vulkan => vulkan/resources}/linear.frag | 0 .../resources}/linear.frag.spv | Bin .../vulkan => vulkan/resources}/linear.vert | 0 .../resources}/linear.vert.spv | Bin .../resources}/mask-clip-rounded.frag.spv | Bin .../resources}/mask-clip-rounded.vert.spv | Bin .../resources}/mask-clip.frag.spv | Bin .../resources}/mask-clip.vert.spv | Bin .../vulkan => vulkan/resources}/mask.frag | 0 .../vulkan => vulkan/resources}/mask.frag.spv | Bin .../vulkan => vulkan/resources}/mask.vert | 0 .../vulkan => vulkan/resources}/mask.vert.spv | Bin .../vulkan => vulkan/resources}/meson.build | 0 .../outset-shadow-clip-rounded.frag.spv | Bin .../outset-shadow-clip-rounded.vert.spv | Bin .../resources}/outset-shadow-clip.frag.spv | Bin .../resources}/outset-shadow-clip.vert.spv | Bin .../resources}/outset-shadow.frag | 0 .../resources}/outset-shadow.frag.spv | Bin .../resources}/outset-shadow.vert | 0 .../resources}/outset-shadow.vert.spv | Bin .../resources}/rounded-rect.glsl | 0 .../resources}/texture-clip-rounded.frag.spv | Bin .../resources}/texture-clip-rounded.vert.spv | Bin .../resources}/texture-clip.frag.spv | Bin .../resources}/texture-clip.vert.spv | Bin .../vulkan => vulkan/resources}/texture.frag | 0 .../resources}/texture.frag.spv | Bin .../vulkan => vulkan/resources}/texture.vert | 0 .../resources}/texture.vert.spv | Bin 117 files changed, 23 insertions(+), 23 deletions(-) rename gsk/{resources/glsl => gl/resources}/blend.glsl (100%) rename gsk/{resources/glsl => gl/resources}/blit.glsl (100%) rename gsk/{resources/glsl => gl/resources}/blur.glsl (100%) rename gsk/{resources/glsl => gl/resources}/border.glsl (100%) rename gsk/{resources/glsl => gl/resources}/color.glsl (100%) rename gsk/{resources/glsl => gl/resources}/color_matrix.glsl (100%) rename gsk/{resources/glsl => gl/resources}/coloring.glsl (100%) rename gsk/{resources/glsl => gl/resources}/conic_gradient.glsl (100%) rename gsk/{resources/glsl => gl/resources}/cross_fade.glsl (100%) rename gsk/{resources/glsl => gl/resources}/custom.glsl (100%) rename gsk/{resources/glsl => gl/resources}/inset_shadow.glsl (100%) rename gsk/{resources/glsl => gl/resources}/linear_gradient.glsl (100%) rename gsk/{resources/glsl => gl/resources}/outset_shadow.glsl (100%) rename gsk/{resources/glsl => gl/resources}/preamble.fs.glsl (100%) rename gsk/{resources/glsl => gl/resources}/preamble.glsl (100%) rename gsk/{resources/glsl => gl/resources}/preamble.vs.glsl (100%) rename gsk/{resources/glsl => gl/resources}/radial_gradient.glsl (100%) rename gsk/{resources/glsl => gl/resources}/repeat.glsl (100%) rename gsk/{resources/glsl => gl/resources}/unblurred_outset_shadow.glsl (100%) rename gsk/{resources/vulkan => vulkan/resources}/blendmode-clip-rounded.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/blendmode-clip-rounded.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/blendmode-clip.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/blendmode-clip.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/blendmode-rect-rounded.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/blendmode-rect.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/blendmode.frag (100%) rename gsk/{resources/vulkan => vulkan/resources}/blendmode.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/blendmode.vert (100%) rename gsk/{resources/vulkan => vulkan/resources}/blendmode.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/blur-clip-rounded.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/blur-clip-rounded.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/blur-clip.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/blur-clip.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/blur.frag (100%) rename gsk/{resources/vulkan => vulkan/resources}/blur.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/blur.vert (100%) rename gsk/{resources/vulkan => vulkan/resources}/blur.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/border-clip-rounded.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/border-clip-rounded.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/border-clip.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/border-clip.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/border.frag (100%) rename gsk/{resources/vulkan => vulkan/resources}/border.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/border.vert (100%) rename gsk/{resources/vulkan => vulkan/resources}/border.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/clip.frag.glsl (100%) rename gsk/{resources/vulkan => vulkan/resources}/clip.vert.glsl (100%) rename gsk/{resources/vulkan => vulkan/resources}/color-clip-rounded.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/color-clip-rounded.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/color-clip.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/color-clip.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/color-matrix-clip-rounded.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/color-matrix-clip-rounded.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/color-matrix-clip.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/color-matrix-clip.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/color-matrix.frag (100%) rename gsk/{resources/vulkan => vulkan/resources}/color-matrix.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/color-matrix.vert (100%) rename gsk/{resources/vulkan => vulkan/resources}/color-matrix.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/color.frag (100%) rename gsk/{resources/vulkan => vulkan/resources}/color.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/color.vert (100%) rename gsk/{resources/vulkan => vulkan/resources}/color.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/constants.glsl (100%) rename gsk/{resources/vulkan => vulkan/resources}/crossfade-clip-rounded.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/crossfade-clip-rounded.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/crossfade-clip.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/crossfade-clip.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/crossfade-rect.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/crossfade.frag (100%) rename gsk/{resources/vulkan => vulkan/resources}/crossfade.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/crossfade.vert (100%) rename gsk/{resources/vulkan => vulkan/resources}/crossfade.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/inset-shadow-clip-rounded.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/inset-shadow-clip-rounded.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/inset-shadow-clip.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/inset-shadow-clip.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/inset-shadow.frag (100%) rename gsk/{resources/vulkan => vulkan/resources}/inset-shadow.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/inset-shadow.vert (100%) rename gsk/{resources/vulkan => vulkan/resources}/inset-shadow.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/linear-clip-rounded.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/linear-clip-rounded.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/linear-clip.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/linear-clip.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/linear.frag (100%) rename gsk/{resources/vulkan => vulkan/resources}/linear.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/linear.vert (100%) rename gsk/{resources/vulkan => vulkan/resources}/linear.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/mask-clip-rounded.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/mask-clip-rounded.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/mask-clip.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/mask-clip.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/mask.frag (100%) rename gsk/{resources/vulkan => vulkan/resources}/mask.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/mask.vert (100%) rename gsk/{resources/vulkan => vulkan/resources}/mask.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/meson.build (100%) rename gsk/{resources/vulkan => vulkan/resources}/outset-shadow-clip-rounded.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/outset-shadow-clip-rounded.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/outset-shadow-clip.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/outset-shadow-clip.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/outset-shadow.frag (100%) rename gsk/{resources/vulkan => vulkan/resources}/outset-shadow.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/outset-shadow.vert (100%) rename gsk/{resources/vulkan => vulkan/resources}/outset-shadow.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/rounded-rect.glsl (100%) rename gsk/{resources/vulkan => vulkan/resources}/texture-clip-rounded.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/texture-clip-rounded.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/texture-clip.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/texture-clip.vert.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/texture.frag (100%) rename gsk/{resources/vulkan => vulkan/resources}/texture.frag.spv (100%) rename gsk/{resources/vulkan => vulkan/resources}/texture.vert (100%) rename gsk/{resources/vulkan => vulkan/resources}/texture.vert.spv (100%) diff --git a/gsk/gen-gsk-gresources-xml.py b/gsk/gen-gsk-gresources-xml.py index 404380e27b..25dc35a3b7 100644 --- a/gsk/gen-gsk-gresources-xml.py +++ b/gsk/gen-gsk-gresources-xml.py @@ -45,7 +45,7 @@ xml = ''' ''' for f in gl_source_shaders: - xml += ' resources/glsl/{0}\n'.format(os.path.basename(f)) + xml += ' gl/resources/{0}\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 += ' resources/vulkan/{0}\n'.format(os.path.basename(f)) + xml += ' vulkan/resources/{0}\n'.format(os.path.basename(f)) xml += '\n' for f in vulkan_shaders: - xml += ' resources/vulkan/{0}\n'.format(os.path.basename(f)) + xml += ' vulkan/resources/{0}\n'.format(os.path.basename(f)) xml += ''' diff --git a/gsk/resources/glsl/blend.glsl b/gsk/gl/resources/blend.glsl similarity index 100% rename from gsk/resources/glsl/blend.glsl rename to gsk/gl/resources/blend.glsl diff --git a/gsk/resources/glsl/blit.glsl b/gsk/gl/resources/blit.glsl similarity index 100% rename from gsk/resources/glsl/blit.glsl rename to gsk/gl/resources/blit.glsl diff --git a/gsk/resources/glsl/blur.glsl b/gsk/gl/resources/blur.glsl similarity index 100% rename from gsk/resources/glsl/blur.glsl rename to gsk/gl/resources/blur.glsl diff --git a/gsk/resources/glsl/border.glsl b/gsk/gl/resources/border.glsl similarity index 100% rename from gsk/resources/glsl/border.glsl rename to gsk/gl/resources/border.glsl diff --git a/gsk/resources/glsl/color.glsl b/gsk/gl/resources/color.glsl similarity index 100% rename from gsk/resources/glsl/color.glsl rename to gsk/gl/resources/color.glsl diff --git a/gsk/resources/glsl/color_matrix.glsl b/gsk/gl/resources/color_matrix.glsl similarity index 100% rename from gsk/resources/glsl/color_matrix.glsl rename to gsk/gl/resources/color_matrix.glsl diff --git a/gsk/resources/glsl/coloring.glsl b/gsk/gl/resources/coloring.glsl similarity index 100% rename from gsk/resources/glsl/coloring.glsl rename to gsk/gl/resources/coloring.glsl diff --git a/gsk/resources/glsl/conic_gradient.glsl b/gsk/gl/resources/conic_gradient.glsl similarity index 100% rename from gsk/resources/glsl/conic_gradient.glsl rename to gsk/gl/resources/conic_gradient.glsl diff --git a/gsk/resources/glsl/cross_fade.glsl b/gsk/gl/resources/cross_fade.glsl similarity index 100% rename from gsk/resources/glsl/cross_fade.glsl rename to gsk/gl/resources/cross_fade.glsl diff --git a/gsk/resources/glsl/custom.glsl b/gsk/gl/resources/custom.glsl similarity index 100% rename from gsk/resources/glsl/custom.glsl rename to gsk/gl/resources/custom.glsl diff --git a/gsk/resources/glsl/inset_shadow.glsl b/gsk/gl/resources/inset_shadow.glsl similarity index 100% rename from gsk/resources/glsl/inset_shadow.glsl rename to gsk/gl/resources/inset_shadow.glsl diff --git a/gsk/resources/glsl/linear_gradient.glsl b/gsk/gl/resources/linear_gradient.glsl similarity index 100% rename from gsk/resources/glsl/linear_gradient.glsl rename to gsk/gl/resources/linear_gradient.glsl diff --git a/gsk/resources/glsl/outset_shadow.glsl b/gsk/gl/resources/outset_shadow.glsl similarity index 100% rename from gsk/resources/glsl/outset_shadow.glsl rename to gsk/gl/resources/outset_shadow.glsl diff --git a/gsk/resources/glsl/preamble.fs.glsl b/gsk/gl/resources/preamble.fs.glsl similarity index 100% rename from gsk/resources/glsl/preamble.fs.glsl rename to gsk/gl/resources/preamble.fs.glsl diff --git a/gsk/resources/glsl/preamble.glsl b/gsk/gl/resources/preamble.glsl similarity index 100% rename from gsk/resources/glsl/preamble.glsl rename to gsk/gl/resources/preamble.glsl diff --git a/gsk/resources/glsl/preamble.vs.glsl b/gsk/gl/resources/preamble.vs.glsl similarity index 100% rename from gsk/resources/glsl/preamble.vs.glsl rename to gsk/gl/resources/preamble.vs.glsl diff --git a/gsk/resources/glsl/radial_gradient.glsl b/gsk/gl/resources/radial_gradient.glsl similarity index 100% rename from gsk/resources/glsl/radial_gradient.glsl rename to gsk/gl/resources/radial_gradient.glsl diff --git a/gsk/resources/glsl/repeat.glsl b/gsk/gl/resources/repeat.glsl similarity index 100% rename from gsk/resources/glsl/repeat.glsl rename to gsk/gl/resources/repeat.glsl diff --git a/gsk/resources/glsl/unblurred_outset_shadow.glsl b/gsk/gl/resources/unblurred_outset_shadow.glsl similarity index 100% rename from gsk/resources/glsl/unblurred_outset_shadow.glsl rename to 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 similarity index 100% rename from gsk/resources/vulkan/blendmode-clip-rounded.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/blendmode-clip-rounded.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/blendmode-clip.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/blendmode-clip.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/blendmode-rect-rounded.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/blendmode-rect.frag.spv rename to gsk/vulkan/resources/blendmode-rect.frag.spv diff --git a/gsk/resources/vulkan/blendmode.frag b/gsk/vulkan/resources/blendmode.frag similarity index 100% rename from gsk/resources/vulkan/blendmode.frag rename to gsk/vulkan/resources/blendmode.frag diff --git a/gsk/resources/vulkan/blendmode.frag.spv b/gsk/vulkan/resources/blendmode.frag.spv similarity index 100% rename from gsk/resources/vulkan/blendmode.frag.spv rename to gsk/vulkan/resources/blendmode.frag.spv diff --git a/gsk/resources/vulkan/blendmode.vert b/gsk/vulkan/resources/blendmode.vert similarity index 100% rename from gsk/resources/vulkan/blendmode.vert rename to gsk/vulkan/resources/blendmode.vert diff --git a/gsk/resources/vulkan/blendmode.vert.spv b/gsk/vulkan/resources/blendmode.vert.spv similarity index 100% rename from gsk/resources/vulkan/blendmode.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/blur-clip-rounded.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/blur-clip-rounded.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/blur-clip.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/blur-clip.vert.spv rename to gsk/vulkan/resources/blur-clip.vert.spv diff --git a/gsk/resources/vulkan/blur.frag b/gsk/vulkan/resources/blur.frag similarity index 100% rename from gsk/resources/vulkan/blur.frag rename to gsk/vulkan/resources/blur.frag diff --git a/gsk/resources/vulkan/blur.frag.spv b/gsk/vulkan/resources/blur.frag.spv similarity index 100% rename from gsk/resources/vulkan/blur.frag.spv rename to gsk/vulkan/resources/blur.frag.spv diff --git a/gsk/resources/vulkan/blur.vert b/gsk/vulkan/resources/blur.vert similarity index 100% rename from gsk/resources/vulkan/blur.vert rename to gsk/vulkan/resources/blur.vert diff --git a/gsk/resources/vulkan/blur.vert.spv b/gsk/vulkan/resources/blur.vert.spv similarity index 100% rename from gsk/resources/vulkan/blur.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/border-clip-rounded.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/border-clip-rounded.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/border-clip.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/border-clip.vert.spv rename to gsk/vulkan/resources/border-clip.vert.spv diff --git a/gsk/resources/vulkan/border.frag b/gsk/vulkan/resources/border.frag similarity index 100% rename from gsk/resources/vulkan/border.frag rename to gsk/vulkan/resources/border.frag diff --git a/gsk/resources/vulkan/border.frag.spv b/gsk/vulkan/resources/border.frag.spv similarity index 100% rename from gsk/resources/vulkan/border.frag.spv rename to gsk/vulkan/resources/border.frag.spv diff --git a/gsk/resources/vulkan/border.vert b/gsk/vulkan/resources/border.vert similarity index 100% rename from gsk/resources/vulkan/border.vert rename to gsk/vulkan/resources/border.vert diff --git a/gsk/resources/vulkan/border.vert.spv b/gsk/vulkan/resources/border.vert.spv similarity index 100% rename from gsk/resources/vulkan/border.vert.spv rename to gsk/vulkan/resources/border.vert.spv diff --git a/gsk/resources/vulkan/clip.frag.glsl b/gsk/vulkan/resources/clip.frag.glsl similarity index 100% rename from gsk/resources/vulkan/clip.frag.glsl rename to gsk/vulkan/resources/clip.frag.glsl diff --git a/gsk/resources/vulkan/clip.vert.glsl b/gsk/vulkan/resources/clip.vert.glsl similarity index 100% rename from gsk/resources/vulkan/clip.vert.glsl rename to 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 similarity index 100% rename from gsk/resources/vulkan/color-clip-rounded.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/color-clip-rounded.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/color-clip.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/color-clip.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/color-matrix-clip-rounded.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/color-matrix-clip-rounded.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/color-matrix-clip.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/color-matrix-clip.vert.spv rename to gsk/vulkan/resources/color-matrix-clip.vert.spv diff --git a/gsk/resources/vulkan/color-matrix.frag b/gsk/vulkan/resources/color-matrix.frag similarity index 100% rename from gsk/resources/vulkan/color-matrix.frag rename to gsk/vulkan/resources/color-matrix.frag diff --git a/gsk/resources/vulkan/color-matrix.frag.spv b/gsk/vulkan/resources/color-matrix.frag.spv similarity index 100% rename from gsk/resources/vulkan/color-matrix.frag.spv rename to gsk/vulkan/resources/color-matrix.frag.spv diff --git a/gsk/resources/vulkan/color-matrix.vert b/gsk/vulkan/resources/color-matrix.vert similarity index 100% rename from gsk/resources/vulkan/color-matrix.vert rename to gsk/vulkan/resources/color-matrix.vert diff --git a/gsk/resources/vulkan/color-matrix.vert.spv b/gsk/vulkan/resources/color-matrix.vert.spv similarity index 100% rename from gsk/resources/vulkan/color-matrix.vert.spv rename to gsk/vulkan/resources/color-matrix.vert.spv diff --git a/gsk/resources/vulkan/color.frag b/gsk/vulkan/resources/color.frag similarity index 100% rename from gsk/resources/vulkan/color.frag rename to gsk/vulkan/resources/color.frag diff --git a/gsk/resources/vulkan/color.frag.spv b/gsk/vulkan/resources/color.frag.spv similarity index 100% rename from gsk/resources/vulkan/color.frag.spv rename to gsk/vulkan/resources/color.frag.spv diff --git a/gsk/resources/vulkan/color.vert b/gsk/vulkan/resources/color.vert similarity index 100% rename from gsk/resources/vulkan/color.vert rename to gsk/vulkan/resources/color.vert diff --git a/gsk/resources/vulkan/color.vert.spv b/gsk/vulkan/resources/color.vert.spv similarity index 100% rename from gsk/resources/vulkan/color.vert.spv rename to gsk/vulkan/resources/color.vert.spv diff --git a/gsk/resources/vulkan/constants.glsl b/gsk/vulkan/resources/constants.glsl similarity index 100% rename from gsk/resources/vulkan/constants.glsl rename to 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 similarity index 100% rename from gsk/resources/vulkan/crossfade-clip-rounded.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/crossfade-clip-rounded.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/crossfade-clip.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/crossfade-clip.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/crossfade-rect.vert.spv rename to gsk/vulkan/resources/crossfade-rect.vert.spv diff --git a/gsk/resources/vulkan/crossfade.frag b/gsk/vulkan/resources/crossfade.frag similarity index 100% rename from gsk/resources/vulkan/crossfade.frag rename to gsk/vulkan/resources/crossfade.frag diff --git a/gsk/resources/vulkan/crossfade.frag.spv b/gsk/vulkan/resources/crossfade.frag.spv similarity index 100% rename from gsk/resources/vulkan/crossfade.frag.spv rename to gsk/vulkan/resources/crossfade.frag.spv diff --git a/gsk/resources/vulkan/crossfade.vert b/gsk/vulkan/resources/crossfade.vert similarity index 100% rename from gsk/resources/vulkan/crossfade.vert rename to gsk/vulkan/resources/crossfade.vert diff --git a/gsk/resources/vulkan/crossfade.vert.spv b/gsk/vulkan/resources/crossfade.vert.spv similarity index 100% rename from gsk/resources/vulkan/crossfade.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/inset-shadow-clip-rounded.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/inset-shadow-clip-rounded.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/inset-shadow-clip.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/inset-shadow-clip.vert.spv rename to gsk/vulkan/resources/inset-shadow-clip.vert.spv diff --git a/gsk/resources/vulkan/inset-shadow.frag b/gsk/vulkan/resources/inset-shadow.frag similarity index 100% rename from gsk/resources/vulkan/inset-shadow.frag rename to gsk/vulkan/resources/inset-shadow.frag diff --git a/gsk/resources/vulkan/inset-shadow.frag.spv b/gsk/vulkan/resources/inset-shadow.frag.spv similarity index 100% rename from gsk/resources/vulkan/inset-shadow.frag.spv rename to gsk/vulkan/resources/inset-shadow.frag.spv diff --git a/gsk/resources/vulkan/inset-shadow.vert b/gsk/vulkan/resources/inset-shadow.vert similarity index 100% rename from gsk/resources/vulkan/inset-shadow.vert rename to gsk/vulkan/resources/inset-shadow.vert diff --git a/gsk/resources/vulkan/inset-shadow.vert.spv b/gsk/vulkan/resources/inset-shadow.vert.spv similarity index 100% rename from gsk/resources/vulkan/inset-shadow.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/linear-clip-rounded.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/linear-clip-rounded.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/linear-clip.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/linear-clip.vert.spv rename to gsk/vulkan/resources/linear-clip.vert.spv diff --git a/gsk/resources/vulkan/linear.frag b/gsk/vulkan/resources/linear.frag similarity index 100% rename from gsk/resources/vulkan/linear.frag rename to gsk/vulkan/resources/linear.frag diff --git a/gsk/resources/vulkan/linear.frag.spv b/gsk/vulkan/resources/linear.frag.spv similarity index 100% rename from gsk/resources/vulkan/linear.frag.spv rename to gsk/vulkan/resources/linear.frag.spv diff --git a/gsk/resources/vulkan/linear.vert b/gsk/vulkan/resources/linear.vert similarity index 100% rename from gsk/resources/vulkan/linear.vert rename to gsk/vulkan/resources/linear.vert diff --git a/gsk/resources/vulkan/linear.vert.spv b/gsk/vulkan/resources/linear.vert.spv similarity index 100% rename from gsk/resources/vulkan/linear.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/mask-clip-rounded.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/mask-clip-rounded.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/mask-clip.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/mask-clip.vert.spv rename to gsk/vulkan/resources/mask-clip.vert.spv diff --git a/gsk/resources/vulkan/mask.frag b/gsk/vulkan/resources/mask.frag similarity index 100% rename from gsk/resources/vulkan/mask.frag rename to gsk/vulkan/resources/mask.frag diff --git a/gsk/resources/vulkan/mask.frag.spv b/gsk/vulkan/resources/mask.frag.spv similarity index 100% rename from gsk/resources/vulkan/mask.frag.spv rename to gsk/vulkan/resources/mask.frag.spv diff --git a/gsk/resources/vulkan/mask.vert b/gsk/vulkan/resources/mask.vert similarity index 100% rename from gsk/resources/vulkan/mask.vert rename to gsk/vulkan/resources/mask.vert diff --git a/gsk/resources/vulkan/mask.vert.spv b/gsk/vulkan/resources/mask.vert.spv similarity index 100% rename from gsk/resources/vulkan/mask.vert.spv rename to gsk/vulkan/resources/mask.vert.spv diff --git a/gsk/resources/vulkan/meson.build b/gsk/vulkan/resources/meson.build similarity index 100% rename from gsk/resources/vulkan/meson.build rename to 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 similarity index 100% rename from gsk/resources/vulkan/outset-shadow-clip-rounded.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/outset-shadow-clip-rounded.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/outset-shadow-clip.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/outset-shadow-clip.vert.spv rename to gsk/vulkan/resources/outset-shadow-clip.vert.spv diff --git a/gsk/resources/vulkan/outset-shadow.frag b/gsk/vulkan/resources/outset-shadow.frag similarity index 100% rename from gsk/resources/vulkan/outset-shadow.frag rename to gsk/vulkan/resources/outset-shadow.frag diff --git a/gsk/resources/vulkan/outset-shadow.frag.spv b/gsk/vulkan/resources/outset-shadow.frag.spv similarity index 100% rename from gsk/resources/vulkan/outset-shadow.frag.spv rename to gsk/vulkan/resources/outset-shadow.frag.spv diff --git a/gsk/resources/vulkan/outset-shadow.vert b/gsk/vulkan/resources/outset-shadow.vert similarity index 100% rename from gsk/resources/vulkan/outset-shadow.vert rename to gsk/vulkan/resources/outset-shadow.vert diff --git a/gsk/resources/vulkan/outset-shadow.vert.spv b/gsk/vulkan/resources/outset-shadow.vert.spv similarity index 100% rename from gsk/resources/vulkan/outset-shadow.vert.spv rename to gsk/vulkan/resources/outset-shadow.vert.spv diff --git a/gsk/resources/vulkan/rounded-rect.glsl b/gsk/vulkan/resources/rounded-rect.glsl similarity index 100% rename from gsk/resources/vulkan/rounded-rect.glsl rename to 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 similarity index 100% rename from gsk/resources/vulkan/texture-clip-rounded.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/texture-clip-rounded.vert.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/texture-clip.frag.spv rename to 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 similarity index 100% rename from gsk/resources/vulkan/texture-clip.vert.spv rename to gsk/vulkan/resources/texture-clip.vert.spv diff --git a/gsk/resources/vulkan/texture.frag b/gsk/vulkan/resources/texture.frag similarity index 100% rename from gsk/resources/vulkan/texture.frag rename to gsk/vulkan/resources/texture.frag diff --git a/gsk/resources/vulkan/texture.frag.spv b/gsk/vulkan/resources/texture.frag.spv similarity index 100% rename from gsk/resources/vulkan/texture.frag.spv rename to gsk/vulkan/resources/texture.frag.spv diff --git a/gsk/resources/vulkan/texture.vert b/gsk/vulkan/resources/texture.vert similarity index 100% rename from gsk/resources/vulkan/texture.vert rename to gsk/vulkan/resources/texture.vert diff --git a/gsk/resources/vulkan/texture.vert.spv b/gsk/vulkan/resources/texture.vert.spv similarity index 100% rename from gsk/resources/vulkan/texture.vert.spv rename to gsk/vulkan/resources/texture.vert.spv