diff options
| author | ReinUsesLisp <reinuseslisp@airmail.cc> | 2021-01-23 08:13:37 +0100 |
|---|---|---|
| committer | ReinUsesLisp <reinuseslisp@airmail.cc> | 2021-01-23 08:13:39 +0100 |
| commit | 625a01188831ddaad2affc218cbf901c524b091e (patch) | |
| tree | ec9aba9f26e3a7c963c2add354d0a2e2f414d6aa | |
| parent | Merge pull request #4713 from behunin/int-flags (diff) | |
| download | yuzu-625a01188831ddaad2affc218cbf901c524b091e.tar yuzu-625a01188831ddaad2affc218cbf901c524b091e.tar.gz yuzu-625a01188831ddaad2affc218cbf901c524b091e.tar.bz2 yuzu-625a01188831ddaad2affc218cbf901c524b091e.tar.lz yuzu-625a01188831ddaad2affc218cbf901c524b091e.tar.xz yuzu-625a01188831ddaad2affc218cbf901c524b091e.tar.zst yuzu-625a01188831ddaad2affc218cbf901c524b091e.zip | |
| -rw-r--r-- | src/video_core/vulkan_common/nsight_aftermath_tracker.cpp | 13 | ||||
| -rw-r--r-- | src/video_core/vulkan_common/nsight_aftermath_tracker.h | 8 |
2 files changed, 5 insertions, 16 deletions
diff --git a/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp b/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp index 8d10ac29e..7a9d00d4f 100644 --- a/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp +++ b/src/video_core/vulkan_common/nsight_aftermath_tracker.cpp @@ -12,21 +12,12 @@ #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_types.h" #include "common/file_util.h" #include "common/logging/log.h" #include "common/scope_exit.h" - -#include "video_core/renderer_vulkan/nsight_aftermath_tracker.h" +#include "video_core/vulkan_common/nsight_aftermath_tracker.h" namespace Vulkan { @@ -53,7 +44,7 @@ NsightAftermathTracker::NsightAftermathTracker() { !dl.GetSymbol("GFSDK_Aftermath_GpuCrashDump_GetJSON", &GFSDK_Aftermath_GpuCrashDump_GetJSON)) { LOG_ERROR(Render_Vulkan, "Failed to load Nsight Aftermath function pointers"); - return false; + return; } dump_dir = Common::FS::GetUserPath(Common::FS::UserPath::LogDir) + "gpucrash"; diff --git a/src/video_core/vulkan_common/nsight_aftermath_tracker.h b/src/video_core/vulkan_common/nsight_aftermath_tracker.h index cee3847fb..1ce8d4e8e 100644 --- a/src/video_core/vulkan_common/nsight_aftermath_tracker.h +++ b/src/video_core/vulkan_common/nsight_aftermath_tracker.h @@ -8,8 +8,9 @@ #include <string> #include <vector> -#define VK_NO_PROTOTYPES -#include <vulkan/vulkan.h> +#include "common/common_types.h" +#include "common/dynamic_library.h" +#include "video_core/vulkan_common/vulkan_wrapper.h" #ifdef HAS_NSIGHT_AFTERMATH #include <GFSDK_Aftermath_Defines.h> @@ -17,9 +18,6 @@ #include <GFSDK_Aftermath_GpuCrashDumpDecoding.h> #endif -#include "common/common_types.h" -#include "common/dynamic_library.h" - namespace Vulkan { class NsightAftermathTracker { |