diff options
| author | bunnei <bunneidev@gmail.com> | 2017-06-01 01:47:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-01 01:47:37 +0200 |
| commit | 4857eb441bbe7ba1637838c9e5158f0801f40730 (patch) | |
| tree | 09a475aef634b39ae6b257101707354d3d117ec7 /src/core/hle/service/cam/cam.h | |
| parent | Merge pull request #2739 from yuriks/kernel-reorg (diff) | |
| parent | fixup!cam: use IPCHelper (diff) | |
| download | yuzu-4857eb441bbe7ba1637838c9e5158f0801f40730.tar yuzu-4857eb441bbe7ba1637838c9e5158f0801f40730.tar.gz yuzu-4857eb441bbe7ba1637838c9e5158f0801f40730.tar.bz2 yuzu-4857eb441bbe7ba1637838c9e5158f0801f40730.tar.lz yuzu-4857eb441bbe7ba1637838c9e5158f0801f40730.tar.xz yuzu-4857eb441bbe7ba1637838c9e5158f0801f40730.tar.zst yuzu-4857eb441bbe7ba1637838c9e5158f0801f40730.zip | |
Diffstat (limited to 'src/core/hle/service/cam/cam.h')
| -rw-r--r-- | src/core/hle/service/cam/cam.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/core/hle/service/cam/cam.h b/src/core/hle/service/cam/cam.h index 34a9c8479..b6da721d8 100644 --- a/src/core/hle/service/cam/cam.h +++ b/src/core/hle/service/cam/cam.h @@ -184,9 +184,10 @@ struct PackageParameterWithoutContext { s16 auto_white_balance_window_y; s16 auto_white_balance_window_width; 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"); struct PackageParameterWithContext { @@ -196,11 +197,12 @@ struct PackageParameterWithContext { Effect effect; Size size; 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"); struct PackageParameterWithContextDetail { @@ -209,13 +211,14 @@ struct PackageParameterWithContextDetail { Flip flip; Effect effect; Resolution resolution; + INSERT_PADDING_WORDS(3); - Resolution GetResolution() { + Resolution GetResolution() const { return resolution; } }; -static_assert(sizeof(PackageParameterWithContextDetail) == 16, +static_assert(sizeof(PackageParameterWithContextDetail) == 28, "PackageParameterWithContextDetail structure size is wrong"); /** |