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

nsight_aftermath_tracker: Fix build issues when enabled 

Fixes a bunch of build errors when Nsight Aftermath is properly enabled.
This commit is contained in:
ReinUsesLisp 2021-01-23 04:13:37 -03:00
parent 302a5f00e8
commit 625a011888
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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 {