diff options
author | liamwhite <liamwhite@users.noreply.github.com> | 2023-11-06 18:07:50 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-06 18:07:50 +0100 |
commit | e7f41107913871a5a750761128b7ffd34f8fe5a6 (patch) | |
tree | 1a370a8251b1d75a8f4247abb1fd58f7f6d1eb45 /src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp | |
parent | Merge pull request #11972 from t895/fps-counter-adjustments (diff) | |
parent | nvdrv: rework to remove memcpy (diff) | |
download | yuzu-e7f41107913871a5a750761128b7ffd34f8fe5a6.tar yuzu-e7f41107913871a5a750761128b7ffd34f8fe5a6.tar.gz yuzu-e7f41107913871a5a750761128b7ffd34f8fe5a6.tar.bz2 yuzu-e7f41107913871a5a750761128b7ffd34f8fe5a6.tar.lz yuzu-e7f41107913871a5a750761128b7ffd34f8fe5a6.tar.xz yuzu-e7f41107913871a5a750761128b7ffd34f8fe5a6.tar.zst yuzu-e7f41107913871a5a750761128b7ffd34f8fe5a6.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp index a05c8cdae..9e6b86458 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvjpg.cpp @@ -5,6 +5,7 @@ #include "common/assert.h" #include "common/logging/log.h" +#include "core/hle/service/nvdrv/devices/ioctl_serialization.h" #include "core/hle/service/nvdrv/devices/nvhost_nvjpg.h" namespace Service::Nvidia::Devices { @@ -18,7 +19,7 @@ NvResult nvhost_nvjpg::Ioctl1(DeviceFD fd, Ioctl command, std::span<const u8> in case 'H': switch (command.cmd) { case 0x1: - return SetNVMAPfd(input, output); + return WrapFixed(this, &nvhost_nvjpg::SetNVMAPfd, input, output); default: break; } @@ -46,9 +47,7 @@ NvResult nvhost_nvjpg::Ioctl3(DeviceFD fd, Ioctl command, std::span<const u8> in void nvhost_nvjpg::OnOpen(DeviceFD fd) {} void nvhost_nvjpg::OnClose(DeviceFD fd) {} -NvResult nvhost_nvjpg::SetNVMAPfd(std::span<const u8> input, std::span<u8> output) { - IoctlSetNvmapFD params{}; - std::memcpy(¶ms, input.data(), input.size()); +NvResult nvhost_nvjpg::SetNVMAPfd(IoctlSetNvmapFD& params) { LOG_DEBUG(Service_NVDRV, "called, fd={}", params.nvmap_fd); nvmap_fd = params.nvmap_fd; |