CCF_100
/
suyu-mirror
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 0
Code Issues Releases Wiki Activity

service/vi: Factor out scaling mode conversions from the IPC function itself 

Avoids entangling the IPC buffer appending with the actual operation of
converting the scaling values over. This also inserts the proper error
handling for invalid scaling values.
merge-requests/60/head
Lioncash 2019-01-04 19:55:01 +07:00
parent 40aa1ea9f9
commit 56e51da1d9
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/core/hle/service/vi/vi.cpp
Unescape Escape View File

@ -1102,31 +1102,35 @@ private:
void ConvertScalingMode(Kernel::HLERequestContext& ctx) { void ConvertScalingMode(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
auto mode = rp.PopEnum<NintendoScaleMode>(); const auto mode = rp.PopEnum<NintendoScaleMode>();
LOG_DEBUG(Service_VI, "called mode={}", static_cast<u32>(mode)); LOG_DEBUG(Service_VI, "called mode={}", static_cast<u32>(mode));
const auto converted_mode = ConvertScalingModeImpl(mode);
if (converted_mode.Succeeded()) {
IPC::ResponseBuilder rb{ctx, 4}; IPC::ResponseBuilder rb{ctx, 4};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.PushEnum(*converted_mode);
} else {
IPC::ResponseBuilder rb{ctx, 2};
rb.Push(converted_mode.Code());
}
}
static ResultVal<ConvertedScaleMode> ConvertScalingModeImpl(NintendoScaleMode mode) {
switch (mode) { switch (mode) {
case NintendoScaleMode::None: case NintendoScaleMode::None:
rb.PushEnum(ConvertedScaleMode::None); return MakeResult(ConvertedScaleMode::None);
break;
case NintendoScaleMode::Freeze: case NintendoScaleMode::Freeze:
rb.PushEnum(ConvertedScaleMode::Freeze); return MakeResult(ConvertedScaleMode::Freeze);
break;
case NintendoScaleMode::ScaleToWindow: case NintendoScaleMode::ScaleToWindow:
rb.PushEnum(ConvertedScaleMode::ScaleToWindow); return MakeResult(ConvertedScaleMode::ScaleToWindow);
break;
case NintendoScaleMode::Crop: case NintendoScaleMode::Crop:
rb.PushEnum(ConvertedScaleMode::Crop); return MakeResult(ConvertedScaleMode::Crop);
break;
case NintendoScaleMode::NoCrop: case NintendoScaleMode::NoCrop:
rb.PushEnum(ConvertedScaleMode::NoCrop); return MakeResult(ConvertedScaleMode::NoCrop);
break;
default: default:
UNIMPLEMENTED_MSG("Unknown scaling mode {}", static_cast<u32>(mode)); return ERR_OPERATION_FAILED;
rb.PushEnum(ConvertedScaleMode::None);
break;
} }
} }