From 709443946a8a05875bb7d9c5137d91fb873e1b70 Mon Sep 17 00:00:00 2001 From: lizzie Date: Wed, 13 Aug 2025 19:25:05 +0200 Subject: [PATCH] [vk] fix line_topologies check (#248) Signed-off-by: lizzie Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/248 Reviewed-by: Shinmegumi Co-authored-by: lizzie Co-committed-by: lizzie --- boost-1.88.0-fix.patch | 24 ------------------- .../renderer_vulkan/vk_graphics_pipeline.cpp | 2 +- 2 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 boost-1.88.0-fix.patch diff --git a/boost-1.88.0-fix.patch b/boost-1.88.0-fix.patch deleted file mode 100644 index 0b6cbb983..000000000 --- a/boost-1.88.0-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN boost-src/libs/cobalt/include/boost/cobalt/concepts.hpp boost-src-patched/libs/cobalt/include/boost/cobalt/concepts.hpp ---- boost-src/libs/cobalt/include/boost/cobalt/concepts.hpp 2025-04-12 18:25:53.791233755 +0200 -+++ boost-src-patched/libs/cobalt/include/boost/cobalt/concepts.hpp 2025-04-12 18:29:50.304496166 +0200 -@@ -62,7 +62,7 @@ - template - concept with_get_executor = requires (T& t) - { -- {t.get_executor()} -> asio::execution::executor; -+ t.get_executor(); - }; - - -diff -ruN boost-src/libs/context/CMakeLists.txt boost-src-patched/libs/context/CMakeLists.txt ---- boost-src/libs/context/CMakeLists.txt 2025-04-12 18:25:53.847233801 +0200 -+++ boost-src-patched/libs/context/CMakeLists.txt 2025-04-12 18:29:33.436479899 +0200 -@@ -189,7 +189,7 @@ - - if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp") -- elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") -+ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT MSVC) - set_property(SOURCE ${ASM_SOURCES} APPEND PROPERTY COMPILE_OPTIONS "-Wno-unused-command-line-argument") - endif() - diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index ec6b3a4b0..ff062dbdc 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -90,7 +90,7 @@ bool IsLine(VkPrimitiveTopology topology) { VK_PRIMITIVE_TOPOLOGY_LINE_LIST, VK_PRIMITIVE_TOPOLOGY_LINE_STRIP, // VK_PRIMITIVE_TOPOLOGY_LINE_LOOP_EXT, }; - return std::ranges::find(line_topologies, topology) == line_topologies.end(); + return std::ranges::find(line_topologies, topology) != line_topologies.end(); } VkViewportSwizzleNV UnpackViewportSwizzle(u16 swizzle) {