diff options
author | bunnei <bunneidev@gmail.com> | 2020-05-01 11:59:47 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-01 11:59:47 -0400 |
commit | 3f4cabfd4d9de981c8f68b7e6832ebf1eea2f841 (patch) | |
tree | 2f9a3005fee0b63a81bc5c6d6365352e61d91d4e | |
parent | 3a13552db854036db4267ed21ce1e3f7f000568a (diff) | |
parent | d5a69ecb68969babcb69a8503d12e59756269c60 (diff) |
Merge pull request #3857 from ogniK5377/GetGpuTime-StackCorruption
nvdrv: Fix GetGpuTime stack corruption
-rw-r--r-- | src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h | 5 |
1 files changed, 3 insertions, 2 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 642b0a2cb..07b644ec5 100644 --- a/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h +++ b/src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h @@ -159,9 +159,10 @@ private: static_assert(sizeof(IoctlFlushL2) == 8, "IoctlFlushL2 is incorrect size"); struct IoctlGetGpuTime { - u64_le gpu_time; + u64_le gpu_time{}; + INSERT_PADDING_WORDS(2); }; - static_assert(sizeof(IoctlGetGpuTime) == 8, "IoctlGetGpuTime is incorrect size"); + static_assert(sizeof(IoctlGetGpuTime) == 0x10, "IoctlGetGpuTime is incorrect size"); u32 GetCharacteristics(const std::vector<u8>& input, std::vector<u8>& output, std::vector<u8>& output2, IoctlVersion version); |