diff options
| author | 2020-05-01 11:59:47 -0400 | |
|---|---|---|
| committer | 2020-05-01 11:59:47 -0400 | |
| commit | 3f4cabfd4d9de981c8f68b7e6832ebf1eea2f841 (patch) | |
| tree | 2f9a3005fee0b63a81bc5c6d6365352e61d91d4e /src | |
| parent | Merge pull request #3827 from ogniK5377/cubeb-616d773 (diff) | |
| parent | nvdrv: Fix GetGpuTime stack corruption (diff) | |
| download | yuzu-3f4cabfd4d9de981c8f68b7e6832ebf1eea2f841.tar.gz yuzu-3f4cabfd4d9de981c8f68b7e6832ebf1eea2f841.tar.xz yuzu-3f4cabfd4d9de981c8f68b7e6832ebf1eea2f841.zip | |
Merge pull request #3857 from ogniK5377/GetGpuTime-StackCorruption
nvdrv: Fix GetGpuTime stack corruption
Diffstat (limited to '')
| -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: | |||
| 159 | static_assert(sizeof(IoctlFlushL2) == 8, "IoctlFlushL2 is incorrect size"); | 159 | static_assert(sizeof(IoctlFlushL2) == 8, "IoctlFlushL2 is incorrect size"); |
| 160 | 160 | ||
| 161 | struct IoctlGetGpuTime { | 161 | struct IoctlGetGpuTime { |
| 162 | u64_le gpu_time; | 162 | u64_le gpu_time{}; |
| 163 | INSERT_PADDING_WORDS(2); | ||
| 163 | }; | 164 | }; |
| 164 | static_assert(sizeof(IoctlGetGpuTime) == 8, "IoctlGetGpuTime is incorrect size"); | 165 | static_assert(sizeof(IoctlGetGpuTime) == 0x10, "IoctlGetGpuTime is incorrect size"); |
| 165 | 166 | ||
| 166 | u32 GetCharacteristics(const std::vector<u8>& input, std::vector<u8>& output, | 167 | u32 GetCharacteristics(const std::vector<u8>& input, std::vector<u8>& output, |
| 167 | std::vector<u8>& output2, IoctlVersion version); | 168 | std::vector<u8>& output2, IoctlVersion version); |