diff options
author | Liam <byteslice@airmail.cc> | 2024-01-16 03:47:59 +0100 |
---|---|---|
committer | Liam <byteslice@airmail.cc> | 2024-01-19 03:12:30 +0100 |
commit | beb438bb0bede8b8906a41f7a1ad7b010ec3ec60 (patch) | |
tree | 5a52c54369a0b1b553800ec915fb4c34b0c1f472 /src/core/hle/service/nvnflinger | |
parent | Core: Invert guest memory depandancy (diff) | |
download | yuzu-beb438bb0bede8b8906a41f7a1ad7b010ec3ec60.tar yuzu-beb438bb0bede8b8906a41f7a1ad7b010ec3ec60.tar.gz yuzu-beb438bb0bede8b8906a41f7a1ad7b010ec3ec60.tar.bz2 yuzu-beb438bb0bede8b8906a41f7a1ad7b010ec3ec60.tar.lz yuzu-beb438bb0bede8b8906a41f7a1ad7b010ec3ec60.tar.xz yuzu-beb438bb0bede8b8906a41f7a1ad7b010ec3ec60.tar.zst yuzu-beb438bb0bede8b8906a41f7a1ad7b010ec3ec60.zip |
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 @@ #pragma once #include "common/math_util.h" +#include "core/hle/service/nvdrv/core/container.h" #include "core/hle/service/nvdrv/nvdata.h" #include "core/hle/service/nvnflinger/nvnflinger.h" #include "core/hle/service/nvnflinger/ui/fence.h" @@ -55,7 +56,7 @@ private: u32 m_buffer_nvmap_handle = 0; SharedMemoryPoolLayout m_pool_layout = {}; Nvidia::DeviceFD m_nvmap_fd = {}; - size_t m_session_id = {}; + Nvidia::NvCore::SessionId m_session_id = {}; std::unique_ptr<Kernel::KPageGroup> m_buffer_page_group; 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() { void Nvnflinger::SetNVDrvInstance(std::shared_ptr<Nvidia::Module> instance) { nvdrv = std::move(instance); - disp_fd = nvdrv->Open("/dev/nvdisp_disp0", 0); + disp_fd = nvdrv->Open("/dev/nvdisp_disp0", {}); } std::optional<u64> Nvnflinger::OpenDisplay(std::string_view name) { |