summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2017-09-03 19:58:41 -0400
committerMatthias Clasen <mclasen@redhat.com>2017-09-03 19:58:41 -0400
commit86c0c243a0872e5935935718e8f531aedf1eb12d (patch)
tree35e919018917067fa6015cb1485e093a39c64514
parentd281cd74986f044dbfca25a566655cd6e0d97de6 (diff)
downloadgtk+-86c0c243a0872e5935935718e8f531aedf1eb12d.tar.gz
Add rules to regenerate all shader variants
We were missing rules to build the clip variants of the shaders.
-rw-r--r--gsk/resources/vulkan/meson.build28
1 files changed, 26 insertions, 2 deletions
diff --git a/gsk/resources/vulkan/meson.build b/gsk/resources/vulkan/meson.build
index d3b01fae2d..8595ccf605 100644
--- a/gsk/resources/vulkan/meson.build
+++ b/gsk/resources/vulkan/meson.build
@@ -36,6 +36,8 @@ foreach shader: gsk_private_vulkan_shaders
stage_arg = suffix == 'frag' ? '-fshader-stage=fragment' : '-fshader-stage=vertex'
spv_shader = '@0@.@1@.spv'.format(basefn, suffix)
+ clip_spv_shader = '@0@-clip.@1@.spv'.format(basefn, suffix)
+ clip_rounded_spv_shader = '@0@-clip-rounded.@1@.spv'.format(basefn, suffix)
if glslc.found()
compiled_shader = custom_target(spv_shader,
@@ -49,8 +51,30 @@ foreach shader: gsk_private_vulkan_shaders
'@INPUT@',
'-o', '@OUTPUT@'
])
+ compiled_clip_shader = custom_target(clip_spv_shader,
+ input: shader,
+ output: clip_spv_shader,
+ build_by_default: true,
+ command: [
+ glslc,
+ stage_arg,
+ '-DCLIP_RECT',
+ '@INPUT@',
+ '-o', '@OUTPUT@'
+ ])
+ compiled_clip_rounded_shader = custom_target(clip_rounded_spv_shader,
+ input: shader,
+ output: clip_rounded_spv_shader,
+ build_by_default: true,
+ command: [
+ glslc,
+ stage_arg,
+ '-DCLIP_ROUNDED_RECT',
+ '@INPUT@',
+ '-o', '@OUTPUT@'
+ ])
endif
gsk_private_vulkan_compiled_shaders += files(spv_shader)
- gsk_private_vulkan_compiled_shaders += '@0@-clip.@1@.spv'.format(basefn, suffix)
- gsk_private_vulkan_compiled_shaders += '@0@-clip-rounded.@1@.spv'.format(basefn, suffix)
+ gsk_private_vulkan_compiled_shaders += files(clip_spv_shader)
+ gsk_private_vulkan_compiled_shaders += files(clip_rounded_spv_shader)
endforeach