From: Benjamin Otte <otte@redhat.com>
Date: Thu, 4 May 2023 23:39:31 +0000 (+0200)
Subject: build: Make shaders depend on their includes
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~253^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d51c92f54dae6aa7a15b209e24a5248c17872f8b;p=gtk4.git

build: Make shaders depend on their includes

This does not do any proper dependency tracking, it just makes every
shader depend on every include shader.

But that's good enough for now.
---

diff --git a/gsk/vulkan/resources/meson.build b/gsk/vulkan/resources/meson.build
index 3486a8868b..86e98acb9e 100644
--- a/gsk/vulkan/resources/meson.build
+++ b/gsk/vulkan/resources/meson.build
@@ -1,10 +1,9 @@
-# FIXME: what's up with these?
-#gsk_private_vulkan_include_shaders = [
-#  'clip.frag.glsl',
-#  'clip.vert.glsl',
-#  'constants.glsl',
-#  'rounded-rect.glsl',
-#]
+gsk_private_vulkan_include_shaders = [
+  'clip.frag.glsl',
+  'clip.vert.glsl',
+  'constants.glsl',
+  'rounded-rect.glsl',
+]
 
 gsk_private_vulkan_fragment_shaders = [
   'blendmode.frag',
@@ -51,6 +50,7 @@ foreach shader: gsk_private_vulkan_shaders
     compiled_shader = custom_target(spv_shader,
                                     input: shader,
                                     output: spv_shader,
+                                    depend_files: gsk_private_vulkan_include_shaders,
                                     command: [
                                       glslc,
                                       stage_arg,
@@ -61,6 +61,7 @@ foreach shader: gsk_private_vulkan_shaders
     compiled_clip_shader = custom_target(clip_spv_shader,
                                          input: shader,
                                          output: clip_spv_shader,
+                                         depend_files: gsk_private_vulkan_include_shaders,
                                          command: [
                                            glslc,
                                            stage_arg,
@@ -71,6 +72,7 @@ foreach shader: gsk_private_vulkan_shaders
     compiled_clip_rounded_shader = custom_target(clip_rounded_spv_shader,
                                                  input: shader,
                                                  output: clip_rounded_spv_shader,
+                                                 depend_files: gsk_private_vulkan_include_shaders,
                                                  command: [
                                                    glslc,
                                                    stage_arg,