From a11d66f52d072e05006ec6d4074abc6791a0e03f Mon Sep 17 00:00:00 2001
From: kd-11 <karokidii@gmail.com>
Date: Sun, 15 Oct 2017 14:37:52 +0300
Subject: [PATCH] update vulkan submodules (#3600)

---
 Vulkan/Vulkan-LoaderAndValidationLayers | 2 +-
 Vulkan/glslang                          | 2 +-
 rpcs3/CMakeLists.txt                    | 1 -
 rpcs3/Emu/RSX/VK/VKHelpers.cpp          | 4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Vulkan/Vulkan-LoaderAndValidationLayers b/Vulkan/Vulkan-LoaderAndValidationLayers
index 115665a3b5..85926a33d4 160000
--- a/Vulkan/Vulkan-LoaderAndValidationLayers
+++ b/Vulkan/Vulkan-LoaderAndValidationLayers
@@ -1 +1 @@
-Subproject commit 115665a3b59059b9706e0afed6ce348bd58b1c38
+Subproject commit 85926a33d427ee62f395a50886db980127063c72
diff --git a/Vulkan/glslang b/Vulkan/glslang
index 0e07119ae2..cf571f7310 160000
--- a/Vulkan/glslang
+++ b/Vulkan/glslang
@@ -1 +1 @@
-Subproject commit 0e07119ae295b5624006518a9046c3fcd16087e2
+Subproject commit cf571f7310f58e6eb4ea35600ef1401bc76db0d2
diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index 641be7d324..a51062ff78 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -342,7 +342,6 @@ if (NOT WIN32 AND VULKAN_FOUND)
 	"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/MachineIndependent/*.cpp"
 	"${RPCS3_SRC_DIR}/../Vulkan/glslang/glslang/OSDependent/Unix/*.cpp"
 	"${RPCS3_SRC_DIR}/../Vulkan/glslang/OGLCompilersDLL/*.cpp"
-	"${RPCS3_SRC_DIR}/../Vulkan/glslang/hlsl/*.cpp"
 	"${RPCS3_SRC_DIR}/../Vulkan/glslang/SPIRV/*.cpp"
 	)
 	
diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.cpp b/rpcs3/Emu/RSX/VK/VKHelpers.cpp
index 382e266375..f3f3956313 100644
--- a/rpcs3/Emu/RSX/VK/VKHelpers.cpp
+++ b/rpcs3/Emu/RSX/VK/VKHelpers.cpp
@@ -453,8 +453,8 @@ namespace vk
 		case VK_ERROR_OUT_OF_POOL_MEMORY_KHR:
 			error_message = "Out of pool memory (VK_ERROR_OUT_OF_POOL_MEMORY_KHR)";
 			break;
-		case VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX:
-			error_message = "Invalid external handle (VK_ERROR_INVALID_EXTERNAL_HANDLE_KHX)";
+		case VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR:
+			error_message = "Invalid external handle (VK_ERROR_INVALID_EXTERNAL_HANDLE_KHR)";
 			break;
 		default:
 			error_message = fmt::format("Unknown Code (%Xh, %d)%s", (s32)error_code, (s32&)error_code, faulting_addr);