diff options
| author | bunnei <bunneidev@gmail.com> | 2015-03-16 23:18:24 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-03-16 23:18:24 +0100 |
| commit | 968c418fa537b8843bd220379b876cc525b31378 (patch) | |
| tree | 6583aea801328cfc9ff3a33d58ac72d4c060517e /src/video_core | |
| parent | Merge pull request #663 from lioncash/ticks (diff) | |
| parent | VideoCore: Add static_cast around expressions where the compiler doesn’t deduce the right type. (diff) | |
| download | yuzu-968c418fa537b8843bd220379b876cc525b31378.tar yuzu-968c418fa537b8843bd220379b876cc525b31378.tar.gz yuzu-968c418fa537b8843bd220379b876cc525b31378.tar.bz2 yuzu-968c418fa537b8843bd220379b876cc525b31378.tar.lz yuzu-968c418fa537b8843bd220379b876cc525b31378.tar.xz yuzu-968c418fa537b8843bd220379b876cc525b31378.tar.zst yuzu-968c418fa537b8843bd220379b876cc525b31378.zip | |
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/color.h | 2 | ||||
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/video_core/color.h b/src/video_core/color.h index 14ade74f2..43d635e2c 100644 --- a/src/video_core/color.h +++ b/src/video_core/color.h @@ -124,7 +124,7 @@ inline u32 DecodeD24(const u8* bytes) { * @return Resulting values stored as a Math::Vec2 */ inline const Math::Vec2<u32> DecodeD24S8(const u8* bytes) { - return { (bytes[2] << 16) | (bytes[1] << 8) | bytes[0], bytes[3] }; + return { static_cast<u32>((bytes[2] << 16) | (bytes[1] << 8) | bytes[0]), bytes[3] }; } /** diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 745c4f4ed..83982b4f2 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp @@ -322,7 +322,7 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture case Regs::TextureFormat::RGBA8: { auto res = Color::DecodeRGBA8(source + VideoCore::GetMortonOffset(x, y, 4)); - return { res.r(), res.g(), res.b(), disable_alpha ? 255 : res.a() }; + return { res.r(), res.g(), res.b(), static_cast<u8>(disable_alpha ? 255 : res.a()) }; } case Regs::TextureFormat::RGB8: @@ -334,7 +334,7 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture case Regs::TextureFormat::RGB5A1: { auto res = Color::DecodeRGB5A1(source + VideoCore::GetMortonOffset(x, y, 2)); - return { res.r(), res.g(), res.b(), disable_alpha ? 255 : res.a() }; + return { res.r(), res.g(), res.b(), static_cast<u8>(disable_alpha ? 255 : res.a()) }; } case Regs::TextureFormat::RGB565: @@ -346,7 +346,7 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture case Regs::TextureFormat::RGBA4: { auto res = Color::DecodeRGBA4(source + VideoCore::GetMortonOffset(x, y, 2)); - return { res.r(), res.g(), res.b(), disable_alpha ? 255 : res.a() }; + return { res.r(), res.g(), res.b(), static_cast<u8>(disable_alpha ? 255 : res.a()) }; } case Regs::TextureFormat::IA8: |