diff options
author | Subv <subv2112@gmail.com> | 2018-02-12 03:30:23 +0100 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2018-02-12 03:30:23 +0100 |
commit | ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d (patch) | |
tree | d8a35877596beef256e3991653d28c454f8ad0a8 /src/core/hle/service/nvdrv/devices | |
parent | Merge pull request #175 from bunnei/libnx-fixes-2 (diff) | |
download | yuzu-ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d.tar yuzu-ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d.tar.gz yuzu-ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d.tar.bz2 yuzu-ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d.tar.lz yuzu-ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d.tar.xz yuzu-ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d.tar.zst yuzu-ba2426aa3f9b433b54e43e5dae3c596e6f3ae45d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h | 5 | ||||
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_gpu.h | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h index 9d37b971a..44ffddcd9 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_as_gpu.h @@ -20,9 +20,8 @@ class nvmap; class nvhost_as_gpu final : public nvdevice { public: - nvhost_as_gpu(std::shared_ptr<nvmap> nvmap_dev) : nvdevice(), nvmap_dev(std::move(nvmap_dev)) { - memory_manager = std::make_shared<MemoryManager>(); - } + nvhost_as_gpu(std::shared_ptr<nvmap> nvmap_dev, std::shared_ptr<MemoryManager> memory_manager) + : nvdevice(), nvmap_dev(std::move(nvmap_dev)), memory_manager(std::move(memory_manager)) {} ~nvhost_as_gpu() override = default; u32 ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) override; diff --git a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h index 4fe2c9ad5..5b40eaa88 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_gpu.h @@ -4,20 +4,25 @@ #pragma once +#include <memory> #include <vector> #include "common/common_types.h" #include "common/swap.h" #include "core/hle/service/nvdrv/devices/nvdevice.h" +#include "core/hle/service/nvdrv/memory_manager.h" namespace Service { namespace Nvidia { namespace Devices { + +class nvmap; constexpr u32 NVGPU_IOCTL_MAGIC('H'); constexpr u32 NVGPU_IOCTL_CHANNEL_SUBMIT_GPFIFO(0x8); class nvhost_gpu final : public nvdevice { public: - nvhost_gpu() = default; + nvhost_gpu(std::shared_ptr<nvmap> nvmap_dev, std::shared_ptr<MemoryManager> memory_manager) + : nvdevice(), nvmap_dev(std::move(nvmap_dev)), memory_manager(std::move(memory_manager)) {} ~nvhost_gpu() override = default; u32 ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output) override; @@ -132,6 +137,9 @@ private: u32 AllocGPFIFOEx2(const std::vector<u8>& input, std::vector<u8>& output); u32 AllocateObjectContext(const std::vector<u8>& input, std::vector<u8>& output); u32 SubmitGPFIFO(const std::vector<u8>& input, std::vector<u8>& output); + + std::shared_ptr<nvmap> nvmap_dev; + std::shared_ptr<MemoryManager> memory_manager; }; } // namespace Devices |