From 910ffe7c10b3f1922104ab4e16661a23edc5bf85 Mon Sep 17 00:00:00 2001 From: spectranator Date: Fri, 31 May 2024 10:19:41 +0200 Subject: [PATCH 1/3] Ran clang-format --- src/core/hle/service/ssl/ssl.cpp | 3 ++- src/video_core/renderer_opengl/gl_rasterizer.cpp | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/hle/service/ssl/ssl.cpp b/src/core/hle/service/ssl/ssl.cpp index 2c2db374ef..148c2bca4c 100644 --- a/src/core/hle/service/ssl/ssl.cpp +++ b/src/core/hle/service/ssl/ssl.cpp @@ -384,7 +384,8 @@ private: get_server_cert_chain = static_cast(parameters.value); break; case OptionType::EnableAlpn: - LOG_ERROR(Service_SSL, "Called with option={}, value={} (STUBBED)", parameters.option, parameters.value); + LOG_ERROR(Service_SSL, "Called with option={}, value={} (STUBBED)", parameters.option, + parameters.value); enable_alpn = static_cast(parameters.value); break; default: diff --git a/src/video_core/renderer_opengl/gl_rasterizer.cpp b/src/video_core/renderer_opengl/gl_rasterizer.cpp index f054fd338a..2f0cc829af 100644 --- a/src/video_core/renderer_opengl/gl_rasterizer.cpp +++ b/src/video_core/renderer_opengl/gl_rasterizer.cpp @@ -1207,13 +1207,12 @@ void RasterizerOpenGL::SyncLogicOpState() { auto regs = maxwell3d->regs; if (device.IsAmd()) { - auto IsFloat = [] (Tegra::Engines::Maxwell3D::Regs::VertexAttribute n) { + auto IsFloat = [](Tegra::Engines::Maxwell3D::Regs::VertexAttribute n) { return n.type == Tegra::Engines::Maxwell3D::Regs::VertexAttribute::Type::Float; }; - bool has_float = - std::any_of(regs.vertex_attrib_format.begin(), regs.vertex_attrib_format.end(), - IsFloat); + bool has_float = std::any_of(regs.vertex_attrib_format.begin(), + regs.vertex_attrib_format.end(), IsFloat); regs.logic_op.enable = static_cast(!has_float); } From e339153ededbcf3a07606a90cb0c4bbe04bbdff0 Mon Sep 17 00:00:00 2001 From: spectranator Date: Fri, 31 May 2024 10:00:45 +0000 Subject: [PATCH 2/3] Updated Vulkan stuff for bug fixes and improved hardware compatibility (#21) Fixes TOTK crashes on Steam Deck and potentially VRAM leak issues Reviewed-on: http://y2nlvhmmk5jnsvechppxnbyzmmv3vbl7dvzn6ltwcdbpgxixp3clkgqd.onion/torzu-emu/torzu/pulls/21 --- .gitmodules | 18 +++++++++--------- externals/Vulkan-Headers | 2 +- externals/Vulkan-Utility-Libraries | 2 +- externals/VulkanMemoryAllocator | 2 +- src/CMakeLists.txt | 1 + 5 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitmodules b/.gitmodules index d6042fe907..9dfd6df00f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,6 @@ [submodule "libusb"] path = externals/libusb/libusb url = https://github.com/libusb/libusb.git -[submodule "Vulkan-Headers"] - path = externals/Vulkan-Headers - url = https://github.com/KhronosGroup/Vulkan-Headers.git [submodule "xbyak"] path = externals/xbyak url = https://github.com/herumi/xbyak.git @@ -37,18 +34,12 @@ [submodule "tzdb_to_nx"] path = externals/nx_tzdb/tzdb_to_nx url = https://github.com/lat9nq/tzdb_to_nx.git -[submodule "VulkanMemoryAllocator"] - path = externals/VulkanMemoryAllocator - url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git [submodule "simpleini"] path = externals/simpleini url = https://github.com/brofield/simpleini.git [submodule "oaknut"] path = externals/oaknut url = https://github.com/merryhime/oaknut -[submodule "Vulkan-Utility-Libraries"] - path = externals/Vulkan-Utility-Libraries - url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git [submodule "externals/SPIRV-Headers"] path = externals/SPIRV-Headers url = https://github.com/KhronosGroup/SPIRV-Headers.git @@ -58,3 +49,12 @@ [submodule "externals/fmt"] path = externals/fmt url = https://github.com/fmtlib/fmt.git +[submodule "externals/Vulkan-Utility-Libraries"] + path = externals/Vulkan-Utility-Libraries + url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git +[submodule "externals/VulkanMemoryAllocator"] + path = externals/VulkanMemoryAllocator + url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git +[submodule "externals/Vulkan-Headers"] + path = externals/Vulkan-Headers + url = https://github.com/KhronosGroup/Vulkan-Headers.git diff --git a/externals/Vulkan-Headers b/externals/Vulkan-Headers index 80207f9da8..5677bafb82 160000 --- a/externals/Vulkan-Headers +++ b/externals/Vulkan-Headers @@ -1 +1 @@ -Subproject commit 80207f9da86423ce33aff8328a792fd715f3c08f +Subproject commit 5677bafb820e476441e9e1f745371b72133407d3 diff --git a/externals/Vulkan-Utility-Libraries b/externals/Vulkan-Utility-Libraries index 524f8910d0..777358fdad 160000 --- a/externals/Vulkan-Utility-Libraries +++ b/externals/Vulkan-Utility-Libraries @@ -1 +1 @@ -Subproject commit 524f8910d0e4a5f2ec5961996b23e5b74b95cb1d +Subproject commit 777358fdad21132866be4a835327fbc28eabc1a4 diff --git a/externals/VulkanMemoryAllocator b/externals/VulkanMemoryAllocator index 2f382df218..009ecd192c 160000 --- a/externals/VulkanMemoryAllocator +++ b/externals/VulkanMemoryAllocator @@ -1 +1 @@ -Subproject commit 2f382df218d7e8516dee3b3caccb819a62b571a2 +Subproject commit 009ecd192c1289c7529bff248a16cfe896254816 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fea04aa1d7..9c4357ecbd 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -120,6 +120,7 @@ else() -Wno-invalid-offsetof -Wno-unused-parameter -Wno-missing-field-initializers + -Wno-unused-function ) if (CMAKE_CXX_COMPILER_ID MATCHES Clang) # Clang or AppleClang From 63ea3f52f3b37dabbaa9c0f25ff1f2251cc0eda6 Mon Sep 17 00:00:00 2001 From: spectranator Date: Fri, 31 May 2024 15:25:30 +0200 Subject: [PATCH 3/3] Mention Suyu and Sudachi in changes list --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5d3be6d363..3fe00a8f85 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ Following are the changes made since forking from Yuzu: - Fixed crash when switching away from null graphics per-game - Fixed controller UI being cut off at the bottom - Removed analytics and authentication as they'd be useless (perhaps even outright dangerous) now + - Ported fixes from Sudachi and Suyu - Minor improvements and additions ## Goals