Mirror/citra
1
0
Fork 0
mirror of https://github.com/PabloMK7/citra.git synced 2024-11-24 16:34:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2722 from wwylele/cam-ipc-helper

Browse source 
CAM: use IPCHelper
This commit is contained in:
bunnei 2017-05-31 19:47:37 -04:00 committed by GitHub
commit 4857eb441b
2 changed files with 261 additions and 289 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

537
src/core/hle/service/cam/cam.cpp
View file

File diff suppressed because it is too large Load diff

13
src/core/hle/service/cam/cam.h
View file

@ -184,9 +184,10 @@ struct PackageParameterWithoutContext {
s16 auto_white_balance_window_y; s16 auto_white_balance_window_y;
s16 auto_white_balance_window_width; s16 auto_white_balance_window_width;
s16 auto_white_balance_window_height; s16 auto_white_balance_window_height;
INSERT_PADDING_WORDS(4);
}; };
static_assert(sizeof(PackageParameterWithoutContext) == 28, static_assert(sizeof(PackageParameterWithoutContext) == 44,
"PackageParameterCameraWithoutContext structure size is wrong"); "PackageParameterCameraWithoutContext structure size is wrong");
struct PackageParameterWithContext { struct PackageParameterWithContext {
@ -196,11 +197,12 @@ struct PackageParameterWithContext {
Effect effect; Effect effect;
Size size; Size size;
INSERT_PADDING_BYTES(3); INSERT_PADDING_BYTES(3);
INSERT_PADDING_WORDS(3);
Resolution GetResolution(); Resolution GetResolution() const;
}; };
static_assert(sizeof(PackageParameterWithContext) == 8, static_assert(sizeof(PackageParameterWithContext) == 20,
"PackageParameterWithContext structure size is wrong"); "PackageParameterWithContext structure size is wrong");
struct PackageParameterWithContextDetail { struct PackageParameterWithContextDetail {
@ -209,13 +211,14 @@ struct PackageParameterWithContextDetail {
Flip flip; Flip flip;
Effect effect; Effect effect;
Resolution resolution; Resolution resolution;
INSERT_PADDING_WORDS(3);
Resolution GetResolution() { Resolution GetResolution() const {
return resolution; return resolution;
} }
}; };
static_assert(sizeof(PackageParameterWithContextDetail) == 16, static_assert(sizeof(PackageParameterWithContextDetail) == 28,
"PackageParameterWithContextDetail structure size is wrong"); "PackageParameterWithContextDetail structure size is wrong");
/** /**