summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-07-28 22:03:30 +0200
committerGitHub <noreply@github.com>2020-07-28 22:03:30 +0200
commitb205b12e75961d70b8c92dff560cf6e6f9f869a7 (patch)
tree6feaf77a2213ab7e74bfd376f15921933825b8c4
parentMerge pull request #4446 from Morph1984/remove-30fps-hack (diff)
parentdevice_memory: Remove unused system member (diff)
downloadyuzu-b205b12e75961d70b8c92dff560cf6e6f9f869a7.tar
yuzu-b205b12e75961d70b8c92dff560cf6e6f9f869a7.tar.gz
yuzu-b205b12e75961d70b8c92dff560cf6e6f9f869a7.tar.bz2
yuzu-b205b12e75961d70b8c92dff560cf6e6f9f869a7.tar.lz
yuzu-b205b12e75961d70b8c92dff560cf6e6f9f869a7.tar.xz
yuzu-b205b12e75961d70b8c92dff560cf6e6f9f869a7.tar.zst
yuzu-b205b12e75961d70b8c92dff560cf6e6f9f869a7.zip
-rw-r--r--src/core/core.cpp2
-rw-r--r--src/core/device_memory.cpp5
-rw-r--r--src/core/device_memory.h8
3 files changed, 4 insertions, 11 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp
index e598c0e2b..42277e2cd 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -146,7 +146,7 @@ struct System::Impl {
ResultStatus Init(System& system, Frontend::EmuWindow& emu_window) {
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_async_gpu = is_multicore || Settings::values.use_asynchronous_gpu_emulation.GetValue();
diff --git a/src/core/device_memory.cpp b/src/core/device_memory.cpp
index 51097ced3..0c4b440ed 100644
--- a/src/core/device_memory.cpp
+++ b/src/core/device_memory.cpp
@@ -2,14 +2,11 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
-#include "core/core.h"
#include "core/device_memory.h"
-#include "core/memory.h"
namespace Core {
-DeviceMemory::DeviceMemory(System& system) : buffer{DramMemoryMap::Size}, system{system} {}
-
+DeviceMemory::DeviceMemory() : buffer{DramMemoryMap::Size} {}
DeviceMemory::~DeviceMemory() = default;
} // namespace Core
diff --git a/src/core/device_memory.h b/src/core/device_memory.h
index 9efa088d0..5b1ae28f3 100644
--- a/src/core/device_memory.h
+++ b/src/core/device_memory.h
@@ -4,14 +4,11 @@
#pragma once
-#include "common/assert.h"
-#include "common/common_funcs.h"
+#include "common/common_types.h"
#include "common/virtual_buffer.h"
namespace Core {
-class System;
-
namespace DramMemoryMap {
enum : u64 {
Base = 0x80000000ULL,
@@ -26,7 +23,7 @@ enum : u64 {
class DeviceMemory : NonCopyable {
public:
- explicit DeviceMemory(Core::System& system);
+ explicit DeviceMemory();
~DeviceMemory();
template <typename T>
@@ -45,7 +42,6 @@ public:
private:
Common::VirtualBuffer<u8> buffer;
- Core::System& system;
};
} // namespace Core