[gtk+/wip/meson: 143/181] Don't require glslc for vulkan
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/meson: 143/181] Don't require glslc for vulkan
- Date: Wed, 26 Apr 2017 16:39:38 +0000 (UTC)
commit 1279d2f9797c64edcd85a92202374b2de0263fbc
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Mar 23 12:29:08 2017 +0000
Don't require glslc for vulkan
The compiled shaders are checked into git.
meson.build | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/meson.build b/meson.build
index 2efee4a..caf80a7 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')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]