From fabf2e7b725dbdb218018f06c0d18a88dc3ce00d Mon Sep 17 00:00:00 2001 From: lizzie Date: Mon, 9 Mar 2026 20:53:01 +0000 Subject: [PATCH 1/3] fuckery2 --- .../hle/service/nvdrv/devices/nvhost_nvdec_common.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp index f7d6c33f77..eb434ec986 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp @@ -103,17 +103,13 @@ NvResult nvhost_nvdec_common::Submit(IoctlSubmit& params, std::span data, De for (std::size_t i = 0; i < syncpt_increments.size(); i++) { const SyncptIncr& syncpt_incr = syncpt_increments[i]; - fence_thresholds[i] = - syncpoint_manager.IncrementSyncpointMaxExt(syncpt_incr.id, syncpt_incr.increments); + fence_thresholds[i] = syncpoint_manager.IncrementSyncpointMaxExt(syncpt_incr.id, syncpt_incr.increments); } for (const auto& cmd_buffer : command_buffers) { const auto object = nvmap.GetHandle(cmd_buffer.memory_id); ASSERT_OR_EXECUTE(object, return NvResult::InvalidState;); - Core::Memory::CpuGuestMemory - cmdlist(session->process->GetMemory(), object->address + cmd_buffer.offset, - cmd_buffer.word_count); + Core::Memory::CpuGuestMemory cmdlist(session->process->GetMemory(), object->get().address + cmd_buffer.offset, cmd_buffer.word_count); host1x.PushEntries(fd, std::move(cmdlist)); } From 902c457094fdd1b24aa7368ccf79dcf128f25b84 Mon Sep 17 00:00:00 2001 From: lizzie Date: Tue, 10 Mar 2026 02:22:27 +0000 Subject: [PATCH 2/3] Trigger Build From b85ada5d0f66cacafaa171069cd282f6c85bd08b Mon Sep 17 00:00:00 2001 From: lizzie Date: Tue, 10 Mar 2026 02:36:51 +0000 Subject: [PATCH 3/3] fixup the stupid boost map --- src/core/hle/service/nvdrv/core/nvmap.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/core/hle/service/nvdrv/core/nvmap.h b/src/core/hle/service/nvdrv/core/nvmap.h index 6173f0075d..c61ae88847 100644 --- a/src/core/hle/service/nvdrv/core/nvmap.h +++ b/src/core/hle/service/nvdrv/core/nvmap.h @@ -12,7 +12,11 @@ #include #include #include +#if BOOST_VERSION >= 109000 #include +#else +#include +#endif #include #include @@ -141,7 +145,12 @@ public: void UnmapAllHandles(NvCore::SessionId session_id); std::list unmap_queue{}; - boost::unordered_node_map handles{}; //!< Main owning map of handles + /// Main owning map of handles +#if BOOST_VERSION >= 109000 + boost::unordered_node_map handles{}; +#else + std::unordered_map handles{}; +#endif std::mutex unmap_queue_lock{}; //!< Protects access to `unmap_queue` std::mutex handles_lock; //!< Protects access to `handles` static constexpr u32 HandleIdIncrement{4}; //!< Each new handle ID is an increment of 4 from the previous