add shaderc wrap fallback
This commit is contained in:
parent
1079c519fa
commit
96631afbbc
6 changed files with 39 additions and 10 deletions
|
@ -9,15 +9,20 @@ r_shaderlib_libdeps = []
|
|||
|
||||
if get_option('shader_transpiler')
|
||||
dep_crossc = dependency('crossc', version : '>=1.5.0', required : true, static : static, fallback : ['crossc', 'crossc_dep'])
|
||||
dep_shaderc = dependency('shaderc', required : false, fallback : ['shaderc', 'shaderc_dep'])
|
||||
|
||||
# Thanks, google.
|
||||
# https://github.com/google/shaderc/issues/392
|
||||
if static
|
||||
dep_shaderc = cc.find_library('shaderc_combined', required : true)
|
||||
else
|
||||
dep_shaderc = cc.find_library('shaderc_shared', required : true)
|
||||
if not dep_shaderc.found() and get_option('wrap_mode') != 'forcefallback'
|
||||
# Thanks, google.
|
||||
# https://github.com/google/shaderc/issues/392
|
||||
if static
|
||||
dep_shaderc = cc.find_library('shaderc_combined', required : false)
|
||||
else
|
||||
dep_shaderc = cc.find_library('shaderc_shared', required : false)
|
||||
endif
|
||||
endif
|
||||
|
||||
assert(dep_shaderc.found(), 'shaderc is required for the shader transpiler')
|
||||
|
||||
r_shaderlib_src += files(
|
||||
'lang_spirv.c'
|
||||
)
|
||||
|
|
12
subprojects/.gitignore
vendored
12
subprojects/.gitignore
vendored
|
@ -1,10 +1,14 @@
|
|||
SPIRV-Headers
|
||||
SPIRV-Tools
|
||||
crossc
|
||||
libzip
|
||||
zlib
|
||||
libpng
|
||||
freetype
|
||||
glslang
|
||||
libpng
|
||||
libwebp
|
||||
libzip
|
||||
ogg
|
||||
sdl2
|
||||
sdl2_mixer
|
||||
ogg
|
||||
shaderc
|
||||
vorbis
|
||||
zlib
|
||||
|
|
5
subprojects/SPIRV-Headers.wrap
Normal file
5
subprojects/SPIRV-Headers.wrap
Normal file
|
@ -0,0 +1,5 @@
|
|||
[wrap-git]
|
||||
directory=SPIRV-Headers
|
||||
url=https://github.com/taisei-project/SPIRV-Headers.git
|
||||
push-url=git@github.com:taisei-project/SPIRV-Headers.git
|
||||
revision=meson-1.3.7
|
5
subprojects/SPIRV-Tools.wrap
Normal file
5
subprojects/SPIRV-Tools.wrap
Normal file
|
@ -0,0 +1,5 @@
|
|||
[wrap-git]
|
||||
directory=SPIRV-Tools
|
||||
url=https://github.com/taisei-project/SPIRV-Tools.git
|
||||
push-url=git@github.com:taisei-project/SPIRV-Tools.git
|
||||
revision=meson-2019.1
|
5
subprojects/glslang.wrap
Normal file
5
subprojects/glslang.wrap
Normal file
|
@ -0,0 +1,5 @@
|
|||
[wrap-git]
|
||||
directory=glslang
|
||||
url=https://github.com/taisei-project/glslang.git
|
||||
push-url=git@github.com:taisei-project/glslang.git
|
||||
revision=meson
|
5
subprojects/shaderc.wrap
Normal file
5
subprojects/shaderc.wrap
Normal file
|
@ -0,0 +1,5 @@
|
|||
[wrap-git]
|
||||
directory=shaderc
|
||||
url=https://github.com/taisei-project/shaderc.git
|
||||
push-url=git@github.com:taisei-project/shaderc.git
|
||||
revision=meson
|
Loading…
Reference in a new issue