diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2022-12-06 17:26:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-06 17:26:38 +0100 |
commit | a86af1b776fadb4d5804ef2c1fb74e0c197cc51d (patch) | |
tree | 86973b1879caef999ac9f1d413b48538e2644542 /src/core/hle/kernel/k_memory_block_manager.h | |
parent | Merge pull request #9395 from abouvier/cmake-find (diff) | |
parent | kernel/k_shared_memory: Ensure device_memory is always initialized (diff) | |
download | yuzu-a86af1b776fadb4d5804ef2c1fb74e0c197cc51d.tar yuzu-a86af1b776fadb4d5804ef2c1fb74e0c197cc51d.tar.gz yuzu-a86af1b776fadb4d5804ef2c1fb74e0c197cc51d.tar.bz2 yuzu-a86af1b776fadb4d5804ef2c1fb74e0c197cc51d.tar.lz yuzu-a86af1b776fadb4d5804ef2c1fb74e0c197cc51d.tar.xz yuzu-a86af1b776fadb4d5804ef2c1fb74e0c197cc51d.tar.zst yuzu-a86af1b776fadb4d5804ef2c1fb74e0c197cc51d.zip |
Diffstat (limited to 'src/core/hle/kernel/k_memory_block_manager.h')
-rw-r--r-- | src/core/hle/kernel/k_memory_block_manager.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/kernel/k_memory_block_manager.h b/src/core/hle/kernel/k_memory_block_manager.h index 9b5873883..d382722a6 100644 --- a/src/core/hle/kernel/k_memory_block_manager.h +++ b/src/core/hle/kernel/k_memory_block_manager.h @@ -3,6 +3,7 @@ #pragma once +#include <array> #include <functional> #include "common/common_funcs.h" @@ -17,9 +18,9 @@ public: static constexpr size_t MaxBlocks = 2; private: - KMemoryBlock* m_blocks[MaxBlocks]; - size_t m_index; - KMemoryBlockSlabManager* m_slab_manager; + std::array<KMemoryBlock*, MaxBlocks> m_blocks{}; + size_t m_index{MaxBlocks}; + KMemoryBlockSlabManager* m_slab_manager{}; private: Result Initialize(size_t num_blocks) { @@ -41,7 +42,7 @@ private: public: KMemoryBlockManagerUpdateAllocator(Result* out_result, KMemoryBlockSlabManager* sm, size_t num_blocks = MaxBlocks) - : m_blocks(), m_index(MaxBlocks), m_slab_manager(sm) { + : m_slab_manager(sm) { *out_result = this->Initialize(num_blocks); } |