Multiple changes to get a triangle working with hacky usage of descriptor heaps
Test Compilation / Build evk (push) Has been cancelled
Test Compilation / Build evk (push) Has been cancelled
This commit is contained in:
@@ -14,14 +14,4 @@ index d44f62a..16bad95 100644
|
||||
+ endif()
|
||||
add_subdirectory(${SHADERC_GLSLANG_DIR} glslang)
|
||||
endif()
|
||||
if (NOT TARGET glslang)
|
||||
diff --git a/utils/git-sync-deps b/utils/git-sync-deps
|
||||
index eecfbe9..73df6e5 100755
|
||||
--- a/utils/git-sync-deps
|
||||
+++ b/utils/git-sync-deps
|
||||
@@ -279,4 +279,4 @@ def main(argv):
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
- exit(main(sys.argv[1:]))
|
||||
+ sys.exit(main(sys.argv[1:]))
|
||||
if (NOT TARGET glslang)
|
||||
@@ -2,6 +2,7 @@ project('libshaderc', 'cpp')
|
||||
|
||||
python = find_program('python3')
|
||||
run_command(python, './utils/git-sync-deps', check: true)
|
||||
run_command(python, './utils/update_build_version.py', check: true)
|
||||
|
||||
cmake = import('cmake')
|
||||
opts = cmake.subproject_options()
|
||||
@@ -24,4 +25,4 @@ shaderc_dep = declare_dependency(dependencies: [
|
||||
shaderc_proj.dependency('GenericCodeGen'),
|
||||
shaderc_proj.dependency('MachineIndependent'),
|
||||
])
|
||||
meson.override_dependency('shaderc', shaderc_dep)
|
||||
meson.override_dependency('shaderc', shaderc_dep)
|
||||
Reference in New Issue
Block a user