asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
virtualx-engine/modules/glslang/SCsub

90 lines
3.4 KiB
Text
Raw Normal View History

Moved the shader source compilation code outside RenderingDevice and Vulkan
2019-07-29 00:58:32 +02:00
#!/usr/bin/env python
SCons: Format buildsystem files with psf/black Configured for a max line length of 120 characters. psf/black is very opinionated and purposely doesn't leave much room for configuration. The output is mostly OK so that should be fine for us, but some things worth noting: - Manually wrapped strings will be reflowed, so by using a line length of 120 for the sake of preserving readability for our long command calls, it also means that some manually wrapped strings are back on the same line and should be manually merged again. - Code generators using string concatenation extensively look awful, since black puts each operand on a single line. We need to refactor these generators to use more pythonic string formatting, for which many options are available (`%`, `format` or f-strings). - CI checks and a pre-commit hook will be added to ensure that future buildsystem changes are well-formatted.
2020-03-30 08:28:32 +02:00
Import("env")
Import("env_modules")
Moved the shader source compilation code outside RenderingDevice and Vulkan
2019-07-29 00:58:32 +02:00
env_glslang = env_modules.Clone()
# Thirdparty source files
SCons: Add explicit dependencies on thirdparty code in cloned env Since we clone the environments to build thirdparty code, we don't get an explicit dependency on the build objects produced by that environment. So when we update thirdparty code, Godot code using it is not necessarily rebuilt (I think it is for changed headers, but not for changed .c/.cpp files), which can lead to an invalid compilation output (linking old Godot .o files with a newer, potentially ABI breaking version of thirdparty code). This was only seen as really problematic with bullet updates (leading to crashes when rebuilding Godot after a bullet update without cleaning .o files), but it's safer to fix it everywhere, even if it's a LOT of hacky boilerplate.
2020-12-17 16:01:36 +01:00
thirdparty_obj = []
SCons: Format buildsystem files with psf/black Configured for a max line length of 120 characters. psf/black is very opinionated and purposely doesn't leave much room for configuration. The output is mostly OK so that should be fine for us, but some things worth noting: - Manually wrapped strings will be reflowed, so by using a line length of 120 for the sake of preserving readability for our long command calls, it also means that some manually wrapped strings are back on the same line and should be manually merged again. - Code generators using string concatenation extensively look awful, since black puts each operand on a single line. We need to refactor these generators to use more pythonic string formatting, for which many options are available (`%`, `format` or f-strings). - CI checks and a pre-commit hook will be added to ensure that future buildsystem changes are well-formatted.
2020-03-30 08:28:32 +02:00
if env["builtin_glslang"]:
glslang: Disable warnings and allow unbundling
2019-09-27 09:39:53 +02:00
thirdparty_dir = "#thirdparty/glslang/"
thirdparty_sources = [
vulkan: Update all components to Vulkan SDK 1.3.261.1 Updates to volk, vulkan headers, `vk_enum_string_helper.h`, VMA, glslang, spirv-reflect. VMA doesn't tag SDK releases specifically, and still hasn't had a tagged release since 3.0.1, but the Vulkan SDK now seems to ship a recent master commit, so we do the same.
2023-09-01 11:11:12 +02:00
"glslang/GenericCodeGen/CodeGen.cpp",
"glslang/GenericCodeGen/Link.cpp",
glslang: Disable warnings and allow unbundling
2019-09-27 09:39:53 +02:00
"glslang/MachineIndependent/attribute.cpp",
"glslang/MachineIndependent/Constant.cpp",
Vulkan: Update volk and Vulkan SDK components to 1.2.190
2021-09-22 12:40:17 +02:00
"glslang/MachineIndependent/glslang_tab.cpp",
"glslang/MachineIndependent/InfoSink.cpp",
"glslang/MachineIndependent/Initialize.cpp",
"glslang/MachineIndependent/Intermediate.cpp",
"glslang/MachineIndependent/intermOut.cpp",
"glslang/MachineIndependent/IntermTraverse.cpp",
"glslang/MachineIndependent/iomapper.cpp",
glslang: Disable warnings and allow unbundling
2019-09-27 09:39:53 +02:00
"glslang/MachineIndependent/limits.cpp",
Vulkan: Update volk and Vulkan SDK components to 1.2.190
2021-09-22 12:40:17 +02:00
"glslang/MachineIndependent/linkValidate.cpp",
"glslang/MachineIndependent/parseConst.cpp",
"glslang/MachineIndependent/ParseContextBase.cpp",
"glslang/MachineIndependent/ParseHelper.cpp",
"glslang/MachineIndependent/PoolAlloc.cpp",
glslang: Disable warnings and allow unbundling
2019-09-27 09:39:53 +02:00
"glslang/MachineIndependent/preprocessor/PpAtom.cpp",
"glslang/MachineIndependent/preprocessor/PpContext.cpp",
"glslang/MachineIndependent/preprocessor/Pp.cpp",
Vulkan: Update volk and Vulkan SDK components to 1.2.190
2021-09-22 12:40:17 +02:00
"glslang/MachineIndependent/preprocessor/PpScanner.cpp",
"glslang/MachineIndependent/preprocessor/PpTokens.cpp",
"glslang/MachineIndependent/propagateNoContraction.cpp",
"glslang/MachineIndependent/reflection.cpp",
"glslang/MachineIndependent/RemoveTree.cpp",
"glslang/MachineIndependent/Scan.cpp",
"glslang/MachineIndependent/ShaderLang.cpp",
"glslang/MachineIndependent/SpirvIntrinsics.cpp",
glslang: Disable warnings and allow unbundling
2019-09-27 09:39:53 +02:00
"glslang/MachineIndependent/SymbolTable.cpp",
"glslang/MachineIndependent/Versions.cpp",
vulkan: Update all components to Vulkan SDK 1.3.261.1 Updates to volk, vulkan headers, `vk_enum_string_helper.h`, VMA, glslang, spirv-reflect. VMA doesn't tag SDK releases specifically, and still hasn't had a tagged release since 3.0.1, but the Vulkan SDK now seems to ship a recent master commit, so we do the same.
2023-09-01 11:11:12 +02:00
"glslang/ResourceLimits/ResourceLimits.cpp",
glslang: Disable warnings and allow unbundling
2019-09-27 09:39:53 +02:00
"OGLCompilersDLL/InitializeDll.cpp",
"SPIRV/disassemble.cpp",
"SPIRV/doc.cpp",
Vulkan: Update volk and Vulkan SDK components to 1.2.190
2021-09-22 12:40:17 +02:00
"SPIRV/GlslangToSpv.cpp",
"SPIRV/InReadableOrder.cpp",
SCons: Format buildsystem files with psf/black Configured for a max line length of 120 characters. psf/black is very opinionated and purposely doesn't leave much room for configuration. The output is mostly OK so that should be fine for us, but some things worth noting: - Manually wrapped strings will be reflowed, so by using a line length of 120 for the sake of preserving readability for our long command calls, it also means that some manually wrapped strings are back on the same line and should be manually merged again. - Code generators using string concatenation extensively look awful, since black puts each operand on a single line. We need to refactor these generators to use more pythonic string formatting, for which many options are available (`%`, `format` or f-strings). - CI checks and a pre-commit hook will be added to ensure that future buildsystem changes are well-formatted.
2020-03-30 08:28:32 +02:00
"SPIRV/Logger.cpp",
Vulkan: Update volk and Vulkan SDK components to 1.2.190
2021-09-22 12:40:17 +02:00
"SPIRV/SpvBuilder.cpp",
"SPIRV/SpvPostProcess.cpp",
"SPIRV/SPVRemapper.cpp",
"SPIRV/SpvTools.cpp",
glslang: Disable warnings and allow unbundling
2019-09-27 09:39:53 +02:00
]
Moved the shader source compilation code outside RenderingDevice and Vulkan
2019-07-29 00:58:32 +02:00
SCons: Format buildsystem files with psf/black Configured for a max line length of 120 characters. psf/black is very opinionated and purposely doesn't leave much room for configuration. The output is mostly OK so that should be fine for us, but some things worth noting: - Manually wrapped strings will be reflowed, so by using a line length of 120 for the sake of preserving readability for our long command calls, it also means that some manually wrapped strings are back on the same line and should be manually merged again. - Code generators using string concatenation extensively look awful, since black puts each operand on a single line. We need to refactor these generators to use more pythonic string formatting, for which many options are available (`%`, `format` or f-strings). - CI checks and a pre-commit hook will be added to ensure that future buildsystem changes are well-formatted.
2020-03-30 08:28:32 +02:00
if env["platform"] == "windows":
glslang: Disable warnings and allow unbundling
2019-09-27 09:39:53 +02:00
thirdparty_sources.append("glslang/OSDependent/Windows/ossource.cpp")
else:
thirdparty_sources.append("glslang/OSDependent/Unix/ossource.cpp")
Moved the shader source compilation code outside RenderingDevice and Vulkan
2019-07-29 00:58:32 +02:00
glslang: Disable warnings and allow unbundling
2019-09-27 09:39:53 +02:00
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
Moved the shader source compilation code outside RenderingDevice and Vulkan
2019-07-29 00:58:32 +02:00
Fix compilation warnings and re-enable werror=yes on Travis Fix -Wunused-variable, -Wunused-but-set-variable and -Wswitch warnings raised by GCC 8 and 9. Fix -Wunused-function, -Wunused-private-field and -Wtautological-constant-out-of-range-compare raised by Clang. Fix MSVC 2019 warning C4804 (unsafe use of type 'bool' in comparison operation). GCC -Wcpp warnings/Clang -W#warnings (`#warning`) are no longer raising errors and will thus not abort compilation with `werror=yes`. Treat glslang headers are system headers to avoid raising warnings. Re-enables us to build with `werror=yes` on Linux and macOS, thus catching warnings that would be introduced by new code. Fixes #36132.
2020-02-18 14:57:11 +01:00
# Treat glslang headers as system headers to avoid raising warnings. Not supported on MSVC.
glslang: Fix support for building against public/system library Fix include paths to support both vendored and system-installed glslang. Remove usage of the private `StandAlone` bits. Requires us to vendor a copy of `DefaultTBuiltInResource` (or provide our own customized one) as glslang doesn't provide it in its public API. Also removes unused C interface as it's not well encapsulated and depends on `StandAlone`. Fixes #56307.
2022-01-12 12:28:43 +01:00
# Include `#thirdparty` to workaround mismatch between location of `SPIRV` in library source
# and in installed public headers.
Fix compilation warnings and re-enable werror=yes on Travis Fix -Wunused-variable, -Wunused-but-set-variable and -Wswitch warnings raised by GCC 8 and 9. Fix -Wunused-function, -Wunused-private-field and -Wtautological-constant-out-of-range-compare raised by Clang. Fix MSVC 2019 warning C4804 (unsafe use of type 'bool' in comparison operation). GCC -Wcpp warnings/Clang -W#warnings (`#warning`) are no longer raising errors and will thus not abort compilation with `werror=yes`. Treat glslang headers are system headers to avoid raising warnings. Re-enables us to build with `werror=yes` on Linux and macOS, thus catching warnings that would be introduced by new code. Fixes #36132.
2020-02-18 14:57:11 +01:00
if not env.msvc:
glslang: Fix support for building against public/system library Fix include paths to support both vendored and system-installed glslang. Remove usage of the private `StandAlone` bits. Requires us to vendor a copy of `DefaultTBuiltInResource` (or provide our own customized one) as glslang doesn't provide it in its public API. Also removes unused C interface as it's not well encapsulated and depends on `StandAlone`. Fixes #56307.
2022-01-12 12:28:43 +01:00
env_glslang.Append(CPPFLAGS=["-isystem", Dir(thirdparty_dir).path, "-isystem", Dir("#thirdparty").path])
Fix compilation warnings and re-enable werror=yes on Travis Fix -Wunused-variable, -Wunused-but-set-variable and -Wswitch warnings raised by GCC 8 and 9. Fix -Wunused-function, -Wunused-private-field and -Wtautological-constant-out-of-range-compare raised by Clang. Fix MSVC 2019 warning C4804 (unsafe use of type 'bool' in comparison operation). GCC -Wcpp warnings/Clang -W#warnings (`#warning`) are no longer raising errors and will thus not abort compilation with `werror=yes`. Treat glslang headers are system headers to avoid raising warnings. Re-enables us to build with `werror=yes` on Linux and macOS, thus catching warnings that would be introduced by new code. Fixes #36132.
2020-02-18 14:57:11 +01:00
else:
glslang: Fix support for building against public/system library Fix include paths to support both vendored and system-installed glslang. Remove usage of the private `StandAlone` bits. Requires us to vendor a copy of `DefaultTBuiltInResource` (or provide our own customized one) as glslang doesn't provide it in its public API. Also removes unused C interface as it's not well encapsulated and depends on `StandAlone`. Fixes #56307.
2022-01-12 12:28:43 +01:00
env_glslang.Prepend(CPPPATH=[thirdparty_dir, "#thirdparty"])
glslang: Disable warnings and allow unbundling
2019-09-27 09:39:53 +02:00
vulkan: Sync loader, headers and glslang to sdk-1.2.154.0 Actually sdk-1.2.154.1 for Vulkan-Loader. glslang is updated to bacaef3237c515e40d1a24722be48c0a0b30f75f which is the known-good version for Vulkan-ValidationLayers 1.2.154.0. COPYRIGHT.txt was synced with the current version of the glslang LICENSE.txt, and `glslang/register_types.cpp` now uses the upstream definition for its default builtin resource instead of hardcoding it.
2020-10-15 12:04:10 +02:00
env_glslang.Append(CPPDEFINES=["ENABLE_OPT=0"])
glslang: Disable warnings and allow unbundling
2019-09-27 09:39:53 +02:00
env_thirdparty = env_glslang.Clone()
env_thirdparty.disable_warnings()
SCons: Add explicit dependencies on thirdparty code in cloned env Since we clone the environments to build thirdparty code, we don't get an explicit dependency on the build objects produced by that environment. So when we update thirdparty code, Godot code using it is not necessarily rebuilt (I think it is for changed headers, but not for changed .c/.cpp files), which can lead to an invalid compilation output (linking old Godot .o files with a newer, potentially ABI breaking version of thirdparty code). This was only seen as really problematic with bullet updates (leading to crashes when rebuilding Godot after a bullet update without cleaning .o files), but it's safer to fix it everywhere, even if it's a LOT of hacky boilerplate.
2020-12-17 16:01:36 +01:00
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
env.modules_sources += thirdparty_obj
# Godot source files
module_obj = []
env_glslang.add_source_files(module_obj, "*.cpp")
env.modules_sources += module_obj
Moved the shader source compilation code outside RenderingDevice and Vulkan
2019-07-29 00:58:32 +02:00
SCons: Add explicit dependencies on thirdparty code in cloned env Since we clone the environments to build thirdparty code, we don't get an explicit dependency on the build objects produced by that environment. So when we update thirdparty code, Godot code using it is not necessarily rebuilt (I think it is for changed headers, but not for changed .c/.cpp files), which can lead to an invalid compilation output (linking old Godot .o files with a newer, potentially ABI breaking version of thirdparty code). This was only seen as really problematic with bullet updates (leading to crashes when rebuilding Godot after a bullet update without cleaning .o files), but it's safer to fix it everywhere, even if it's a LOT of hacky boilerplate.
2020-12-17 16:01:36 +01:00
# Needed to force rebuilding the module files when the thirdparty library is updated.
env.Depends(module_obj, thirdparty_obj)
Reference in a new issue Copy permalink