summaryrefslogtreecommitdiff
path: root/src/core/hle/ipc.h
diff options
context:
space:
mode:
authorGravatar Huw Pascoe2017-09-27 00:26:09 +0100
committerGravatar Huw Pascoe2017-09-30 09:34:35 +0100
commita13ab958cbba75bc9abd1ca50f3030a10a75784e (patch)
tree016f6866d15fb9a41a15666f492bed352d95b523 /src/core/hle/ipc.h
parentMerge pull request #2961 from Subv/load_titles (diff)
downloadyuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.gz
yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.tar.xz
yuzu-a13ab958cbba75bc9abd1ca50f3030a10a75784e.zip
Fixed type conversion ambiguity
Diffstat (limited to 'src/core/hle/ipc.h')
-rw-r--r--src/core/hle/ipc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/ipc.h b/src/core/hle/ipc.h
index f7f96125a..87ed85df6 100644
--- a/src/core/hle/ipc.h
+++ b/src/core/hle/ipc.h
@@ -122,11 +122,11 @@ union StaticBufferDescInfo {
122 BitField<14, 18, u32> size; 122 BitField<14, 18, u32> size;
123}; 123};
124 124
125inline u32 StaticBufferDesc(u32 size, u8 buffer_id) { 125inline u32 StaticBufferDesc(size_t size, u8 buffer_id) {
126 StaticBufferDescInfo info{}; 126 StaticBufferDescInfo info{};
127 info.descriptor_type.Assign(StaticBuffer); 127 info.descriptor_type.Assign(StaticBuffer);
128 info.buffer_id.Assign(buffer_id); 128 info.buffer_id.Assign(buffer_id);
129 info.size.Assign(size); 129 info.size.Assign(static_cast<u32>(size));
130 return info.raw; 130 return info.raw;
131} 131}
132 132
@@ -160,11 +160,11 @@ union MappedBufferDescInfo {
160 BitField<4, 28, u32> size; 160 BitField<4, 28, u32> size;
161}; 161};
162 162
163inline u32 MappedBufferDesc(u32 size, MappedBufferPermissions perms) { 163inline u32 MappedBufferDesc(size_t size, MappedBufferPermissions perms) {
164 MappedBufferDescInfo info{}; 164 MappedBufferDescInfo info{};
165 info.flags.Assign(MappedBuffer); 165 info.flags.Assign(MappedBuffer);
166 info.perms.Assign(perms); 166 info.perms.Assign(perms);
167 info.size.Assign(size); 167 info.size.Assign(static_cast<u32>(size));
168 return info.raw; 168 return info.raw;
169} 169}
170 170