From 3a308dedb3f732450210ce0fe17d3b7e5663d2b4 Mon Sep 17 00:00:00 2001 From: Triang3l Date: Thu, 8 Oct 2020 23:24:25 +0300 Subject: [PATCH] [Vulkan] Temporarily move to a fork of glslang --- .gitmodules | 3 ++- third_party/glslang | 2 +- third_party/glslang-spirv.lua | 6 ++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index c50326cb4..0b1f9ce9c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -57,4 +57,5 @@ url = https://github.com/microsoft/DirectXShaderCompiler.git [submodule "third_party/glslang"] path = third_party/glslang - url = https://github.com/KhronosGroup/glslang.git + url = https://github.com/Triang3l/glslang.git + branch = patch-1 diff --git a/third_party/glslang b/third_party/glslang index 2067d1a93..5a9dfb674 160000 --- a/third_party/glslang +++ b/third_party/glslang @@ -1 +1 @@ -Subproject commit 2067d1a93e6edc17f2a6b7e3e5138a9bbcd35ef9 +Subproject commit 5a9dfb6741ca851f8bb57abc0fe808f5a0705fa2 diff --git a/third_party/glslang-spirv.lua b/third_party/glslang-spirv.lua index b5cdf15ba..19a04c71e 100644 --- a/third_party/glslang-spirv.lua +++ b/third_party/glslang-spirv.lua @@ -12,10 +12,8 @@ project("glslang-spirv") }) files({ "glslang/SPIRV/bitutils.h", - -- Disabled temporarily until PR #2417 removing SpvTools.h dependency is - -- merged. - -- "glslang/SPIRV/disassemble.cpp", - -- "glslang/SPIRV/disassemble.h", + "glslang/SPIRV/disassemble.cpp", + "glslang/SPIRV/disassemble.h", "glslang/SPIRV/doc.cpp", "glslang/SPIRV/doc.h", "glslang/SPIRV/GLSL.ext.AMD.h",