diff --git a/Vulkan/glslang b/Vulkan/glslang index e22e347395..c99304c5dc 160000 --- a/Vulkan/glslang +++ b/Vulkan/glslang @@ -1 +1 @@ -Subproject commit e22e3473958e9bf3536f6c2133d66e5808816b78 +Subproject commit c99304c5dc513c43b8f329663326331fc67d9e4d diff --git a/appveyor.yml b/appveyor.yml index 400d090558..6fbb45794b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ image: Visual Studio 2015 environment: QTDIR: C:\Qt\5.10\msvc2015_64 LLVMLIBS: https://github.com/RPCS3/llvm/releases/download/continuous-release_60/llvmlibs.7z - GLSLANG: https://drive.google.com/uc?export=download&id=1A2eOMmCO714i0U7J0qI4aEMKnuWl8l_R + GLSLANG: https://drive.google.com/uc?export=download&id=1nJK_NEeRzJ_r_u4zWLySwLmMrV8ZO_wL COMPATDB: https://rpcs3.net/compatibility?api=v1&export VULKAN_SDK: "C:\\VulkanSDK\\1.1.73.0" VULKAN_SDK_URL: https://sdk.lunarg.com/sdk/download/1.1.73.0/windows/VulkanSDK-1.1.73.0-Installer.exe diff --git a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp b/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp index daa1dc6146..523b11ea74 100644 --- a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp +++ b/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp @@ -147,8 +147,8 @@ namespace vk glslang::TShader shader_object(lang); shader_object.setEnvInput(glslang::EShSourceGlsl, lang, glslang::EShClientVulkan, 100); - shader_object.setEnvClient(glslang::EShClientVulkan, 100); - shader_object.setEnvTarget(glslang::EshTargetSpv, 0x00001000); + shader_object.setEnvClient(glslang::EShClientVulkan, glslang::EShTargetClientVersion::EShTargetVulkan_1_0); + shader_object.setEnvTarget(glslang::EshTargetSpv, glslang::EShTargetLanguageVersion::EShTargetSpv_1_0); bool success = false; const char *shader_text = shader.data();