INSANEMODE/yuzu
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu.git synced 2025-06-10 22:38:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed type conversion ambiguity

Browse Source
This commit is contained in:
Huw Pascoe
2017-09-27 00:26:09 +01:00
parent b07af7dda8
commit a13ab958cb
32 changed files with 97 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/hle/ipc.h
View File

@ -122,11 +122,11 @@ union StaticBufferDescInfo {
BitField<14, 18, u32> size;
};
inline u32 StaticBufferDesc(u32 size, u8 buffer_id) {
inline u32 StaticBufferDesc(size_t size, u8 buffer_id) {
StaticBufferDescInfo info{};
info.descriptor_type.Assign(StaticBuffer);
info.buffer_id.Assign(buffer_id);
info.size.Assign(size);
info.size.Assign(static_cast<u32>(size));
return info.raw;
}
@ -160,11 +160,11 @@ union MappedBufferDescInfo {
BitField<4, 28, u32> size;
};
inline u32 MappedBufferDesc(u32 size, MappedBufferPermissions perms) {
inline u32 MappedBufferDesc(size_t size, MappedBufferPermissions perms) {
MappedBufferDescInfo info{};
info.flags.Assign(MappedBuffer);
info.perms.Assign(perms);
info.size.Assign(size);
info.size.Assign(static_cast<u32>(size));
return info.raw;
}