From 4e04780adc464d5088e93d488cdf466cefdba86e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Thu, 9 Nov 2017 13:07:30 +0100
Subject: [PATCH 1/2] Upgrade glslang to a fresh version (used to compile
 Vulkan shaders). Might help #10065 ?)

---
 android/jni/app-android.cpp |  1 +
 ext/glslang                 |  2 +-
 ext/glslang.vcxproj         |  7 ++-----
 ext/glslang.vcxproj.filters | 12 ------------
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/android/jni/app-android.cpp b/android/jni/app-android.cpp
index 2d16e1b0e7..8517e5bdf1 100644
--- a/android/jni/app-android.cpp
+++ b/android/jni/app-android.cpp
@@ -304,6 +304,7 @@ bool AndroidVulkanContext::Init(ANativeWindow *wnd, int desiredBackbufferSizeX,
 	ILOG("Creating vulkan device");
 	if (g_Vulkan->CreateDevice() != VK_SUCCESS) {
 		ILOG("Failed to create vulkan device: %s", g_Vulkan->InitError().c_str());
+		System_SendMessage("toast", "No Vulkan driver found. Using OpenGL instead.");
 		delete g_Vulkan;
 		g_Vulkan = nullptr;
 		return false;
diff --git a/ext/glslang b/ext/glslang
index 136b1e2d5d..2edde6665d 160000
--- a/ext/glslang
+++ b/ext/glslang
@@ -1 +1 @@
-Subproject commit 136b1e2d5d90284fd7bdd77ed605c70a8d31c8c4
+Subproject commit 2edde6665d9a56ead5ea0e55b4e64d9a803e6164
diff --git a/ext/glslang.vcxproj b/ext/glslang.vcxproj
index 90cb9ce1ee..54b3581255 100644
--- a/ext/glslang.vcxproj
+++ b/ext/glslang.vcxproj
@@ -22,7 +22,8 @@
     <ProjectGuid>{EDFA2E87-8AC1-4853-95D4-D7594FF81947}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>glslang</RootNamespace>
-    <WindowsTargetPlatformVersion></WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>
+    </WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -168,9 +169,7 @@
     <ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\Pp.cpp" />
     <ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpAtom.cpp" />
     <ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp" />
-    <ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpMemory.cpp" />
     <ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp" />
-    <ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpSymbols.cpp" />
     <ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp" />
     <ClCompile Include="glslang\glslang\MachineIndependent\propagateNoContraction.cpp" />
     <ClCompile Include="glslang\glslang\MachineIndependent\reflection.cpp" />
@@ -184,7 +183,6 @@
     <ClCompile Include="glslang\hlsl\hlslGrammar.cpp" />
     <ClCompile Include="glslang\hlsl\hlslOpMap.cpp" />
     <ClCompile Include="glslang\hlsl\hlslParseables.cpp" />
-    <ClCompile Include="glslang\hlsl\hlslParseHelper.cpp" />
     <ClCompile Include="glslang\hlsl\hlslScanContext.cpp" />
     <ClCompile Include="glslang\hlsl\hlslTokenStream.cpp" />
     <ClCompile Include="glslang\OGLCompilersDLL\InitializeDll.cpp" />
@@ -231,7 +229,6 @@
     <ClInclude Include="glslang\hlsl\hlslGrammar.h" />
     <ClInclude Include="glslang\hlsl\hlslOpMap.h" />
     <ClInclude Include="glslang\hlsl\hlslParseables.h" />
-    <ClInclude Include="glslang\hlsl\hlslParseHelper.h" />
     <ClInclude Include="glslang\hlsl\hlslScanContext.h" />
     <ClInclude Include="glslang\hlsl\hlslTokens.h" />
     <ClInclude Include="glslang\hlsl\hlslTokenStream.h" />
diff --git a/ext/glslang.vcxproj.filters b/ext/glslang.vcxproj.filters
index 3031780531..af94d50565 100644
--- a/ext/glslang.vcxproj.filters
+++ b/ext/glslang.vcxproj.filters
@@ -42,15 +42,9 @@
     <ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp">
       <Filter>glslang</Filter>
     </ClCompile>
-    <ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpMemory.cpp">
-      <Filter>glslang</Filter>
-    </ClCompile>
     <ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp">
       <Filter>glslang</Filter>
     </ClCompile>
-    <ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpSymbols.cpp">
-      <Filter>glslang</Filter>
-    </ClCompile>
     <ClCompile Include="glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp">
       <Filter>glslang</Filter>
     </ClCompile>
@@ -137,9 +131,6 @@
     <ClCompile Include="glslang\hlsl\hlslParseables.cpp">
       <Filter>HLSL</Filter>
     </ClCompile>
-    <ClCompile Include="glslang\hlsl\hlslParseHelper.cpp">
-      <Filter>HLSL</Filter>
-    </ClCompile>
     <ClCompile Include="glslang\hlsl\hlslScanContext.cpp">
       <Filter>HLSL</Filter>
     </ClCompile>
@@ -290,9 +281,6 @@
     <ClInclude Include="glslang\hlsl\hlslParseables.h">
       <Filter>HLSL</Filter>
     </ClInclude>
-    <ClInclude Include="glslang\hlsl\hlslParseHelper.h">
-      <Filter>HLSL</Filter>
-    </ClInclude>
     <ClInclude Include="glslang\hlsl\hlslScanContext.h">
       <Filter>HLSL</Filter>
     </ClInclude>

From b689e8e15fc255835e75972dd61690c35aa3c7f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Thu, 9 Nov 2017 13:55:33 +0100
Subject: [PATCH 2/2] Fix some ports

---
 UWP/glslang_UWP/glslang_UWP.vcxproj         |  6 +-----
 UWP/glslang_UWP/glslang_UWP.vcxproj.filters | 14 +-------------
 ext/glslang-build/Android.mk                |  3 ---
 3 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/UWP/glslang_UWP/glslang_UWP.vcxproj b/UWP/glslang_UWP/glslang_UWP.vcxproj
index 5673b2a5be..a4b35f9bcd 100644
--- a/UWP/glslang_UWP/glslang_UWP.vcxproj
+++ b/UWP/glslang_UWP/glslang_UWP.vcxproj
@@ -323,7 +323,6 @@
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslGrammar.h" />
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslOpMap.h" />
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslParseables.h" />
-    <ClInclude Include="..\..\ext\glslang\hlsl\hlslParseHelper.h" />
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslScanContext.h" />
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslTokens.h" />
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslTokenStream.h" />
@@ -365,9 +364,7 @@
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\Pp.cpp" />
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpAtom.cpp" />
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp" />
-    <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpMemory.cpp" />
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp" />
-    <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpSymbols.cpp" />
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp" />
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\propagateNoContraction.cpp" />
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\reflection.cpp" />
@@ -381,7 +378,6 @@
     <ClCompile Include="..\..\ext\glslang\hlsl\hlslGrammar.cpp" />
     <ClCompile Include="..\..\ext\glslang\hlsl\hlslOpMap.cpp" />
     <ClCompile Include="..\..\ext\glslang\hlsl\hlslParseables.cpp" />
-    <ClCompile Include="..\..\ext\glslang\hlsl\hlslParseHelper.cpp" />
     <ClCompile Include="..\..\ext\glslang\hlsl\hlslScanContext.cpp" />
     <ClCompile Include="..\..\ext\glslang\hlsl\hlslTokenStream.cpp" />
     <ClCompile Include="..\..\ext\glslang\OGLCompilersDLL\InitializeDll.cpp" />
@@ -407,4 +403,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/UWP/glslang_UWP/glslang_UWP.vcxproj.filters b/UWP/glslang_UWP/glslang_UWP.vcxproj.filters
index 70bbd5a997..443bf3bd7d 100644
--- a/UWP/glslang_UWP/glslang_UWP.vcxproj.filters
+++ b/UWP/glslang_UWP/glslang_UWP.vcxproj.filters
@@ -103,15 +103,9 @@
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpContext.cpp">
       <Filter>glslang\MachineIndependent\Preprocessor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpMemory.cpp">
-      <Filter>glslang\MachineIndependent\Preprocessor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpScanner.cpp">
       <Filter>glslang\MachineIndependent\Preprocessor</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpSymbols.cpp">
-      <Filter>glslang\MachineIndependent\Preprocessor</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ext\glslang\glslang\MachineIndependent\preprocessor\PpTokens.cpp">
       <Filter>glslang\MachineIndependent\Preprocessor</Filter>
     </ClCompile>
@@ -154,9 +148,6 @@
     <ClCompile Include="..\..\ext\glslang\hlsl\hlslParseables.cpp">
       <Filter>hlsl</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\ext\glslang\hlsl\hlslParseHelper.cpp">
-      <Filter>hlsl</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\ext\glslang\hlsl\hlslScanContext.cpp">
       <Filter>hlsl</Filter>
     </ClCompile>
@@ -314,9 +305,6 @@
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslParseables.h">
       <Filter>hlsl</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\ext\glslang\hlsl\hlslParseHelper.h">
-      <Filter>hlsl</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\ext\glslang\hlsl\hlslScanContext.h">
       <Filter>hlsl</Filter>
     </ClInclude>
@@ -330,4 +318,4 @@
       <Filter>OGLCompilersDLL</Filter>
     </ClInclude>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/ext/glslang-build/Android.mk b/ext/glslang-build/Android.mk
index f88373e782..8bf8106ca0 100644
--- a/ext/glslang-build/Android.mk
+++ b/ext/glslang-build/Android.mk
@@ -33,16 +33,13 @@ LOCAL_SRC_FILES := \
     ../glslang/glslang/MachineIndependent/preprocessor/Pp.cpp \
     ../glslang/glslang/MachineIndependent/preprocessor/PpAtom.cpp \
     ../glslang/glslang/MachineIndependent/preprocessor/PpContext.cpp \
-    ../glslang/glslang/MachineIndependent/preprocessor/PpMemory.cpp \
     ../glslang/glslang/MachineIndependent/preprocessor/PpScanner.cpp \
-    ../glslang/glslang/MachineIndependent/preprocessor/PpSymbols.cpp \
     ../glslang/glslang/MachineIndependent/preprocessor/PpTokens.cpp \
     ../glslang/glslang/OSDependent/Unix/ossource.cpp \
     ../glslang/hlsl/hlslAttributes.cpp \
     ../glslang/hlsl/hlslGrammar.cpp \
     ../glslang/hlsl/hlslOpMap.cpp \
     ../glslang/hlsl/hlslParseables.cpp \
-    ../glslang/hlsl/hlslParseHelper.cpp \
     ../glslang/hlsl/hlslScanContext.cpp \
     ../glslang/hlsl/hlslTokenStream.cpp \
     ../glslang/SPIRV/disassemble.cpp \