ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update vulkan submodules (#3600)

This commit is contained in:
kd-11 2017-10-15 14:37:52 +03:00 committed by GitHub
parent 304a4a1b61
commit a11d66f52d
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vulkan/Vulkan-LoaderAndValidationLayers

@ -1 +1 @@
Subproject commit 115665a3b59059b9706e0afed6ce348bd58b1c38
Subproject commit 85926a33d427ee62f395a50886db980127063c72

2
Vulkan/glslang

@ -1 +1 @@
Subproject commit 0e07119ae295b5624006518a9046c3fcd16087e2
Subproject commit cf571f7310f58e6eb4ea35600ef1401bc76db0d2

1
rpcs3/CMakeLists.txt
View File

@ -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"
)

4
rpcs3/Emu/RSX/VK/VKHelpers.cpp
View File

@ -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);