diff options
author | bunnei <bunneidev@gmail.com> | 2023-06-22 06:12:46 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-22 06:12:46 +0200 |
commit | e3122c5b468fd59b7eded5a3a7300643d05616bc (patch) | |
tree | 3fe4c2c0bea83f3bb8849ef8839b9520873d41c2 /src/audio_core/renderer/adsp | |
parent | Merge pull request #10777 from liamwhite/no-barrier (diff) | |
parent | nvdisp: Fix SingleCore frametime reporting (diff) | |
download | yuzu-e3122c5b468fd59b7eded5a3a7300643d05616bc.tar yuzu-e3122c5b468fd59b7eded5a3a7300643d05616bc.tar.gz yuzu-e3122c5b468fd59b7eded5a3a7300643d05616bc.tar.bz2 yuzu-e3122c5b468fd59b7eded5a3a7300643d05616bc.tar.lz yuzu-e3122c5b468fd59b7eded5a3a7300643d05616bc.tar.xz yuzu-e3122c5b468fd59b7eded5a3a7300643d05616bc.tar.zst yuzu-e3122c5b468fd59b7eded5a3a7300643d05616bc.zip |
Diffstat (limited to 'src/audio_core/renderer/adsp')
-rw-r--r-- | src/audio_core/renderer/adsp/adsp.cpp | 1 | ||||
-rw-r--r-- | src/audio_core/renderer/adsp/audio_renderer.cpp | 5 | ||||
-rw-r--r-- | src/audio_core/renderer/adsp/command_list_processor.cpp | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/src/audio_core/renderer/adsp/adsp.cpp b/src/audio_core/renderer/adsp/adsp.cpp index 74772fc50..b1db31e93 100644 --- a/src/audio_core/renderer/adsp/adsp.cpp +++ b/src/audio_core/renderer/adsp/adsp.cpp @@ -7,7 +7,6 @@ #include "common/logging/log.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/core_timing_util.h" #include "core/memory.h" namespace AudioCore::AudioRenderer::ADSP { diff --git a/src/audio_core/renderer/adsp/audio_renderer.cpp b/src/audio_core/renderer/adsp/audio_renderer.cpp index 8bc39f9f9..9ca716b60 100644 --- a/src/audio_core/renderer/adsp/audio_renderer.cpp +++ b/src/audio_core/renderer/adsp/audio_renderer.cpp @@ -13,7 +13,6 @@ #include "common/thread.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/core_timing_util.h" MICROPROFILE_DEFINE(Audio_Renderer, "Audio", "DSP", MP_RGB(60, 19, 97)); @@ -144,6 +143,7 @@ void AudioRenderer::ThreadFunc(std::stop_token stop_token) { mailbox->ADSPSendMessage(RenderMessage::AudioRenderer_InitializeOK); + // 0.12 seconds (2304000 / 19200000) constexpr u64 max_process_time{2'304'000ULL}; while (!stop_token.stop_requested()) { @@ -184,8 +184,7 @@ void AudioRenderer::ThreadFunc(std::stop_token stop_token) { u64 max_time{max_process_time}; if (index == 1 && command_buffer.applet_resource_user_id == mailbox->GetCommandBuffer(0).applet_resource_user_id) { - max_time = max_process_time - - Core::Timing::CyclesToNs(render_times_taken[0]).count(); + max_time = max_process_time - render_times_taken[0]; if (render_times_taken[0] > max_process_time) { max_time = 0; } diff --git a/src/audio_core/renderer/adsp/command_list_processor.cpp b/src/audio_core/renderer/adsp/command_list_processor.cpp index 7a300d216..3a0f1ae38 100644 --- a/src/audio_core/renderer/adsp/command_list_processor.cpp +++ b/src/audio_core/renderer/adsp/command_list_processor.cpp @@ -9,7 +9,6 @@ #include "common/settings.h" #include "core/core.h" #include "core/core_timing.h" -#include "core/core_timing_util.h" #include "core/memory.h" namespace AudioCore::AudioRenderer::ADSP { |