diff options
author | David Marcec <dmarcecguzman@gmail.com> | 2020-06-10 10:36:42 +0200 |
---|---|---|
committer | David Marcec <dmarcecguzman@gmail.com> | 2020-06-10 10:36:42 +0200 |
commit | b15cbf9bcf4e02f182abfd8ff84921f436b8c464 (patch) | |
tree | 2dc3903f9324717ac7edc92fec3f016ddaf5c548 /src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp | |
parent | Merge pull request #4027 from ReinUsesLisp/3d-slices (diff) | |
download | yuzu-b15cbf9bcf4e02f182abfd8ff84921f436b8c464.tar yuzu-b15cbf9bcf4e02f182abfd8ff84921f436b8c464.tar.gz yuzu-b15cbf9bcf4e02f182abfd8ff84921f436b8c464.tar.bz2 yuzu-b15cbf9bcf4e02f182abfd8ff84921f436b8c464.tar.lz yuzu-b15cbf9bcf4e02f182abfd8ff84921f436b8c464.tar.xz yuzu-b15cbf9bcf4e02f182abfd8ff84921f436b8c464.tar.zst yuzu-b15cbf9bcf4e02f182abfd8ff84921f436b8c464.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp index cc2192e5c..0d913334e 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.cpp @@ -25,7 +25,7 @@ u32 nvhost_ctrl_gpu::ioctl(Ioctl command, const std::vector<u8>& input, case IoctlCommand::IocGetCharacteristicsCommand: return GetCharacteristics(input, output, output2, version); case IoctlCommand::IocGetTPCMasksCommand: - return GetTPCMasks(input, output); + return GetTPCMasks(input, output, output2, version); case IoctlCommand::IocGetActiveSlotMaskCommand: return GetActiveSlotMask(input, output); case IoctlCommand::IocZcullGetCtxSizeCommand: @@ -98,17 +98,22 @@ u32 nvhost_ctrl_gpu::GetCharacteristics(const std::vector<u8>& input, std::vecto return 0; } -u32 nvhost_ctrl_gpu::GetTPCMasks(const std::vector<u8>& input, std::vector<u8>& output) { +u32 nvhost_ctrl_gpu::GetTPCMasks(const std::vector<u8>& input, std::vector<u8>& output, + std::vector<u8>& output2, IoctlVersion version) { IoctlGpuGetTpcMasksArgs params{}; std::memcpy(¶ms, input.data(), input.size()); - LOG_INFO(Service_NVDRV, "called, mask=0x{:X}, mask_buf_addr=0x{:X}", params.mask_buf_size, - params.mask_buf_addr); - // TODO(ogniK): Confirm value on hardware - if (params.mask_buf_size) - params.tpc_mask_size = 4 * 1; // 4 * num_gpc - else - params.tpc_mask_size = 0; - std::memcpy(output.data(), ¶ms, sizeof(params)); + LOG_DEBUG(Service_NVDRV, "called, mask_buffer_size=0x{:X}", params.mask_buffer_size); + if (params.mask_buffer_size != 0) { + params.tcp_mask = 3; + } + + if (version == IoctlVersion::Version3) { + std::memcpy(output.data(), input.data(), output.size()); + std::memcpy(output2.data(), ¶ms.tcp_mask, output2.size()); + } else { + std::memcpy(output.data(), ¶ms, output.size()); + } + return 0; } |