diff --git a/MarathonRecomp/gpu/video.cpp b/MarathonRecomp/gpu/video.cpp index 7cfa692f7..5e7cdc66f 100644 --- a/MarathonRecomp/gpu/video.cpp +++ b/MarathonRecomp/gpu/video.cpp @@ -1872,10 +1872,6 @@ bool Video::CreateHostDevice(const char *sdlVideoDriver) continue; } } - - // Hardware resolve seems to be completely bugged on Intel D3D12 drivers. - g_hardwareResolve = (deviceDescription.vendor != RenderDeviceVendor::INTEL); - g_hardwareDepthResolve = (deviceDescription.vendor != RenderDeviceVendor::INTEL); } g_backend = (interfaceFunction == CreateVulkanInterfaceWrapper) ? Backend::VULKAN : Backend::D3D12; diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt index 78867bd24..c9fbeba5f 100644 --- a/thirdparty/CMakeLists.txt +++ b/thirdparty/CMakeLists.txt @@ -18,9 +18,9 @@ set(SDL2MIXER_WAVPACK OFF) add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/msdf-atlas-gen") add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/nativefiledialog-extended") add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/o1heap") -add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/plume") add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/SDL") add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/SDL_mixer") +add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/plume") if (APPLE) add_subdirectory("${MARATHON_RECOMP_THIRDPARTY_ROOT}/MoltenVK") diff --git a/thirdparty/plume b/thirdparty/plume index 62ccdc6a3..545afb7e5 160000 --- a/thirdparty/plume +++ b/thirdparty/plume @@ -1 +1 @@ -Subproject commit 62ccdc6a369b3066043b5a322634789f56cdbe29 +Subproject commit 545afb7e5ba6fdf2a623eb5ddee2e44a16259e63