VERY experimental Nintendo Switch 2 emulator
C++
NvHostChannels: improve hack for supporting multiple channels.
Fernando Sahmkow340398daf541
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cppindex fe83423d53..2ec1ad3e9e 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp@@ -47,15 +47,21 @@ std::size_t WriteVectors(std::vector<u8>& dst, const std::vector<T>& src, std::s} // Anonymous namespacestd::unordered_map<DeviceFD, u32> nvhost_nvdec_common::fd_to_id{};+std::deque<u32> nvhost_nvdec_common::syncpts_accumulated{};nvhost_nvdec_common::nvhost_nvdec_common(Core::System& system_, NvCore::Container& core_,NvCore::ChannelType channel_type_): nvdevice{system_}, core{core_}, syncpoint_manager{core.GetSyncpointManager()},nvmap{core.GetNvMapFile()}, channel_type{channel_type_} {- channel_syncpoint = syncpoint_manager.AllocateSyncpoint(false);+ if (syncpts_accumulated.empty()) {+ channel_syncpoint = syncpoint_manager.AllocateSyncpoint(false);+ } else {+ channel_syncpoint = syncpts_accumulated.front();+ syncpts_accumulated.pop_front();+ }}nvhost_nvdec_common::~nvhost_nvdec_common() {- syncpoint_manager.FreeSyncpoint(channel_syncpoint);+ syncpts_accumulated.push_back(channel_syncpoint);}NvResult nvhost_nvdec_common::SetNVMAPfd(const std::vector<u8>& input) {diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.hindex 4046b0e13f..93990bb9b8 100644--- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h+++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.h@@ -3,6 +3,7 @@#pragma once+#include <deque>#include <vector>#include "common/common_types.h"#include "common/swap.h"@@ -127,6 +128,8 @@ protected:NvCore::NvMap& nvmap;NvCore::ChannelType channel_type;std::array<u32, MaxSyncPoints> device_syncpoints{};++ static std::deque<u32> syncpts_accumulated;};}; // namespace Devices} // namespace Service::Nvidia