diff options
| author | 2023-03-23 19:58:48 -0400 | |
|---|---|---|
| committer | 2023-03-23 20:28:47 -0400 | |
| commit | 41d99aa89db7ee483112e49baa6c86e14adbd168 (patch) | |
| tree | 085ba1f2eb6a75c2b93d70834cc20d4b14f4d10f /src/audio_core/renderer | |
| parent | Merge pull request #9971 from Morph1984/q (diff) | |
| download | yuzu-41d99aa89db7ee483112e49baa6c86e14adbd168.tar.gz yuzu-41d99aa89db7ee483112e49baa6c86e14adbd168.tar.xz yuzu-41d99aa89db7ee483112e49baa6c86e14adbd168.zip | |
memory: rename global memory references to application memory
Diffstat (limited to 'src/audio_core/renderer')
| -rw-r--r-- | src/audio_core/renderer/adsp/adsp.cpp | 2 | ||||
| -rw-r--r-- | src/audio_core/renderer/adsp/command_list_processor.cpp | 2 | ||||
| -rw-r--r-- | src/audio_core/renderer/system.cpp | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/audio_core/renderer/adsp/adsp.cpp b/src/audio_core/renderer/adsp/adsp.cpp index a28395663..74772fc50 100644 --- a/src/audio_core/renderer/adsp/adsp.cpp +++ b/src/audio_core/renderer/adsp/adsp.cpp | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | namespace AudioCore::AudioRenderer::ADSP { | 13 | namespace AudioCore::AudioRenderer::ADSP { |
| 14 | 14 | ||
| 15 | ADSP::ADSP(Core::System& system_, Sink::Sink& sink_) | 15 | ADSP::ADSP(Core::System& system_, Sink::Sink& sink_) |
| 16 | : system{system_}, memory{system.Memory()}, sink{sink_} {} | 16 | : system{system_}, memory{system.ApplicationMemory()}, sink{sink_} {} |
| 17 | 17 | ||
| 18 | ADSP::~ADSP() { | 18 | ADSP::~ADSP() { |
| 19 | ClearCommandBuffers(); | 19 | ClearCommandBuffers(); |
diff --git a/src/audio_core/renderer/adsp/command_list_processor.cpp b/src/audio_core/renderer/adsp/command_list_processor.cpp index e3bf2d7ec..7a300d216 100644 --- a/src/audio_core/renderer/adsp/command_list_processor.cpp +++ b/src/audio_core/renderer/adsp/command_list_processor.cpp | |||
| @@ -17,7 +17,7 @@ namespace AudioCore::AudioRenderer::ADSP { | |||
| 17 | void CommandListProcessor::Initialize(Core::System& system_, CpuAddr buffer, u64 size, | 17 | void CommandListProcessor::Initialize(Core::System& system_, CpuAddr buffer, u64 size, |
| 18 | Sink::SinkStream* stream_) { | 18 | Sink::SinkStream* stream_) { |
| 19 | system = &system_; | 19 | system = &system_; |
| 20 | memory = &system->Memory(); | 20 | memory = &system->ApplicationMemory(); |
| 21 | stream = stream_; | 21 | stream = stream_; |
| 22 | header = reinterpret_cast<CommandListHeader*>(buffer); | 22 | header = reinterpret_cast<CommandListHeader*>(buffer); |
| 23 | commands = reinterpret_cast<u8*>(buffer + sizeof(CommandListHeader)); | 23 | commands = reinterpret_cast<u8*>(buffer + sizeof(CommandListHeader)); |
diff --git a/src/audio_core/renderer/system.cpp b/src/audio_core/renderer/system.cpp index 28f063641..ad869facb 100644 --- a/src/audio_core/renderer/system.cpp +++ b/src/audio_core/renderer/system.cpp | |||
| @@ -127,8 +127,7 @@ Result System::Initialize(const AudioRendererParameterInternal& params, | |||
| 127 | render_device = params.rendering_device; | 127 | render_device = params.rendering_device; |
| 128 | execution_mode = params.execution_mode; | 128 | execution_mode = params.execution_mode; |
| 129 | 129 | ||
| 130 | core.Memory().ZeroBlock(*core.ApplicationProcess(), transfer_memory->GetSourceAddress(), | 130 | core.ApplicationMemory().ZeroBlock(transfer_memory->GetSourceAddress(), transfer_memory_size); |
| 131 | transfer_memory_size); | ||
| 132 | 131 | ||
| 133 | // Note: We're not actually using the transfer memory because it's a pain to code for. | 132 | // Note: We're not actually using the transfer memory because it's a pain to code for. |
| 134 | // Allocate the memory normally instead and hope the game doesn't try to read anything back | 133 | // Allocate the memory normally instead and hope the game doesn't try to read anything back |