diff options
| author | 2018-07-12 19:12:47 -0700 | |
|---|---|---|
| committer | 2018-07-12 19:12:47 -0700 | |
| commit | ce23ae3edec94b4e28632c953449241b1a2c321e (patch) | |
| tree | 86493754ac94f58f67fba93b0f402407806dcfc9 /src | |
| parent | Merge pull request #655 from bunnei/pred-lt-nan (diff) | |
| parent | We only need to alert for memory pool changes (diff) | |
| download | yuzu-ce23ae3edec94b4e28632c953449241b1a2c321e.tar.gz yuzu-ce23ae3edec94b4e28632c953449241b1a2c321e.tar.xz yuzu-ce23ae3edec94b4e28632c953449241b1a2c321e.zip | |
Merge pull request #656 from ogniK5377/audren-mem-init
Initialized memory for RequestUpdateAudioRenderer and fixed MemoryPoolSection to be more accurate
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/hle/service/audio/audren_u.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/audio/audren_u.cpp b/src/core/hle/service/audio/audren_u.cpp index 2da936b27..b7f591c6d 100644 --- a/src/core/hle/service/audio/audren_u.cpp +++ b/src/core/hle/service/audio/audren_u.cpp | |||
| @@ -47,7 +47,7 @@ public: | |||
| 47 | 47 | ||
| 48 | // Start the audio event | 48 | // Start the audio event |
| 49 | CoreTiming::ScheduleEvent(audio_ticks, audio_event); | 49 | CoreTiming::ScheduleEvent(audio_ticks, audio_event); |
| 50 | voice_status_list.reserve(worker_params.voice_count); | 50 | voice_status_list.resize(worker_params.voice_count); |
| 51 | } | 51 | } |
| 52 | ~IAudioRenderer() { | 52 | ~IAudioRenderer() { |
| 53 | CoreTiming::UnscheduleEvent(audio_event, 0); | 53 | CoreTiming::UnscheduleEvent(audio_event, 0); |
| @@ -87,8 +87,6 @@ private: | |||
| 87 | memory_pool[i].state = MemoryPoolStates::Attached; | 87 | memory_pool[i].state = MemoryPoolStates::Attached; |
| 88 | else if (mem_pool_info[i].pool_state == MemoryPoolStates::RequestDetach) | 88 | else if (mem_pool_info[i].pool_state == MemoryPoolStates::RequestDetach) |
| 89 | memory_pool[i].state = MemoryPoolStates::Detached; | 89 | memory_pool[i].state = MemoryPoolStates::Detached; |
| 90 | else | ||
| 91 | memory_pool[i].state = mem_pool_info[i].pool_state; | ||
| 92 | } | 90 | } |
| 93 | std::memcpy(output.data() + sizeof(UpdateDataHeader), memory_pool.data(), | 91 | std::memcpy(output.data() + sizeof(UpdateDataHeader), memory_pool.data(), |
| 94 | response_data.memory_pools_size); | 92 | response_data.memory_pools_size); |
| @@ -183,7 +181,9 @@ private: | |||
| 183 | behavior_size = 0xb0; | 181 | behavior_size = 0xb0; |
| 184 | memory_pools_size = (config.effect_count + (config.voice_count * 4)) * 0x10; | 182 | memory_pools_size = (config.effect_count + (config.voice_count * 4)) * 0x10; |
| 185 | voices_size = config.voice_count * 0x10; | 183 | voices_size = config.voice_count * 0x10; |
| 184 | voice_resource_size = 0x0; | ||
| 186 | effects_size = config.effect_count * 0x10; | 185 | effects_size = config.effect_count * 0x10; |
| 186 | mixes_size = 0x0; | ||
| 187 | sinks_size = config.sink_count * 0x20; | 187 | sinks_size = config.sink_count * 0x20; |
| 188 | performance_manager_size = 0x10; | 188 | performance_manager_size = 0x10; |
| 189 | total_size = sizeof(UpdateDataHeader) + behavior_size + memory_pools_size + | 189 | total_size = sizeof(UpdateDataHeader) + behavior_size + memory_pools_size + |