Skip to content

Commit 21b7e0b

Browse files
committed
Updated glslang, SPIRV-Cross, and SPIRV-Tools submodules.
Added a new fix for glslang to disable link checks that interfere with the linking behavior of MSL. These situations are invalid for the general glslang case, but are managed after SPIR-V conversion by MSL. Incremented version to 1.4.5.
1 parent b9224c0 commit 21b7e0b

File tree

6 files changed

+8
-9
lines changed

6 files changed

+8
-9
lines changed

CMakeLists.txt

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

6161
set(MSL_MAJOR_VERSION 1)
6262
set(MSL_MINOR_VERSION 4)
63-
set(MSL_PATCH_VERSION 4)
63+
set(MSL_PATCH_VERSION 5)
6464
set(MSL_VERSION ${MSL_MAJOR_VERSION}.${MSL_MINOR_VERSION}.${MSL_PATCH_VERSION})
6565

6666
set(MSL_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})

Compile/SPIRV-Cross

Submodule SPIRV-Cross updated 76 files

Compile/SPIRV-Tools

Submodule SPIRV-Tools updated 179 files

Compile/glslang

Submodule glslang updated 125 files

Compile/src/Compiler.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2016 Aaron Barany
2+
* Copyright 2016-2021 Aaron Barany
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -27,6 +27,7 @@
2727
#if MSL_GCC || MSL_CLANG
2828
#pragma GCC diagnostic push
2929
#pragma GCC diagnostic ignored "-Wconversion"
30+
#pragma GCC diagnostic ignored "-Wsign-compare"
3031
#endif
3132

3233
#include "SPIRV/GlslangToSpv.h"

update-submodules.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,8 @@ set -e
55
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
66
cd "$DIR"
77

8-
git submodule init
9-
git submodule update
8+
git submodule update --init
109

1110
# Need to init the submodule in SPIRV-Tools
1211
cd Compile/SPIRV-Tools
13-
git submodule init
14-
git submodule update
12+
git submodule update --init

0 commit comments

Comments
 (0)