VERY experimental Nintendo Switch 2 emulator
C++
Do not reset the command buffer command count each time
Kelebek14ef3915a8cc6
diff --git a/src/audio_core/adsp/apps/audio_renderer/audio_renderer.cpp b/src/audio_core/adsp/apps/audio_renderer/audio_renderer.cppindex 3da342ea3e..2e549bc6f5 100644--- a/src/audio_core/adsp/apps/audio_renderer/audio_renderer.cpp+++ b/src/audio_core/adsp/apps/audio_renderer/audio_renderer.cpp@@ -88,8 +88,13 @@ MailboxMessage AudioRenderer::Receive(Direction dir, bool block) {return mailbox.Receive(dir, block);}-void AudioRenderer::SetCommandBuffer(s32 session_id, CommandBuffer& buffer) noexcept {- command_buffers[session_id] = buffer;+void AudioRenderer::SetCommandBuffer(s32 session_id, CpuAddr buffer, u64 size, u64 time_limit,+ u64 applet_resource_user_id, bool reset) noexcept {+ command_buffers[session_id].buffer = buffer;+ command_buffers[session_id].size = size;+ command_buffers[session_id].time_limit = time_limit;+ command_buffers[session_id].applet_resource_user_id = applet_resource_user_id;+ command_buffers[session_id].reset_buffer = reset;}u32 AudioRenderer::GetRemainCommandCount(s32 session_id) const noexcept {diff --git a/src/audio_core/adsp/apps/audio_renderer/audio_renderer.h b/src/audio_core/adsp/apps/audio_renderer/audio_renderer.hindex b225e10fbf..3f5b7dca2a 100644--- a/src/audio_core/adsp/apps/audio_renderer/audio_renderer.h+++ b/src/audio_core/adsp/apps/audio_renderer/audio_renderer.h@@ -75,7 +75,8 @@ public:void Send(Direction dir, MailboxMessage message);MailboxMessage Receive(Direction dir, bool block = true);- void SetCommandBuffer(s32 session_id, CommandBuffer& buffer) noexcept;+ void SetCommandBuffer(s32 session_id, CpuAddr buffer, u64 size, u64 time_limit,+ u64 applet_resource_user_id, bool reset) noexcept;u32 GetRemainCommandCount(s32 session_id) const noexcept;void ClearRemainCommandCount(s32 session_id) noexcept;u64 GetRenderingStartTick(s32 session_id) const noexcept;diff --git a/src/audio_core/adsp/apps/audio_renderer/command_list_processor.cpp b/src/audio_core/adsp/apps/audio_renderer/command_list_processor.cppindex acbc9100c7..24e4d04962 100644--- a/src/audio_core/adsp/apps/audio_renderer/command_list_processor.cpp+++ b/src/audio_core/adsp/apps/audio_renderer/command_list_processor.cpp@@ -37,11 +37,6 @@ u32 CommandListProcessor::GetRemainingCommandCount() const {return command_count - processed_command_count;}-void CommandListProcessor::SetBuffer(const CpuAddr buffer, const u64 size) {- commands = reinterpret_cast<u8*>(buffer + sizeof(Renderer::CommandListHeader));- commands_buffer_size = size;-}-Sink::SinkStream* CommandListProcessor::GetOutputSinkStream() const {return stream;}diff --git a/src/audio_core/adsp/apps/audio_renderer/command_list_processor.h b/src/audio_core/adsp/apps/audio_renderer/command_list_processor.hindex 9d6fe18511..4e5fb793e9 100644--- a/src/audio_core/adsp/apps/audio_renderer/command_list_processor.h+++ b/src/audio_core/adsp/apps/audio_renderer/command_list_processor.h@@ -56,14 +56,6 @@ public:*/u32 GetRemainingCommandCount() const;- /**- * Set the command buffer.- *- * @param buffer - The buffer to use.- * @param size - The size of the buffer.- */- void SetBuffer(CpuAddr buffer, u64 size);-/*** Get the stream for this command list.*diff --git a/src/audio_core/renderer/system.cpp b/src/audio_core/renderer/system.cppindex 8f02754c52..d29754634e 100644--- a/src/audio_core/renderer/system.cpp+++ b/src/audio_core/renderer/system.cpp@@ -609,17 +609,11 @@ void System::SendCommandToDsp() {time_limit_percent = 70.0f;}- AudioRenderer::CommandBuffer command_buffer{- .buffer{translated_addr},- .size{command_size},- .time_limit{- static_cast<u64>((time_limit_percent / 100) * 2'880'000.0 *- (static_cast<f32>(render_time_limit_percent) / 100.0f))},- .applet_resource_user_id{applet_resource_user_id},- .reset_buffer{reset_command_buffers},- };-- audio_renderer.SetCommandBuffer(session_id, command_buffer);+ auto time_limit{+ static_cast<u64>((time_limit_percent / 100) * 2'880'000.0 *+ (static_cast<f32>(render_time_limit_percent) / 100.0f))};+ audio_renderer.SetCommandBuffer(session_id, translated_addr, command_size, time_limit,+ applet_resource_user_id, reset_command_buffers);reset_command_buffers = false;command_buffer_size = command_size;if (remaining_command_count == 0) {