diff options
| author | 2015-03-16 15:14:04 +0100 | |
|---|---|---|
| committer | 2015-03-16 15:14:04 +0100 | |
| commit | 92fd2a1ee30b4c0b5af9ebb268f8f1ace649f371 (patch) | |
| tree | 938f6f5769675df5df6dc153df6f50b4500840e8 /src/video_core/debug_utils | |
| parent | Merge pull request #657 from Subv/flip (diff) | |
| download | yuzu-92fd2a1ee30b4c0b5af9ebb268f8f1ace649f371.tar.gz yuzu-92fd2a1ee30b4c0b5af9ebb268f8f1ace649f371.tar.xz yuzu-92fd2a1ee30b4c0b5af9ebb268f8f1ace649f371.zip | |
VideoCore: Add static_cast around expressions where the compiler doesn’t deduce the right type.
Diffstat (limited to 'src/video_core/debug_utils')
| -rw-r--r-- | src/video_core/debug_utils/debug_utils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
| 322 | case Regs::TextureFormat::RGBA8: | 322 | case Regs::TextureFormat::RGBA8: |
| 323 | { | 323 | { |
| 324 | auto res = Color::DecodeRGBA8(source + VideoCore::GetMortonOffset(x, y, 4)); | 324 | auto res = Color::DecodeRGBA8(source + VideoCore::GetMortonOffset(x, y, 4)); |
| 325 | return { res.r(), res.g(), res.b(), disable_alpha ? 255 : res.a() }; | 325 | return { res.r(), res.g(), res.b(), static_cast<u8>(disable_alpha ? 255 : res.a()) }; |
| 326 | } | 326 | } |
| 327 | 327 | ||
| 328 | case Regs::TextureFormat::RGB8: | 328 | case Regs::TextureFormat::RGB8: |
| @@ -334,7 +334,7 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture | |||
| 334 | case Regs::TextureFormat::RGB5A1: | 334 | case Regs::TextureFormat::RGB5A1: |
| 335 | { | 335 | { |
| 336 | auto res = Color::DecodeRGB5A1(source + VideoCore::GetMortonOffset(x, y, 2)); | 336 | auto res = Color::DecodeRGB5A1(source + VideoCore::GetMortonOffset(x, y, 2)); |
| 337 | return { res.r(), res.g(), res.b(), disable_alpha ? 255 : res.a() }; | 337 | return { res.r(), res.g(), res.b(), static_cast<u8>(disable_alpha ? 255 : res.a()) }; |
| 338 | } | 338 | } |
| 339 | 339 | ||
| 340 | case Regs::TextureFormat::RGB565: | 340 | case Regs::TextureFormat::RGB565: |
| @@ -346,7 +346,7 @@ const Math::Vec4<u8> LookupTexture(const u8* source, int x, int y, const Texture | |||
| 346 | case Regs::TextureFormat::RGBA4: | 346 | case Regs::TextureFormat::RGBA4: |
| 347 | { | 347 | { |
| 348 | auto res = Color::DecodeRGBA4(source + VideoCore::GetMortonOffset(x, y, 2)); | 348 | auto res = Color::DecodeRGBA4(source + VideoCore::GetMortonOffset(x, y, 2)); |
| 349 | return { res.r(), res.g(), res.b(), disable_alpha ? 255 : res.a() }; | 349 | return { res.r(), res.g(), res.b(), static_cast<u8>(disable_alpha ? 255 : res.a()) }; |
| 350 | } | 350 | } |
| 351 | 351 | ||
| 352 | case Regs::TextureFormat::IA8: | 352 | case Regs::TextureFormat::IA8: |