Skip to content

Commit

Permalink
Merge pull request #88011 from Chubercik/vulkan-1.3.275.0
Browse files Browse the repository at this point in the history
vulkan: Update all components to Vulkan SDK 1.3.275.0
  • Loading branch information
akien-mga committed Feb 8, 2024
2 parents 763d5cb + 8350c88 commit 0aa8fa3
Show file tree
Hide file tree
Showing 88 changed files with 31,203 additions and 18,555 deletions.
6 changes: 3 additions & 3 deletions COPYRIGHT.txt
Original file line number Diff line number Diff line change
Expand Up @@ -500,19 +500,19 @@ License: BSD-3-clause

Files: ./thirdparty/volk/
Comment: volk
Copyright: 2018-2023, Arseny Kapoulkine
Copyright: 2018-2024, Arseny Kapoulkine
License: Expat

Files: ./thirdparty/vulkan/
Comment: Vulkan Headers
Copyright: 2014-2023, The Khronos Group Inc.
Copyright: 2014-2024, The Khronos Group Inc.
2014-2023, Valve Corporation
2014-2023, LunarG, Inc.
License: Apache-2.0

Files: ./thirdparty/vulkan/vk_mem_alloc.h
Comment: Vulkan Memory Allocator
Copyright: 2017-2021, Advanced Micro Devices, Inc.
Copyright: 2017-2024, Advanced Micro Devices, Inc.
License: Expat

Files: ./thirdparty/wayland/
Expand Down
1 change: 0 additions & 1 deletion modules/glslang/SCsub
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ if env["builtin_glslang"]:
"glslang/MachineIndependent/SymbolTable.cpp",
"glslang/MachineIndependent/Versions.cpp",
"glslang/ResourceLimits/ResourceLimits.cpp",
"OGLCompilersDLL/InitializeDll.cpp",
"SPIRV/disassemble.cpp",
"SPIRV/doc.cpp",
"SPIRV/GlslangToSpv.cpp",
Expand Down
24 changes: 12 additions & 12 deletions thirdparty/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -339,21 +339,21 @@ See the patches in the `patches` directory.
## glslang

- Upstream: https://github.com/KhronosGroup/glslang
- Version: vulkan-sdk-1.3.268.0 (36d08c0d940cf307a23928299ef52c7970d8cee6, 2023)
- Version: vulkan-sdk-1.3.275.0 (a91631b260cba3f22858d6c6827511e636c2458a, 2023)
- License: glslang

Version should be kept in sync with the one of the used Vulkan SDK (see `vulkan`
section).

Files extracted from upstream source:

- `glslang` (except `glslang/HLSL` and `glslang/ExtensionHeaders`),
`OGLCompilersDLL`, `SPIRV`
* Remove C interface code: `CInterface` folders, files matching `"*_c[_\.]*"`
- `glslang/` folder (except the `glslang/HLSL` and `glslang/ExtensionHeaders`
subfolders), `SPIRV/` folder
* Remove C interface code: `CInterface/` folders, files matching `"*_c[_\.]*"`
- Run `cmake . && make` and copy generated `include/glslang/build_info.h`
to `glslang/build_info.h`
- `LICENSE.txt`
- Unnecessary files like `CMakeLists.txt`, `*.m4` and `updateGrammar` removed
- Unnecessary files like `CMakeLists.txt` or `updateGrammar` removed


## graphite
Expand Down Expand Up @@ -806,16 +806,16 @@ proposed by these libraries and better integrate them with Godot.
## spirv-reflect

- Upstream: https://github.com/KhronosGroup/SPIRV-Reflect
- Version: vulkan-sdk-1.3.268.0 (3f468129720eded0cef4077302e491036d099856, 2023)
- Version: vulkan-sdk-1.3.275.0 (2f7460f0be0f73c9ffde719bc3e924b4250f4d98, 2024)
- License: Apache 2.0

Version should be kept in sync with the one of the used Vulkan SDK (see `vulkan`
section).

Files extracted from upstream source:

- `spirv_reflect.{c,h}`
- `include` folder
- `spirv_reflect.h`, `spirv_reflect.c`
- `include/` folder
- `LICENSE`

Some downstream changes have been made and are identified by
Expand Down Expand Up @@ -885,7 +885,7 @@ folder.
## volk

- Upstream: https://github.com/zeux/volk
- Version: vulkan-sdk-1.3.268.0 (cdd08788bb7062031606d3da51e268f6bd491864, 2023)
- Version: vulkan-sdk-1.3.275.0 (f2a16e3e19c2349b873343b2dc38a1d4c25af23a, 2024)
- License: MIT

Unless there is a specific reason to package a more recent version, please stick
Expand All @@ -904,7 +904,7 @@ Files extracted from upstream source:
## vulkan

- Upstream: https://github.com/KhronosGroup/Vulkan-Headers
- Version: vulkan-sdk-1.3.268.0 (7b3466a1f47a9251ac1113efbe022ff016e2f95b, 2023)
- Version: vulkan-sdk-1.3.275.0 (217e93c664ec6704ec2d8c36fa116c1a4a1e2d40, 2024)
- License: Apache 2.0

The vendored version should be kept in sync with volk, see above.
Expand All @@ -918,8 +918,8 @@ Files extracted from upstream source:
SDK release: https://github.com/KhronosGroup/Vulkan-Utility-Libraries/blob/main/include/vulkan/vk_enum_string_helper.h

`vk_mem_alloc.h` is taken from https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
Version: git (e88fff957b94f4b541ccac67a4290f07e52aa610), as advised by upstream:
https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/issues/318
Version: git (38627f4e37d7a9b13214fd267ec60e0e877e3997, 2024), as advised by upstream:
https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/issues/318#issuecomment-1411804981
`vk_mem_alloc.cpp` is a Godot file and should be preserved on updates.

Patches in the `patches` directory should be re-applied after updates.
Expand Down
37 changes: 0 additions & 37 deletions thirdparty/glslang/OGLCompilersDLL/InitializeDll.cpp

This file was deleted.

49 changes: 0 additions & 49 deletions thirdparty/glslang/OGLCompilersDLL/InitializeDll.h

This file was deleted.

Loading

0 comments on commit 0aa8fa3

Please sign in to comment.