diff --git a/6c47b43a60d74e8e48de994b1d3a1ff7c6af7763.patch b/6c47b43a60d74e8e48de994b1d3a1ff7c6af7763.patch deleted file mode 100644 index d631bd8..0000000 --- a/6c47b43a60d74e8e48de994b1d3a1ff7c6af7763.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6c47b43a60d74e8e48de994b1d3a1ff7c6af7763 Mon Sep 17 00:00:00 2001 -From: Kelebek1 -Date: Wed, 27 Jul 2022 23:17:18 +0100 -Subject: [PATCH] Avoid depop out of bounds - ---- - src/audio_core/renderer/command/command_buffer.cpp | 2 +- - src/audio_core/renderer/command/mix/depop_prepare.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/audio_core/renderer/command/command_buffer.cpp b/src/audio_core/renderer/command/command_buffer.cpp -index 40074cf14ac..2ef879ee185 100644 ---- a/src/audio_core/renderer/command/command_buffer.cpp -+++ b/src/audio_core/renderer/command/command_buffer.cpp -@@ -339,7 +339,7 @@ void CommandBuffer::GenerateDepopPrepareCommand(const s32 node_id, const VoiceSt - cmd.previous_samples = memory_pool->Translate(CpuAddr(voice_state.previous_samples.data()), - MaxMixBuffers * sizeof(s32)); - cmd.buffer_count = buffer_count; -- cmd.depop_buffer = memory_pool->Translate(CpuAddr(buffer.data()), buffer_count * sizeof(s32)); -+ cmd.depop_buffer = memory_pool->Translate(CpuAddr(buffer.data()), buffer.size_bytes()); - - GenerateEnd(cmd); - } -diff --git a/src/audio_core/renderer/command/mix/depop_prepare.cpp b/src/audio_core/renderer/command/mix/depop_prepare.cpp -index 2ee076ef6b2..69bb78ccc80 100644 ---- a/src/audio_core/renderer/command/mix/depop_prepare.cpp -+++ b/src/audio_core/renderer/command/mix/depop_prepare.cpp -@@ -19,7 +19,7 @@ void DepopPrepareCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessor - - void DepopPrepareCommand::Process(const ADSP::CommandListProcessor& processor) { - auto samples{reinterpret_cast(previous_samples)}; -- auto buffer{std::span(reinterpret_cast(depop_buffer), buffer_count)}; -+ auto buffer{reinterpret_cast(depop_buffer)}; - - for (u32 i = 0; i < buffer_count; i++) { - if (samples[i]) { diff --git a/org.yuzu_emu.yuzu.json b/org.yuzu_emu.yuzu.json index 7448aff..cd39671 100644 --- a/org.yuzu_emu.yuzu.json +++ b/org.yuzu_emu.yuzu.json @@ -218,8 +218,8 @@ "-DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON", "-DYUZU_USE_QT_WEB_ENGINE=ON", "-DYUZU_USE_BUNDLED_FFMPEG=ON", - "-DDISPLAY_VERSION=1112", - "-DBUILD_TAG=mainline-1112", + "-DDISPLAY_VERSION=1113", + "-DBUILD_TAG=mainline-1113", "-DBUILD_REPOSITORY=yuzu-emu/yuzu-mainline" ], "build-options": { @@ -243,8 +243,8 @@ { "type": "git", "url": "https://github.com/yuzu-emu/yuzu-mainline.git", - "tag": "mainline-0-1112", - "commit": "2f23df9c89dd2767856ac134df9b324b8c4b5e8e", + "tag": "mainline-0-1113", + "commit": "ccb7a66221bf45993a969e9063d93b2effd2a36a", "disable-shallow-clone": true, "x-checker-data": { "type": "git", @@ -266,10 +266,6 @@ { "type": "file", "path": "compatibility_list.json" - }, - { - "type": "patch", - "path": "6c47b43a60d74e8e48de994b1d3a1ff7c6af7763.patch" } ] } diff --git a/org.yuzu_emu.yuzu.metainfo.xml b/org.yuzu_emu.yuzu.metainfo.xml index cfae6d1..ad4876e 100644 --- a/org.yuzu_emu.yuzu.metainfo.xml +++ b/org.yuzu_emu.yuzu.metainfo.xml @@ -47,6 +47,7 @@ https://raw.githubusercontent.com/yuzu-emu/yuzu-emu.github.io/master/images/screenshots/039-Pok%C3%A9mon%20Mystery%20Dungeon%20Rescue%20Team%20DX.png.png.png +