Skip to content
Snippets Groups Projects
Commit 1c05a5f1 authored by Jeremy Whiting's avatar Jeremy Whiting
Browse files

Merge branch 'wip/smcv/build-shaders' into 'master'

Build shaders using glslangValidator

See merge request steam/steam-runtime-tools!70
parents 85e3197c 526e4339
No related branches found
No related tags found
1 merge request!70Build shaders using glslangValidator
Pipeline #1877 passed
......@@ -6,6 +6,7 @@ Standards-Version: 4.3.0
Build-Depends:
debhelper,
g++ (>= 4:4.8) | g++-4.8,
glslang-tools,
gtk-doc-tools <!nodoc>,
libglib2.0-dev,
libjson-glib-dev (>= 1.0),
......
......@@ -10,6 +10,7 @@ variables:
STEAM_CI_USE_BINARIES_FROM: autopkgtest
STEAM_CI_DEPENDENCIES: >-
debhelper
glslang-tools
gtk-doc-tools
libegl1-mesa-dev
libgl1-mesa-dev
......
......@@ -65,14 +65,44 @@ executable(
)
)
install_subdir('shaders',
install_dir: join_paths(
custom_target(
'frag.spv',
build_by_default : true,
command : [
glslang_validator,
'--target-env', 'vulkan1.0',
'-o', '@OUTPUT@',
'@INPUT@',
],
input : 'shader.frag',
output : 'frag.spv',
install : true,
install_dir : join_paths(
get_option('prefix'),
get_option('libexecdir'),
'steam-runtime-tools-' + api_major,
'shaders',
)
)
configure_file(copy: true, input: 'shaders/frag.spv', output: 'frag.spv')
configure_file(copy: true, input: 'shaders/vert.spv', output: 'vert.spv')
custom_target(
'vert.spv',
build_by_default : true,
command : [
glslang_validator,
'--target-env', 'vulkan1.0',
'-o', '@OUTPUT@',
'@INPUT@',
],
input : 'shader.vert',
output : 'vert.spv',
install : true,
install_dir : join_paths(
get_option('prefix'),
get_option('libexecdir'),
'steam-runtime-tools-' + api_major,
'shaders',
)
)
# vim:set sw=2 sts=2 et:
File deleted
File deleted
......@@ -47,6 +47,8 @@ if get_option('man')
endif
endif
glslang_validator = find_program('glslangValidator', required : true)
warning_cflags = [
'-Wall',
'-Wextra',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment