diff options
| author |  Liam | 2024-01-30 12:26:32 -0500 |
|---|---|---|
| committer | Liam | 2024-01-30 12:26:32 -0500 |
| commit | 8292ba7ad681e31beb9d9e2c30186ce433c5243c (patch) | |
| tree | 9f474213dcab339ac01888ed393f0facdca50e7d | |
| parent | Merge pull request #12856 from liamwhite/serialization (diff) | |
| download | yuzu-8292ba7ad681e31beb9d9e2c30186ce433c5243c.tar.gz yuzu-8292ba7ad681e31beb9d9e2c30186ce433c5243c.tar.xz yuzu-8292ba7ad681e31beb9d9e2c30186ce433c5243c.zip | |
cmif_serialization: fix LargeData types
| -rw-r--r-- | src/core/hle/service/cmif_serialization.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/service/cmif_serialization.h b/src/core/hle/service/cmif_serialization.h index 5eabf51fe..315475e71 100644 --- a/src/core/hle/service/cmif_serialization.h +++ b/src/core/hle/service/cmif_serialization.h | |||
| @@ -283,7 +283,7 @@ void ReadInArgument(bool is_domain, CallArguments& args, const u8* raw_data, HLE | |||
| 283 | 283 | ||
| 284 | return ReadInArgument<MethodArguments, CallArguments, PrevAlign, DataOffset, HandleIndex + 1, InBufferIndex, OutBufferIndex, RawDataFinished, ArgIndex + 1>(is_domain, args, raw_data, ctx, temp); | 284 | return ReadInArgument<MethodArguments, CallArguments, PrevAlign, DataOffset, HandleIndex + 1, InBufferIndex, OutBufferIndex, RawDataFinished, ArgIndex + 1>(is_domain, args, raw_data, ctx, temp); |
| 285 | } else if constexpr (ArgumentTraits<ArgType>::Type == ArgumentType::InLargeData) { | 285 | } else if constexpr (ArgumentTraits<ArgType>::Type == ArgumentType::InLargeData) { |
| 286 | constexpr size_t BufferSize = sizeof(ArgType); | 286 | constexpr size_t BufferSize = sizeof(typename ArgType::Type); |
| 287 | 287 | ||
| 288 | // Clear the existing data. | 288 | // Clear the existing data. |
| 289 | std::memset(&std::get<ArgIndex>(args), 0, BufferSize); | 289 | std::memset(&std::get<ArgIndex>(args), 0, BufferSize); |
| @@ -324,7 +324,7 @@ void ReadInArgument(bool is_domain, CallArguments& args, const u8* raw_data, HLE | |||
| 324 | 324 | ||
| 325 | return ReadInArgument<MethodArguments, CallArguments, PrevAlign, DataOffset, HandleIndex, InBufferIndex + 1, OutBufferIndex, RawDataFinished, ArgIndex + 1>(is_domain, args, raw_data, ctx, temp); | 325 | return ReadInArgument<MethodArguments, CallArguments, PrevAlign, DataOffset, HandleIndex, InBufferIndex + 1, OutBufferIndex, RawDataFinished, ArgIndex + 1>(is_domain, args, raw_data, ctx, temp); |
| 326 | } else if constexpr (ArgumentTraits<ArgType>::Type == ArgumentType::OutLargeData) { | 326 | } else if constexpr (ArgumentTraits<ArgType>::Type == ArgumentType::OutLargeData) { |
| 327 | constexpr size_t BufferSize = sizeof(ArgType); | 327 | constexpr size_t BufferSize = sizeof(typename ArgType::Type); |
| 328 | 328 | ||
| 329 | // Clear the existing data. | 329 | // Clear the existing data. |
| 330 | std::memset(&std::get<ArgIndex>(args).raw, 0, BufferSize); | 330 | std::memset(&std::get<ArgIndex>(args).raw, 0, BufferSize); |
| @@ -394,7 +394,7 @@ void WriteOutArgument(bool is_domain, CallArguments& args, u8* raw_data, HLERequ | |||
| 394 | 394 | ||
| 395 | return WriteOutArgument<MethodArguments, CallArguments, PrevAlign, DataOffset, OutBufferIndex, RawDataFinished, ArgIndex + 1>(is_domain, args, raw_data, ctx, temp); | 395 | return WriteOutArgument<MethodArguments, CallArguments, PrevAlign, DataOffset, OutBufferIndex, RawDataFinished, ArgIndex + 1>(is_domain, args, raw_data, ctx, temp); |
| 396 | } else if constexpr (ArgumentTraits<ArgType>::Type == ArgumentType::OutLargeData) { | 396 | } else if constexpr (ArgumentTraits<ArgType>::Type == ArgumentType::OutLargeData) { |
| 397 | constexpr size_t BufferSize = sizeof(ArgType); | 397 | constexpr size_t BufferSize = sizeof(typename ArgType::Type); |
| 398 | 398 | ||
| 399 | ASSERT(ctx.CanWriteBuffer(OutBufferIndex)); | 399 | ASSERT(ctx.CanWriteBuffer(OutBufferIndex)); |
| 400 | if constexpr (ArgType::Attr & BufferAttr_HipcAutoSelect) { | 400 | if constexpr (ArgType::Attr & BufferAttr_HipcAutoSelect) { |