From 9275437bfd825d4883e1fec6d209c68f6a823d48 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Tue, 28 May 2019 16:37:32 +0300 Subject: [PATCH] update glslang --- Vulkan/CMakeLists.txt | 3 +++ Vulkan/glslang | 2 +- appveyor.yml | 2 +- rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Vulkan/CMakeLists.txt b/Vulkan/CMakeLists.txt index 03d6812801d7..73b038fb5f4f 100644 --- a/Vulkan/CMakeLists.txt +++ b/Vulkan/CMakeLists.txt @@ -1,4 +1,7 @@ set(SKIP_GLSLANG_INSTALL ON CACHE BOOL "Skip installation" FORCE) set(ENABLE_GLSLANG_BINARIES OFF CACHE BOOL "Builds glslangValidator and spirv-remap" FORCE) +set(ENABLE_OPT OFF CACHE BOOL "Enables spirv-opt capability if present" FORCE) set(ENABLE_HLSL OFF CACHE BOOL "Enables HLSL input support" FORCE) +set(ENABLE_AMD_EXTENSIONS ON CACHE BOOL "Enables support of AMD-specific extensions" FORCE) +set(ENABLE_NV_EXTENSIONS ON CACHE BOOL "Enables support of Nvidia-specific extensions" FORCE) add_subdirectory(glslang) diff --git a/Vulkan/glslang b/Vulkan/glslang index c99304c5dc51..c11e3156af22 160000 --- a/Vulkan/glslang +++ b/Vulkan/glslang @@ -1 +1 @@ -Subproject commit c99304c5dc513c43b8f329663326331fc67d9e4d +Subproject commit c11e3156af2297f89a23c8db3f5e2323733ee556 diff --git a/appveyor.yml b/appveyor.yml index c178a8ce1ff3..d25a7eb3e4db 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -6,7 +6,7 @@ image: Visual Studio 2017 environment: QTDIR: C:\Qt\5.11\msvc2017_64 LLVMLIBS: https://github.com/RPCS3/llvm/releases/download/continuous-master/llvmlibs.7z - GLSLANG: https://drive.google.com/uc?export=download&id=1nJK_NEeRzJ_r_u4zWLySwLmMrV8ZO_wL + GLSLANG: https://dl.dropboxusercontent.com/s/ku2qgwmtfptzbvx/glslang.7z 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/VKFragmentProgram.cpp b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp index a85ab3908095..2bd95917ca3b 100644 --- a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp @@ -32,7 +32,7 @@ void VKFragmentDecompilerThread::insertHeader(std::stringstream & OS) if (device_props.has_native_half_support) { OS << "#version 450\n"; - OS << "#extension GL_KHX_shader_explicit_arithmetic_types_float16: enable\n"; + OS << "#extension GL_EXT_shader_explicit_arithmetic_types_float16: enable\n"; } else {