yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #3857 from ogniK5377/GetGpuTime-StackCorruption 

nvdrv: Fix GetGpuTime stack corruption
This commit is contained in:
bunnei 2020-05-01 11:59:47 -04:00 committed by GitHub
parent 3a13552db8 d5a69ecb68
commit 3f4cabfd4d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/hle/service/nvdrv/devices/nvhost_ctrl_gpu.h
View File

@ -159,9 +159,10 @@ private:
static_assert(sizeof(IoctlFlushL2) == 8, "IoctlFlushL2 is incorrect size"); static_assert(sizeof(IoctlFlushL2) == 8, "IoctlFlushL2 is incorrect size");
struct IoctlGetGpuTime { 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, u32 GetCharacteristics(const std::vector<u8>& input, std::vector<u8>& output,
std::vector<u8>& output2, IoctlVersion version); std::vector<u8>& output2, IoctlVersion version);