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

@@ -45,7 +45,7 @@ xml = '''<?xml version='1.0' encoding='UTF-8'?>
 '''
 
 for f in gl_source_shaders:
-  xml += '    <file alias=\'gl/{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>

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')