From 7d4f1ce5f98f87ef94800adbe3119054c477ba8f Mon Sep 17 00:00:00 2001 From: Alexandre Bouvier Date: Wed, 9 Oct 2024 06:28:09 +0000 Subject: [PATCH 1/2] fix some warnings (#1306) --- externals/CMakeLists.txt | 11 +++++++---- src/imgui/imgui_config.h | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index a528eaedb..e5733b981 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -3,7 +3,10 @@ set(BUILD_SHARED_LIBS OFF) set(BUILD_TESTING OFF) -set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL ON) +set_directory_properties(PROPERTIES + EXCLUDE_FROM_ALL ON + SYSTEM ON +) if (MSVC) # Silence "deprecation" warnings @@ -16,7 +19,7 @@ if (NOT TARGET Boost::headers) set(Boost_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/externals/ext-boost" CACHE STRING "") set(Boost_NO_SYSTEM_PATHS ON CACHE BOOL "") add_library(boost INTERFACE) - target_include_directories(boost SYSTEM INTERFACE ${Boost_INCLUDE_DIR}) + target_include_directories(boost INTERFACE ${Boost_INCLUDE_DIR}) add_library(Boost::headers ALIAS boost) endif() @@ -77,7 +80,7 @@ endif() # RenderDoc if (NOT TARGET RenderDoc::API) add_library(renderdoc INTERFACE) - target_include_directories(renderdoc SYSTEM INTERFACE ./renderdoc) + target_include_directories(renderdoc INTERFACE ./renderdoc) add_library(RenderDoc::API ALIAS renderdoc) endif() @@ -190,4 +193,4 @@ add_subdirectory(discord-rpc/) target_include_directories(discord-rpc INTERFACE discord-rpc/include) # GCN Headers -add_subdirectory(gcn) \ No newline at end of file +add_subdirectory(gcn) diff --git a/src/imgui/imgui_config.h b/src/imgui/imgui_config.h index 2094d56bc..66d2b25c1 100644 --- a/src/imgui/imgui_config.h +++ b/src/imgui/imgui_config.h @@ -29,4 +29,4 @@ extern void assert_fail_debug_msg(const char* msg); constexpr ImVec2(float _v) : x(_v), y(_v) {} #define IM_VEC4_CLASS_EXTRA \ - constexpr ImVec4(float _v) : x(_v), y(_v), z(_v), w(_v) {} \ No newline at end of file + constexpr ImVec4(float _v) : x(_v), y(_v), z(_v), w(_v) {} From 6fe26173dcb1e294560d58c099a60e1d249bb5fb Mon Sep 17 00:00:00 2001 From: voguelike <73729626+voguelike@users.noreply.github.com> Date: Wed, 9 Oct 2024 02:28:25 -0400 Subject: [PATCH 2/2] sophisticated fix for amd gpu + reshade instead of workaround (#1282) --- src/video_core/renderer_vulkan/vk_instance.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/video_core/renderer_vulkan/vk_instance.cpp b/src/video_core/renderer_vulkan/vk_instance.cpp index 7a1d784fa..3513f60d2 100644 --- a/src/video_core/renderer_vulkan/vk_instance.cpp +++ b/src/video_core/renderer_vulkan/vk_instance.cpp @@ -265,7 +265,9 @@ bool Instance::CreateDevice() { // These extensions are promoted by Vulkan 1.3, but for greater compatibility we use Vulkan 1.2 // with extensions. - tooling_info = add_extension(VK_EXT_TOOLING_INFO_EXTENSION_NAME); + if (Config ::vkValidationEnabled() || Config::isRdocEnabled()) { + tooling_info = add_extension(VK_EXT_TOOLING_INFO_EXTENSION_NAME); + } const bool maintenance4 = add_extension(VK_KHR_MAINTENANCE_4_EXTENSION_NAME); add_extension(VK_KHR_FORMAT_FEATURE_FLAGS_2_EXTENSION_NAME); add_extension(VK_KHR_DYNAMIC_RENDERING_EXTENSION_NAME);