Skip to content

Commit fc49fe0

Browse files
committed
Updated SPIRV-Cross, SPIRV-Tools, and glslang.
Fixed build on GCC 16.
1 parent e62cf9a commit fc49fe0

6 files changed

Lines changed: 9 additions & 6 deletions

File tree

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
env:
1010
CTEST_OUTPUT_ON_FAILURE: '1'
1111
GTEST_OUTPUT: xml:${{ github.workspace }}/test-results/
12-
boost_version: 1.90.0
12+
boost_version: 1.91.0
1313
cmake_common_args: >-
1414
-DCMAKE_FIND_ROOT_PATH=${{ github.workspace }}/dependencies
1515
-DCMAKE_PREFIX_PATH=${{ github.workspace }}/dependencies

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ endif()
9090

9191
set(MSL_MAJOR_VERSION 1)
9292
set(MSL_MINOR_VERSION 8)
93-
set(MSL_PATCH_VERSION 3)
93+
set(MSL_PATCH_VERSION 4)
9494
set(MSL_VERSION ${MSL_MAJOR_VERSION}.${MSL_MINOR_VERSION}.${MSL_PATCH_VERSION})
9595

9696
set(MSL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})

Compile/SPIRV-Cross

Submodule SPIRV-Cross updated 232 files

Compile/SPIRV-Tools

Submodule SPIRV-Tools updated 166 files

Compile/glslang

Submodule glslang updated 290 files

Compile/src/Preprocessor.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
#pragma GCC diagnostic push
2929
#pragma GCC diagnostic ignored "-Wshorten-64-to-32"
3030
#pragma GCC diagnostic ignored "-Wunused-local-typedef"
31+
#elif MSL_GCC
32+
#pragma GCC diagnostic push
33+
#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
3134
#endif
3235

3336
#define BOOST_FILESYSTEM_NO_DEPRECATED 1
@@ -40,7 +43,7 @@
4043

4144
#if MSL_MSC
4245
#pragma warning(pop)
43-
#elif MSL_CLANG
46+
#elif MSL_CLANG || MSL_GCC
4447
#pragma GCC diagnostic pop
4548
#endif
4649

0 commit comments

Comments
 (0)