diff options
| author | David Marcec <dmarcecguzman@gmail.com> | 2019-09-19 07:37:25 +0200 |
|---|---|---|
| committer | David Marcec <dmarcecguzman@gmail.com> | 2019-09-19 07:37:25 +0200 |
| commit | f9259c03832eff2d71279802af56d14c14b69844 (patch) | |
| tree | f45411a9f9421f047c58c7a89215daeefec26cfc /src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h | |
| parent | Merge pull request #2784 from ReinUsesLisp/smem (diff) | |
| download | yuzu-f9259c03832eff2d71279802af56d14c14b69844.tar yuzu-f9259c03832eff2d71279802af56d14c14b69844.tar.gz yuzu-f9259c03832eff2d71279802af56d14c14b69844.tar.bz2 yuzu-f9259c03832eff2d71279802af56d14c14b69844.tar.lz yuzu-f9259c03832eff2d71279802af56d14c14b69844.tar.xz yuzu-f9259c03832eff2d71279802af56d14c14b69844.tar.zst yuzu-f9259c03832eff2d71279802af56d14c14b69844.zip | |
Diffstat (limited to 'src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h')
| -rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h index 2b035ae3f..642b0a2cb 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h @@ -16,8 +16,9 @@ public: explicit nvhost_ctrl_gpu(Core::System& system); ~nvhost_ctrl_gpu() override; - u32 ioctl(Ioctl command, const std::vector<u8>& input, std::vector<u8>& output, - IoctlCtrl& ctrl) override; + u32 ioctl(Ioctl command, const std::vector<u8>& input, const std::vector<u8>& input2, + std::vector<u8>& output, std::vector<u8>& output2, IoctlCtrl& ctrl, + IoctlVersion version) override; private: enum class IoctlCommand : u32_le { @@ -162,7 +163,8 @@ private: }; static_assert(sizeof(IoctlGetGpuTime) == 8, "IoctlGetGpuTime is incorrect size"); - u32 GetCharacteristics(const std::vector<u8>& input, std::vector<u8>& output); + u32 GetCharacteristics(const std::vector<u8>& input, std::vector<u8>& output, + std::vector<u8>& output2, IoctlVersion version); u32 GetTPCMasks(const std::vector<u8>& input, std::vector<u8>& output); u32 GetActiveSlotMask(const std::vector<u8>& input, std::vector<u8>& output); u32 ZCullGetCtxSize(const std::vector<u8>& input, std::vector<u8>& output); |