notsoyuzu
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4442 from lioncash/devicemem 

device_memory: Remove unused system member
This commit is contained in:
bunnei 2020-07-28 13:03:30 -07:00 committed by GitHub
parent 33d789524e 2258f33ee4
commit b205b12e75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/core.cpp
View File

@ -146,7 +146,7 @@ struct System::Impl {
ResultStatus Init(System& system, Frontend::EmuWindow& emu_window) { ResultStatus Init(System& system, Frontend::EmuWindow& emu_window) {
LOG_DEBUG(HW_Memory, "initialized OK"); LOG_DEBUG(HW_Memory, "initialized OK");
device_memory = std::make_unique<Core::DeviceMemory>(system); device_memory = std::make_unique<Core::DeviceMemory>();
is_multicore = Settings::values.use_multi_core.GetValue(); is_multicore = Settings::values.use_multi_core.GetValue();
is_async_gpu = is_multicore || Settings::values.use_asynchronous_gpu_emulation.GetValue(); is_async_gpu = is_multicore || Settings::values.use_asynchronous_gpu_emulation.GetValue();

5
src/core/device_memory.cpp
View File

@ -2,14 +2,11 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "core/core.h"
#include "core/device_memory.h" #include "core/device_memory.h"
#include "core/memory.h"
namespace Core { namespace Core {
DeviceMemory::DeviceMemory(System& system) : buffer{DramMemoryMap::Size}, system{system} {} DeviceMemory::DeviceMemory() : buffer{DramMemoryMap::Size} {}
DeviceMemory::~DeviceMemory() = default; DeviceMemory::~DeviceMemory() = default;
} // namespace Core } // namespace Core

8
src/core/device_memory.h
View File

@ -4,14 +4,11 @@
#pragma once #pragma once
#include "common/assert.h" #include "common/common_types.h"
#include "common/common_funcs.h"
#include "common/virtual_buffer.h" #include "common/virtual_buffer.h"
namespace Core { namespace Core {
class System;
namespace DramMemoryMap { namespace DramMemoryMap {
enum : u64 { enum : u64 {
Base = 0x80000000ULL, Base = 0x80000000ULL,
@ -26,7 +23,7 @@ enum : u64 {
class DeviceMemory : NonCopyable { class DeviceMemory : NonCopyable {
public: public:
explicit DeviceMemory(Core::System& system); explicit DeviceMemory();
~DeviceMemory(); ~DeviceMemory();
template <typename T> template <typename T>
@ -45,7 +42,6 @@ public:
private: private:
Common::VirtualBuffer<u8> buffer; Common::VirtualBuffer<u8> buffer;
Core::System& system;
}; };
} // namespace Core } // namespace Core