From 603b775f4a72f137509686c3f8aabcd0dadd6af0 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Thu, 6 Apr 2023 23:56:47 +0200 Subject: [PATCH] llvm: fix submodule path - Use official llvm repo - Move llvm to 3rdparty - Ignore SPIRV submodules in CI --- .ci/build-freebsd.sh | 2 +- .ci/build-linux.sh | 2 +- .ci/setup-windows.sh | 4 ++-- .gitignore | 7 ++++++- .gitmodules | 6 +++--- 3rdparty/CMakeLists.txt | 4 ++-- 3rdparty/llvm.cmake | 4 ++-- 3rdparty/llvm/llvm | 1 + .../llvm/llvm_build}/llvm_build.vcxproj | 8 ++++---- .../llvm/llvm_build}/llvm_build.vcxproj.filters | 0 .../llvm/llvm_build}/llvm_build_clang_cl.vcxproj | 8 ++++---- .../llvm/llvm_build}/llvm_build_clang_cl.vcxproj.filters | 0 buildfiles/msvc/rpcs3_debug.props | 2 +- buildfiles/msvc/rpcs3_release.props | 2 +- llvm | 1 - rpcs3.sln | 4 ++-- rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp | 1 - rpcs3/emucore.vcxproj | 2 +- 18 files changed, 31 insertions(+), 27 deletions(-) create mode 160000 3rdparty/llvm/llvm rename {llvm_build => 3rdparty/llvm/llvm_build}/llvm_build.vcxproj (84%) rename {llvm_build => 3rdparty/llvm/llvm_build}/llvm_build.vcxproj.filters (100%) rename {llvm_build => 3rdparty/llvm/llvm_build}/llvm_build_clang_cl.vcxproj (84%) rename {llvm_build => 3rdparty/llvm/llvm_build}/llvm_build_clang_cl.vcxproj.filters (100%) delete mode 160000 llvm diff --git a/.ci/build-freebsd.sh b/.ci/build-freebsd.sh index 1ee97a4f61..d04bcfc7e9 100755 --- a/.ci/build-freebsd.sh +++ b/.ci/build-freebsd.sh @@ -3,7 +3,7 @@ # Pull all the submodules except llvm # Note: Tried to use git submodule status, but it takes over 20 seconds # shellcheck disable=SC2046 -git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules) +git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ && !/SPIRV/ { print $3 }' .gitmodules) # Prefer newer Clang than in base system (see also .ci/install-freebsd.sh) # libc++ isn't in llvm* packages, so download manually diff --git a/.ci/build-linux.sh b/.ci/build-linux.sh index 099fcabaf6..4e80f532a7 100755 --- a/.ci/build-linux.sh +++ b/.ci/build-linux.sh @@ -12,7 +12,7 @@ fi # Pull all the submodules except llvm # Note: Tried to use git submodule status, but it takes over 20 seconds # shellcheck disable=SC2046 -git submodule -q update --init $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules) +git submodule -q update --init $(awk '/path/ && !/llvm/ && !/SPIRV/ { print $3 }' .gitmodules) mkdir build && cd build || exit 1 diff --git a/.ci/setup-windows.sh b/.ci/setup-windows.sh index b127f0d30a..a70263e0f5 100755 --- a/.ci/setup-windows.sh +++ b/.ci/setup-windows.sh @@ -40,7 +40,7 @@ DEP_URLS=" \ # Pull all the submodules except llvm, since it is built separately and we just download that build # Note: Tried to use git submodule status, but it takes over 20 seconds # shellcheck disable=SC2046 -git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules) +git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/llvm/ && !/SPIRV/ { print $3 }' .gitmodules) # Git bash doesn't have rev, so here it is rev() @@ -79,7 +79,7 @@ for url in $DEP_URLS; do # shellcheck disable=SC1003 case "$url" in *qt*) checksum=$(curl -L "${url}.sha1"); algo="sha1"; outDir='C:\Qt\' ;; - *llvm*) checksum=$(curl -L "${url}.sha256"); algo="sha256"; outDir="." ;; + *llvm*) checksum=$(curl -L "${url}.sha256"); algo="sha256"; outDir="./3rdparty/llvm" ;; *glslang*) checksum=$(curl -L "${url}.sha256"); algo="sha256"; outDir="./lib/Release-x64" ;; *Vulkan*) # Vulkan setup needs to be run in batch environment diff --git a/.gitignore b/.gitignore index 0df47afadf..776e173a58 100644 --- a/.gitignore +++ b/.gitignore @@ -36,7 +36,6 @@ /ipch /rpcs3/Debug /rpcs3/Release -/llvm_build !/bin /bin/* @@ -126,6 +125,12 @@ yaml-cpp.pc # miniupnp /3rdparty/miniupnp/x64/* +# llvm +/3rdparty/llvm/llvm_build + +# legacy llvm +/llvm_build + # ssl certificate cacert.pem diff --git a/.gitmodules b/.gitmodules index 83c1060184..4636ad8885 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,9 @@ url = ../../RPCS3/asmjit.git branch = aarch64 ignore = dirty -[submodule "llvm"] - path = llvm - url = ../../RPCS3/llvm-mirror.git +[submodule "3rdparty/llvm/llvm"] + path = 3rdparty/llvm/llvm + url = ../../llvm/llvm-project.git ignore = dirty [submodule "3rdparty/glslang"] path = 3rdparty/glslang/glslang diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 60e006e811..e036580ca8 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -78,7 +78,7 @@ add_subdirectory(hidapi) # Vulkan add_subdirectory(glslang EXCLUDE_FROM_ALL) -add_subdirectory(SPIRV EXCLUDE_FROM_ALL) +#add_subdirectory(SPIRV EXCLUDE_FROM_ALL) # yaml-cpp @@ -189,7 +189,7 @@ if(USE_VULKAN) if(VULKAN_FOUND) add_library(3rdparty_vulkan INTERFACE) target_compile_definitions(3rdparty_vulkan INTERFACE -DHAVE_VULKAN) - target_link_libraries(3rdparty_vulkan INTERFACE SPIRV SPIRV-Tools-opt Vulkan::Vulkan) + target_link_libraries(3rdparty_vulkan INTERFACE SPIRV Vulkan::Vulkan) if(UNIX AND NOT APPLE) find_package(Wayland) diff --git a/3rdparty/llvm.cmake b/3rdparty/llvm.cmake index 9947dab1ef..9f9bdb4122 100644 --- a/3rdparty/llvm.cmake +++ b/3rdparty/llvm.cmake @@ -32,8 +32,8 @@ if(WITH_LLVM) endif() # LLVM needs to be built out-of-tree - add_subdirectory(${CMAKE_SOURCE_DIR}/llvm ${CMAKE_CURRENT_BINARY_DIR}/llvm_build EXCLUDE_FROM_ALL) - set(LLVM_DIR "${CMAKE_CURRENT_BINARY_DIR}/llvm_build/lib/cmake/llvm/") + add_subdirectory(${CMAKE_SOURCE_DIR}/3rdparty/llvm/llvm ${CMAKE_CURRENT_BINARY_DIR}/3rdparty/llvm/llvm_build EXCLUDE_FROM_ALL) + set(LLVM_DIR "${CMAKE_CURRENT_BINARY_DIR}/3rdparty/llvm/llvm_build/lib/cmake/llvm/") set(CMAKE_CXX_FLAGS ${CXX_FLAGS_OLD}) diff --git a/3rdparty/llvm/llvm b/3rdparty/llvm/llvm new file mode 160000 index 0000000000..08d094a0e4 --- /dev/null +++ b/3rdparty/llvm/llvm @@ -0,0 +1 @@ +Subproject commit 08d094a0e457360ad8b94b017d2dc277e697ca76 diff --git a/llvm_build/llvm_build.vcxproj b/3rdparty/llvm/llvm_build/llvm_build.vcxproj similarity index 84% rename from llvm_build/llvm_build.vcxproj rename to 3rdparty/llvm/llvm_build/llvm_build.vcxproj index 6fc5889d78..57110d89c2 100644 --- a/llvm_build/llvm_build.vcxproj +++ b/3rdparty/llvm/llvm_build/llvm_build.vcxproj @@ -14,9 +14,9 @@ {8BC303AB-25BE-4276-8E57-73F171B2D672} MakeFileProj - + - + Makefile true @@ -39,9 +39,9 @@ call vsdevcmd.bat -arch=amd64 - cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="./Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm + cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="./Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm/llvm call vsdevcmd.bat -arch=amd64 - cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="./Debug" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm + cmake -G Ninja -DCMAKE_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="./Debug" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm/llvm echo Cleaning.. for /F "delims= eol=|" %%f in (' dir /b ^| findstr /V "[^.]*\build[^.]*\.vcxproj"') do ( diff --git a/llvm_build/llvm_build.vcxproj.filters b/3rdparty/llvm/llvm_build/llvm_build.vcxproj.filters similarity index 100% rename from llvm_build/llvm_build.vcxproj.filters rename to 3rdparty/llvm/llvm_build/llvm_build.vcxproj.filters diff --git a/llvm_build/llvm_build_clang_cl.vcxproj b/3rdparty/llvm/llvm_build/llvm_build_clang_cl.vcxproj similarity index 84% rename from llvm_build/llvm_build_clang_cl.vcxproj rename to 3rdparty/llvm/llvm_build/llvm_build_clang_cl.vcxproj index 189bf6fee2..30d7a248b1 100644 --- a/llvm_build/llvm_build_clang_cl.vcxproj +++ b/3rdparty/llvm/llvm_build/llvm_build_clang_cl.vcxproj @@ -14,9 +14,9 @@ {A37E4273-85DB-4217-B775-CE971B87D9DF} MakeFileProj - + - + Makefile true @@ -39,9 +39,9 @@ call vsdevcmd.bat -arch=amd64 - cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DCMAKE_INSTALL_PREFIX="./Release" -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm + cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Release" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DCMAKE_INSTALL_PREFIX="./Release" -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm/llvm call vsdevcmd.bat -arch=amd64 - cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DCMAKE_INSTALL_PREFIX="./Debug" -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_TOOLS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm + cmake -G Ninja -DCMAKE_CXX_COMPILER="clang-cl.exe" -DCMAKE_C_COMPILER="clang-cl.exe" -DCMAKE_BUILD_TYPE="Debug" -DLLVM_TARGETS_TO_BUILD=X86 -DLLVM_DEFAULT_TARGET_TRIPLE:STRING=x86_64-pc-windows-msvc -DLLVM_HOST_TRIPLE:STRING=x86_64-pc-windows-msvc -DCMAKE_INSTALL_PREFIX="./Debug" -DLLVM_BUILD_RUNTIME=OFF -DLLVM_BUILD_TOOLS=OFF -DLLVM_INCLUDE_DOCS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_INCLUDE_UTILS=OFF -DCMAKE_SYSTEM_VERSION=6.1 -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=$(WindowsTargetPlatformVersion) -DLLVM_USE_CRT_DEBUG=MTd -DLLVM_USE_CRT_RELEASE=MT -DLLVM_USE_INTEL_JITEVENTS=ON ../llvm/llvm echo Cleaning.. for /F "delims= eol=|" %%f in (' dir /b ^| findstr /V "[^.]*\build[^.]*\.vcxproj"') do ( diff --git a/llvm_build/llvm_build_clang_cl.vcxproj.filters b/3rdparty/llvm/llvm_build/llvm_build_clang_cl.vcxproj.filters similarity index 100% rename from llvm_build/llvm_build_clang_cl.vcxproj.filters rename to 3rdparty/llvm/llvm_build/llvm_build_clang_cl.vcxproj.filters diff --git a/buildfiles/msvc/rpcs3_debug.props b/buildfiles/msvc/rpcs3_debug.props index fe719908e2..3e3552ffd2 100644 --- a/buildfiles/msvc/rpcs3_debug.props +++ b/buildfiles/msvc/rpcs3_debug.props @@ -14,7 +14,7 @@ LLVM_AVAILABLE;%(PreprocessorDefinitions) - %(AdditionalLibraryDirectories);..\llvm_build\Debug\lib + %(AdditionalLibraryDirectories);..3rdparty\llvm\llvm_build\Debug\lib %(AdditionalDependencies); LLVMAggressiveInstCombine.lib; LLVMAnalysis.lib; diff --git a/buildfiles/msvc/rpcs3_release.props b/buildfiles/msvc/rpcs3_release.props index e7c907c075..04d6550790 100644 --- a/buildfiles/msvc/rpcs3_release.props +++ b/buildfiles/msvc/rpcs3_release.props @@ -15,7 +15,7 @@ true true - %(AdditionalLibraryDirectories);..\llvm_build\Release\lib + %(AdditionalLibraryDirectories);..\3rdparty\llvm\llvm_build\Release\lib %(AdditionalDependencies); LLVMAggressiveInstCombine.lib; LLVMAnalysis.lib; diff --git a/llvm b/llvm deleted file mode 160000 index 89d5468e95..0000000000 --- a/llvm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 89d5468e9505ddb04754eadbfed526f5b6ad4cbd diff --git a/rpcs3.sln b/rpcs3.sln index 5046a0cf6d..4679ade564 100644 --- a/rpcs3.sln +++ b/rpcs3.sln @@ -10,7 +10,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "emucore", "rpcs3\emucore.vc {939FE206-1182-ABC3-1234-FEAB88E98404} = {939FE206-1182-ABC3-1234-FEAB88E98404} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm_build", "llvm_build\llvm_build.vcxproj", "{8BC303AB-25BE-4276-8E57-73F171B2D672}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm_build", "3rdparty\llvm\llvm_build\llvm_build.vcxproj", "{8BC303AB-25BE-4276-8E57-73F171B2D672}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GLGSRender", "rpcs3\GLGSRender.vcxproj", "{3384223A-6D97-4799-9862-359F85312892}" EndProject @@ -79,7 +79,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "spirv", "3rdparty\SPIRV\spi EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rdParty", "3rdParty", "{6C3B64A0-8F8A-4DC4-8C0B-D71EBEED7FA8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm_build_clang_cl", "llvm_build\llvm_build_clang_cl.vcxproj", "{A37E4273-85DB-4217-B775-CE971B87D9DF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "llvm_build_clang_cl", "3rdparty\llvm\llvm_build\llvm_build_clang_cl.vcxproj", "{A37E4273-85DB-4217-B775-CE971B87D9DF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cubeb", "rpcs3\Cubeb.vcxproj", "{9610627D-20FE-4B07-8CE3-9FF68A5F1EC2}" EndProject diff --git a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp b/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp index f10ad0c6ba..a9005d5202 100644 --- a/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp +++ b/rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp @@ -14,7 +14,6 @@ #endif #endif #include "SPIRV/GlslangToSpv.h" -#include "spirv-tools/optimizer.hpp" #ifdef _MSC_VER #pragma warning(pop) #else diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj index 290e710064..ff6ae822a4 100644 --- a/rpcs3/emucore.vcxproj +++ b/rpcs3/emucore.vcxproj @@ -40,7 +40,7 @@ Use - ..\3rdparty\miniupnp\miniupnp\miniupnpc\include;..\3rdparty\wolfssl\wolfssl;..\3rdparty\flatbuffers\include;..\3rdparty\libusb\libusb\libusb;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\SoundTouch\soundtouch\include;..\3rdparty\zlib\zlib;..\llvm\include;..\llvm_build\include;$(VULKAN_SDK)\Include + ..\3rdparty\miniupnp\miniupnp\miniupnpc\include;..\3rdparty\wolfssl\wolfssl;..\3rdparty\flatbuffers\include;..\3rdparty\libusb\libusb\libusb;..\3rdparty\yaml-cpp\yaml-cpp\include;..\3rdparty\SoundTouch\soundtouch\include;..\3rdparty\zlib\zlib;..\3rdparty\llvm\llvm\include;..\3rdparty\llvm\llvm\llvm\include;..\3rdparty\llvm\llvm_build\include;$(VULKAN_SDK)\Include MaxSpeed MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL2;%(PreprocessorDefinitions) MINIUPNP_STATICLIB;HAVE_VULKAN;HAVE_SDL2;%(PreprocessorDefinitions)