diff options
author | ameerj <52414509+ameerj@users.noreply.github.com> | 2020-12-28 07:21:41 +0100 |
---|---|---|
committer | ameerj <52414509+ameerj@users.noreply.github.com> | 2021-01-07 20:33:45 +0100 |
commit | 06cef3355e415be83db3bc6d19b022de0b977580 (patch) | |
tree | e4252a544bf01586f651238a8a08c76bb2a3377f /src/core/hle/service | |
parent | nvdec syncpt incorporation (diff) | |
download | yuzu-06cef3355e415be83db3bc6d19b022de0b977580.tar yuzu-06cef3355e415be83db3bc6d19b022de0b977580.tar.gz yuzu-06cef3355e415be83db3bc6d19b022de0b977580.tar.bz2 yuzu-06cef3355e415be83db3bc6d19b022de0b977580.tar.lz yuzu-06cef3355e415be83db3bc6d19b022de0b977580.tar.xz yuzu-06cef3355e415be83db3bc6d19b022de0b977580.tar.zst yuzu-06cef3355e415be83db3bc6d19b022de0b977580.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp | 25 |
1 files changed, 14 insertions, 11 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 64370ad4c..4898dc27a 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_nvdec_common.cpp @@ -73,14 +73,15 @@ NvResult nvhost_nvdec_common::Submit(const std::vector<u8>& input, std::vector<u offset = SpliceVectors(input, wait_checks, params.syncpoint_count, offset); offset = SpliceVectors(input, fences, params.fence_count, offset); - for (std::size_t i = 0; i < syncpt_increments.size(); i++) { - SyncptIncr syncpt_incr = syncpt_increments[i]; - - fences[i].id = syncpt_incr.id; - fences[i].value = - syncpoint_manager.IncreaseSyncpoint(syncpt_incr.id, syncpt_incr.increments); - } auto& gpu = system.GPU(); + if (gpu.UseNvdec()) { + for (std::size_t i = 0; i < syncpt_increments.size(); i++) { + const SyncptIncr& syncpt_incr = syncpt_increments[i]; + fences[i].id = syncpt_incr.id; + fences[i].value = + syncpoint_manager.IncreaseSyncpoint(syncpt_incr.id, syncpt_incr.increments); + } + } for (const auto& cmd_buffer : command_buffers) { auto object = nvmap_dev->GetObject(cmd_buffer.memory_id); ASSERT_OR_EXECUTE(object, return NvResult::InvalidState;); @@ -95,11 +96,13 @@ NvResult nvhost_nvdec_common::Submit(const std::vector<u8>& input, std::vector<u cmdlist.size() * sizeof(u32)); gpu.PushCommandBuffer(cmdlist); } - fences[0].value = syncpoint_manager.IncreaseSyncpoint(fences[0].id, 1); + if (gpu.UseNvdec()) { - Tegra::ChCommandHeaderList cmdlist{{(4 << 28) | fences[0].id}}; - gpu.PushCommandBuffer(cmdlist); + fences[0].value = syncpoint_manager.IncreaseSyncpoint(fences[0].id, 1); + Tegra::ChCommandHeaderList cmdlist{{(4 << 28) | fences[0].id}}; + gpu.PushCommandBuffer(cmdlist); + } std::memcpy(output.data(), ¶ms, sizeof(IoctlSubmit)); // Some games expect command_buffers to be written back offset = sizeof(IoctlSubmit); @@ -118,7 +121,7 @@ NvResult nvhost_nvdec_common::GetSyncpoint(const std::vector<u8>& input, std::ve std::memcpy(¶ms, input.data(), sizeof(IoctlGetSyncpoint)); LOG_DEBUG(Service_NVDRV, "called GetSyncpoint, id={}", params.param); - if (device_syncpoints[params.param] == 0) { + if (device_syncpoints[params.param] == 0 && system.GPU().UseNvdec()) { device_syncpoints[params.param] = syncpoint_manager.AllocateSyncpoint(); } params.value = device_syncpoints[params.param]; |