mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-28 23:57:18 +02:00
Merge pull request #9656 from liamwhite/nsight
nsight_aftermath_tracker: update for latest Aftermath SDK
This commit is contained in:
commit
9184b6ed2b
@ -57,7 +57,7 @@ NsightAftermathTracker::NsightAftermathTracker() {
|
|||||||
if (!GFSDK_Aftermath_SUCCEED(GFSDK_Aftermath_EnableGpuCrashDumps(
|
if (!GFSDK_Aftermath_SUCCEED(GFSDK_Aftermath_EnableGpuCrashDumps(
|
||||||
GFSDK_Aftermath_Version_API, GFSDK_Aftermath_GpuCrashDumpWatchedApiFlags_Vulkan,
|
GFSDK_Aftermath_Version_API, GFSDK_Aftermath_GpuCrashDumpWatchedApiFlags_Vulkan,
|
||||||
GFSDK_Aftermath_GpuCrashDumpFeatureFlags_Default, GpuCrashDumpCallback,
|
GFSDK_Aftermath_GpuCrashDumpFeatureFlags_Default, GpuCrashDumpCallback,
|
||||||
ShaderDebugInfoCallback, CrashDumpDescriptionCallback, this))) {
|
ShaderDebugInfoCallback, CrashDumpDescriptionCallback, nullptr, this))) {
|
||||||
LOG_ERROR(Render_Vulkan, "GFSDK_Aftermath_EnableGpuCrashDumps failed");
|
LOG_ERROR(Render_Vulkan, "GFSDK_Aftermath_EnableGpuCrashDumps failed");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@ -83,7 +83,7 @@ void NsightAftermathTracker::SaveShader(std::span<const u32> spirv) const {
|
|||||||
|
|
||||||
std::scoped_lock lock{mutex};
|
std::scoped_lock lock{mutex};
|
||||||
|
|
||||||
GFSDK_Aftermath_ShaderHash hash;
|
GFSDK_Aftermath_ShaderBinaryHash hash;
|
||||||
if (!GFSDK_Aftermath_SUCCEED(
|
if (!GFSDK_Aftermath_SUCCEED(
|
||||||
GFSDK_Aftermath_GetShaderHashSpirv(GFSDK_Aftermath_Version_API, &shader, &hash))) {
|
GFSDK_Aftermath_GetShaderHashSpirv(GFSDK_Aftermath_Version_API, &shader, &hash))) {
|
||||||
LOG_ERROR(Render_Vulkan, "Failed to hash SPIR-V module");
|
LOG_ERROR(Render_Vulkan, "Failed to hash SPIR-V module");
|
||||||
@ -121,8 +121,8 @@ void NsightAftermathTracker::OnGpuCrashDumpCallback(const void* gpu_crash_dump,
|
|||||||
u32 json_size = 0;
|
u32 json_size = 0;
|
||||||
if (!GFSDK_Aftermath_SUCCEED(GFSDK_Aftermath_GpuCrashDump_GenerateJSON(
|
if (!GFSDK_Aftermath_SUCCEED(GFSDK_Aftermath_GpuCrashDump_GenerateJSON(
|
||||||
decoder, GFSDK_Aftermath_GpuCrashDumpDecoderFlags_ALL_INFO,
|
decoder, GFSDK_Aftermath_GpuCrashDumpDecoderFlags_ALL_INFO,
|
||||||
GFSDK_Aftermath_GpuCrashDumpFormatterFlags_NONE, nullptr, nullptr, nullptr, nullptr,
|
GFSDK_Aftermath_GpuCrashDumpFormatterFlags_NONE, nullptr, nullptr, nullptr, this,
|
||||||
this, &json_size))) {
|
&json_size))) {
|
||||||
LOG_ERROR(Render_Vulkan, "Failed to generate JSON");
|
LOG_ERROR(Render_Vulkan, "Failed to generate JSON");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user