diff options
author | Narr the Reg <juangerman-13@hotmail.com> | 2024-01-29 05:29:06 +0100 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2024-01-30 03:35:45 +0100 |
commit | 4afca6bf5de516961c4109ca363c437c9da2e677 (patch) | |
tree | ea1afe7284facdcb20dae7f887ebe6697392b785 /src/core/hle/service/caps/caps_types.h | |
parent | Merge pull request #12843 from t895/system-driver-whoops (diff) | |
download | yuzu-4afca6bf5de516961c4109ca363c437c9da2e677.tar yuzu-4afca6bf5de516961c4109ca363c437c9da2e677.tar.gz yuzu-4afca6bf5de516961c4109ca363c437c9da2e677.tar.bz2 yuzu-4afca6bf5de516961c4109ca363c437c9da2e677.tar.lz yuzu-4afca6bf5de516961c4109ca363c437c9da2e677.tar.xz yuzu-4afca6bf5de516961c4109ca363c437c9da2e677.tar.zst yuzu-4afca6bf5de516961c4109ca363c437c9da2e677.zip |
Diffstat (limited to 'src/core/hle/service/caps/caps_types.h')
-rw-r--r-- | src/core/hle/service/caps/caps_types.h | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/core/hle/service/caps/caps_types.h b/src/core/hle/service/caps/caps_types.h index 589ac28d3..3deaaad5b 100644 --- a/src/core/hle/service/caps/caps_types.h +++ b/src/core/hle/service/caps/caps_types.h @@ -41,6 +41,10 @@ enum class ScreenShotDecoderFlag : u64 { EnableBlockSmoothing = 1 << 1, }; +enum class ShimLibraryVersion : u64 { + Version1 = 1, +}; + // This is nn::capsrv::AlbumFileDateTime struct AlbumFileDateTime { s16 year{}; @@ -144,19 +148,23 @@ static_assert(sizeof(ApplicationAlbumFileEntry) == 0x30, "ApplicationAlbumFileEntry has incorrect size."); struct ApplicationData { - std::array<u8, 0x400> data{}; - u32 data_size{}; + std::array<u8, 0x400> data; + u32 data_size; }; static_assert(sizeof(ApplicationData) == 0x404, "ApplicationData is an invalid size"); +static_assert(std::is_trivial_v<ApplicationData>, + "ApplicationData type must be trivially copyable."); struct ScreenShotAttribute { - u32 unknown_0{}; - AlbumImageOrientation orientation{}; - u32 unknown_1{}; - u32 unknown_2{}; - INSERT_PADDING_BYTES(0x30); + u32 unknown_0; + AlbumImageOrientation orientation; + u32 unknown_1; + u32 unknown_2; + INSERT_PADDING_BYTES_NOINIT(0x30); }; static_assert(sizeof(ScreenShotAttribute) == 0x40, "ScreenShotAttribute is an invalid size"); +static_assert(std::is_trivial_v<ScreenShotAttribute>, + "ScreenShotAttribute type must be trivially copyable."); struct ScreenShotDecodeOption { ScreenShotDecoderFlag flags{}; @@ -165,13 +173,15 @@ struct ScreenShotDecodeOption { static_assert(sizeof(ScreenShotDecodeOption) == 0x20, "ScreenShotDecodeOption is an invalid size"); struct LoadAlbumScreenShotImageOutput { - s64 width{}; - s64 height{}; - ScreenShotAttribute attribute{}; - INSERT_PADDING_BYTES(0x400); + s64 width; + s64 height; + ScreenShotAttribute attribute; + INSERT_PADDING_BYTES_NOINIT(0x400); }; static_assert(sizeof(LoadAlbumScreenShotImageOutput) == 0x450, "LoadAlbumScreenShotImageOutput is an invalid size"); +static_assert(std::is_trivial_v<LoadAlbumScreenShotImageOutput>, + "LoadAlbumScreenShotImageOutput type must be trivially copyable."); struct LoadAlbumScreenShotImageOutputForApplication { s64 width{}; |