summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2017-03-23 12:29:08 +0000
committerEmmanuele Bassi <ebassi@gnome.org>2017-04-28 23:12:52 +0100
commitdb0cbbe9b5ce2d6cae7b1a4f81fc8da091f8c77c (patch)
treec3dd37e01f9bda08b0b5203c7dcf03302729a977
parent73ebfb82b6e899467b4563052424b94a0ff6ab71 (diff)
downloadgtk+-db0cbbe9b5ce2d6cae7b1a4f81fc8da091f8c77c.tar.gz
Don't require glslc for vulkan
The compiled shaders are checked into git.
-rw-r--r--meson.build9
1 files changed, 2 insertions, 7 deletions
diff --git a/meson.build b/meson.build
index 2efee4ab03..caf80a7a08 100644
--- a/meson.build
+++ b/meson.build
@@ -341,13 +341,8 @@ enable_vulkan = get_option('enable-vulkan')
if enable_vulkan != 'no'
vulkan_lib = cc.find_library('vulkan', required : false)
if vulkan_lib.found() and cc.has_function('vkCreateInstance', dependencies : vulkan_lib) and cc.has_header('vulkan/vulkan.h')
- glslc = find_program('glslc', required : false)
- if glslc.found()
- have_vulkan = true
- pc_gdk_extra_libs += ['-lvulkan']
- else
- error('Need glslc for Vulkan support. See https://github.com/google/shaderc or compile with -Denable-vulkan=no')
- endif
+ have_vulkan = true
+ pc_gdk_extra_libs += ['-lvulkan']
endif
else
message('Vulkan support explicitly disabled')