summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2020-05-01 17:59:47 +0200
committerGitHub <noreply@github.com>2020-05-01 17:59:47 +0200
commit3f4cabfd4d9de981c8f68b7e6832ebf1eea2f841 (patch)
tree2f9a3005fee0b63a81bc5c6d6365352e61d91d4e /src/core/hle
parentMerge pull request #3827 from ogniK5377/cubeb-616d773 (diff)
parentnvdrv: Fix GetGpuTime stack corruption (diff)
downloadyuzu-3f4cabfd4d9de981c8f68b7e6832ebf1eea2f841.tar
yuzu-3f4cabfd4d9de981c8f68b7e6832ebf1eea2f841.tar.gz
yuzu-3f4cabfd4d9de981c8f68b7e6832ebf1eea2f841.tar.bz2
yuzu-3f4cabfd4d9de981c8f68b7e6832ebf1eea2f841.tar.lz
yuzu-3f4cabfd4d9de981c8f68b7e6832ebf1eea2f841.tar.xz
yuzu-3f4cabfd4d9de981c8f68b7e6832ebf1eea2f841.tar.zst
yuzu-3f4cabfd4d9de981c8f68b7e6832ebf1eea2f841.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h5
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);