diff options
| author | 2024-01-15 21:47:59 -0500 | |
|---|---|---|
| committer | 2024-01-18 21:12:30 -0500 | |
| commit | beb438bb0bede8b8906a41f7a1ad7b010ec3ec60 (patch) | |
| tree | 5a52c54369a0b1b553800ec915fb4c34b0c1f472 /src/core/hle/service/nvnflinger | |
| parent | Core: Invert guest memory depandancy (diff) | |
| download | yuzu-beb438bb0bede8b8906a41f7a1ad7b010ec3ec60.tar.gz yuzu-beb438bb0bede8b8906a41f7a1ad7b010ec3ec60.tar.xz yuzu-beb438bb0bede8b8906a41f7a1ad7b010ec3ec60.zip | |
nvdrv: use static typing for SessionId, smmu Asid types
Diffstat (limited to 'src/core/hle/service/nvnflinger')
| -rw-r--r-- | src/core/hle/service/nvnflinger/fb_share_buffer_manager.h | 3 | ||||
| -rw-r--r-- | src/core/hle/service/nvnflinger/nvnflinger.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/service/nvnflinger/fb_share_buffer_manager.h b/src/core/hle/service/nvnflinger/fb_share_buffer_manager.h index d2ec7a9b9..033bf4bbe 100644 --- a/src/core/hle/service/nvnflinger/fb_share_buffer_manager.h +++ b/src/core/hle/service/nvnflinger/fb_share_buffer_manager.h | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #pragma once | 4 | #pragma once |
| 5 | 5 | ||
| 6 | #include "common/math_util.h" | 6 | #include "common/math_util.h" |
| 7 | #include "core/hle/service/nvdrv/core/container.h" | ||
| 7 | #include "core/hle/service/nvdrv/nvdata.h" | 8 | #include "core/hle/service/nvdrv/nvdata.h" |
| 8 | #include "core/hle/service/nvnflinger/nvnflinger.h" | 9 | #include "core/hle/service/nvnflinger/nvnflinger.h" |
| 9 | #include "core/hle/service/nvnflinger/ui/fence.h" | 10 | #include "core/hle/service/nvnflinger/ui/fence.h" |
| @@ -55,7 +56,7 @@ private: | |||
| 55 | u32 m_buffer_nvmap_handle = 0; | 56 | u32 m_buffer_nvmap_handle = 0; |
| 56 | SharedMemoryPoolLayout m_pool_layout = {}; | 57 | SharedMemoryPoolLayout m_pool_layout = {}; |
| 57 | Nvidia::DeviceFD m_nvmap_fd = {}; | 58 | Nvidia::DeviceFD m_nvmap_fd = {}; |
| 58 | size_t m_session_id = {}; | 59 | Nvidia::NvCore::SessionId m_session_id = {}; |
| 59 | std::unique_ptr<Kernel::KPageGroup> m_buffer_page_group; | 60 | std::unique_ptr<Kernel::KPageGroup> m_buffer_page_group; |
| 60 | 61 | ||
| 61 | std::mutex m_guard; | 62 | std::mutex m_guard; |
diff --git a/src/core/hle/service/nvnflinger/nvnflinger.cpp b/src/core/hle/service/nvnflinger/nvnflinger.cpp index e4b38ae0b..423b9aef1 100644 --- a/src/core/hle/service/nvnflinger/nvnflinger.cpp +++ b/src/core/hle/service/nvnflinger/nvnflinger.cpp | |||
| @@ -126,7 +126,7 @@ void Nvnflinger::ShutdownLayers() { | |||
| 126 | 126 | ||
| 127 | void Nvnflinger::SetNVDrvInstance(std::shared_ptr<Nvidia::Module> instance) { | 127 | void Nvnflinger::SetNVDrvInstance(std::shared_ptr<Nvidia::Module> instance) { |
| 128 | nvdrv = std::move(instance); | 128 | nvdrv = std::move(instance); |
| 129 | disp_fd = nvdrv->Open("/dev/nvdisp_disp0", 0); | 129 | disp_fd = nvdrv->Open("/dev/nvdisp_disp0", {}); |
| 130 | } | 130 | } |
| 131 | 131 | ||
| 132 | std::optional<u64> Nvnflinger::OpenDisplay(std::string_view name) { | 132 | std::optional<u64> Nvnflinger::OpenDisplay(std::string_view name) { |