yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

Merge pull request #5797 from ReinUsesLisp/nsight-aftermath-build 

nsight_aftermath_tracker: Fix build issues when enabled
This commit is contained in:
LC 2021-01-23 05:40:50 -05:00 committed by GitHub
parent 12355cbf02 966896daad
commit 65f821850e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/video_core/CMakeLists.txt
View File

@ -288,10 +288,10 @@ target_link_libraries(video_core PRIVATE sirit)
if (ENABLE_NSIGHT_AFTERMATH) if (ENABLE_NSIGHT_AFTERMATH)
if (NOT DEFINED ENV{NSIGHT_AFTERMATH_SDK}) if (NOT DEFINED ENV{NSIGHT_AFTERMATH_SDK})
message(ERROR "Environment variable NSIGHT_AFTERMATH_SDK has to be provided") message(FATAL_ERROR "Environment variable NSIGHT_AFTERMATH_SDK has to be provided")
endif() endif()
if (NOT WIN32) if (NOT WIN32)
message(ERROR "Nsight Aftermath doesn't support non-Windows platforms") message(FATAL_ERROR "Nsight Aftermath doesn't support non-Windows platforms")
endif() endif()
target_compile_definitions(video_core PRIVATE HAS_NSIGHT_AFTERMATH) target_compile_definitions(video_core PRIVATE HAS_NSIGHT_AFTERMATH)
target_include_directories(video_core PRIVATE "$ENV{NSIGHT_AFTERMATH_SDK}/include") target_include_directories(video_core PRIVATE "$ENV{NSIGHT_AFTERMATH_SDK}/include")

13
src/video_core/vulkan_common/nsight_aftermath_tracker.cpp
View File

@ -12,21 +12,12 @@
#include <fmt/format.h> #include <fmt/format.h>
#define VK_NO_PROTOTYPES
#include <vulkan/vulkan.h>
#include <GFSDK_Aftermath.h>
#include <GFSDK_Aftermath_Defines.h>
#include <GFSDK_Aftermath_GpuCrashDump.h>
#include <GFSDK_Aftermath_GpuCrashDumpDecoding.h>
#include "common/common_paths.h" #include "common/common_paths.h"
#include "common/common_types.h" #include "common/common_types.h"
#include "common/file_util.h" #include "common/file_util.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/scope_exit.h" #include "common/scope_exit.h"
#include "video_core/vulkan_common/nsight_aftermath_tracker.h"
#include "video_core/renderer_vulkan/nsight_aftermath_tracker.h"
namespace Vulkan { namespace Vulkan {
@ -53,7 +44,7 @@ NsightAftermathTracker::NsightAftermathTracker() {
!dl.GetSymbol("GFSDK_Aftermath_GpuCrashDump_GetJSON", !dl.GetSymbol("GFSDK_Aftermath_GpuCrashDump_GetJSON",
&GFSDK_Aftermath_GpuCrashDump_GetJSON)) { &GFSDK_Aftermath_GpuCrashDump_GetJSON)) {
LOG_ERROR(Render_Vulkan, "Failed to load Nsight Aftermath function pointers"); LOG_ERROR(Render_Vulkan, "Failed to load Nsight Aftermath function pointers");
return false; return;
} }
dump_dir = Common::FS::GetUserPath(Common::FS::UserPath::LogDir) + "gpucrash"; dump_dir = Common::FS::GetUserPath(Common::FS::UserPath::LogDir) + "gpucrash";

8
src/video_core/vulkan_common/nsight_aftermath_tracker.h
View File

@ -8,8 +8,9 @@
#include <string> #include <string>
#include <vector> #include <vector>
#define VK_NO_PROTOTYPES #include "common/common_types.h"
#include <vulkan/vulkan.h> #include "common/dynamic_library.h"
#include "video_core/vulkan_common/vulkan_wrapper.h"
#ifdef HAS_NSIGHT_AFTERMATH #ifdef HAS_NSIGHT_AFTERMATH
#include <GFSDK_Aftermath_Defines.h> #include <GFSDK_Aftermath_Defines.h>
@ -17,9 +18,6 @@
#include <GFSDK_Aftermath_GpuCrashDumpDecoding.h> #include <GFSDK_Aftermath_GpuCrashDumpDecoding.h>
#endif #endif
#include "common/common_types.h"
#include "common/dynamic_library.h"
namespace Vulkan { namespace Vulkan {
class NsightAftermathTracker { class NsightAftermathTracker {