diff options
author | bunnei <bunneidev@gmail.com> | 2021-12-08 03:38:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-08 03:38:14 +0100 |
commit | 815189eaf31c6fdeb7983d03d17ba3685b61f806 (patch) | |
tree | 340ac3f1c580dcc2560a2775b2014ae80259dd07 /src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp | |
parent | Merge pull request #7506 from heinermann/focus_crash (diff) | |
parent | Address feedback (diff) | |
download | yuzu-815189eaf31c6fdeb7983d03d17ba3685b61f806.tar yuzu-815189eaf31c6fdeb7983d03d17ba3685b61f806.tar.gz yuzu-815189eaf31c6fdeb7983d03d17ba3685b61f806.tar.bz2 yuzu-815189eaf31c6fdeb7983d03d17ba3685b61f806.tar.lz yuzu-815189eaf31c6fdeb7983d03d17ba3685b61f806.tar.xz yuzu-815189eaf31c6fdeb7983d03d17ba3685b61f806.tar.zst yuzu-815189eaf31c6fdeb7983d03d17ba3685b61f806.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp index 0d7d4ad03..8314d1ec2 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec.cpp @@ -20,8 +20,12 @@ NvResult nvhost_nvdec::Ioctl1(DeviceFD fd, Ioctl command, const std::vector<u8>& switch (command.group) { case 0x0: switch (command.cmd) { - case 0x1: - return Submit(input, output); + case 0x1: { + if (!fd_to_id.contains(fd)) { + fd_to_id[fd] = next_id++; + } + return Submit(fd, input, output); + } case 0x2: return GetSyncpoint(input, output); case 0x3: @@ -66,7 +70,10 @@ void nvhost_nvdec::OnOpen(DeviceFD fd) {} void nvhost_nvdec::OnClose(DeviceFD fd) { LOG_INFO(Service_NVDRV, "NVDEC video stream ended"); - system.GPU().ClearCdmaInstance(); + const auto iter = fd_to_id.find(fd); + if (iter != fd_to_id.end()) { + system.GPU().ClearCdmaInstance(iter->second); + } } } // namespace Service::Nvidia::Devices |