diff options
| author | 2017-08-21 12:18:52 -0500 | |
|---|---|---|
| committer | 2017-08-26 11:58:22 -0500 | |
| commit | da88f3b8f0f9f1162b7ad41f70e2126195eee999 (patch) | |
| tree | 59ea676e313891a060acef7683b69d837c4ac8bb /src | |
| parent | Merge pull request #2872 from wwylele/sw-geo-factor (diff) | |
| download | yuzu-da88f3b8f0f9f1162b7ad41f70e2126195eee999.tar.gz yuzu-da88f3b8f0f9f1162b7ad41f70e2126195eee999.tar.xz yuzu-da88f3b8f0f9f1162b7ad41f70e2126195eee999.zip | |
Warnings: Fixed a few missing-return warnings in video_core.
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/regs_framebuffer.h | 10 | ||||
| -rw-r--r-- | src/video_core/swrasterizer/framebuffer.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/swrasterizer/texturing.cpp | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/video_core/regs_framebuffer.h b/src/video_core/regs_framebuffer.h index a50bd4111..7b565f911 100644 --- a/src/video_core/regs_framebuffer.h +++ b/src/video_core/regs_framebuffer.h | |||
| @@ -256,10 +256,9 @@ struct FramebufferRegs { | |||
| 256 | return 3; | 256 | return 3; |
| 257 | case DepthFormat::D24S8: | 257 | case DepthFormat::D24S8: |
| 258 | return 4; | 258 | return 4; |
| 259 | default: | ||
| 260 | LOG_CRITICAL(HW_GPU, "Unknown depth format %u", format); | ||
| 261 | UNIMPLEMENTED(); | ||
| 262 | } | 259 | } |
| 260 | |||
| 261 | ASSERT_MSG(false, "Unknown depth format %u", format); | ||
| 263 | } | 262 | } |
| 264 | 263 | ||
| 265 | // Returns the number of bits per depth component of the specified depth format | 264 | // Returns the number of bits per depth component of the specified depth format |
| @@ -270,10 +269,9 @@ struct FramebufferRegs { | |||
| 270 | case DepthFormat::D24: | 269 | case DepthFormat::D24: |
| 271 | case DepthFormat::D24S8: | 270 | case DepthFormat::D24S8: |
| 272 | return 24; | 271 | return 24; |
| 273 | default: | ||
| 274 | LOG_CRITICAL(HW_GPU, "Unknown depth format %u", format); | ||
| 275 | UNIMPLEMENTED(); | ||
| 276 | } | 272 | } |
| 273 | |||
| 274 | ASSERT_MSG(false, "Unknown depth format %u", format); | ||
| 277 | } | 275 | } |
| 278 | 276 | ||
| 279 | INSERT_PADDING_WORDS(0x20); | 277 | INSERT_PADDING_WORDS(0x20); |
diff --git a/src/video_core/swrasterizer/framebuffer.cpp b/src/video_core/swrasterizer/framebuffer.cpp index 7de3aac75..f34eab6cf 100644 --- a/src/video_core/swrasterizer/framebuffer.cpp +++ b/src/video_core/swrasterizer/framebuffer.cpp | |||
| @@ -352,6 +352,8 @@ u8 LogicOp(u8 src, u8 dest, FramebufferRegs::LogicOp op) { | |||
| 352 | case FramebufferRegs::LogicOp::OrInverted: | 352 | case FramebufferRegs::LogicOp::OrInverted: |
| 353 | return ~src | dest; | 353 | return ~src | dest; |
| 354 | } | 354 | } |
| 355 | |||
| 356 | UNREACHABLE(); | ||
| 355 | }; | 357 | }; |
| 356 | 358 | ||
| 357 | } // namespace Rasterizer | 359 | } // namespace Rasterizer |
diff --git a/src/video_core/swrasterizer/texturing.cpp b/src/video_core/swrasterizer/texturing.cpp index 4f02b93f2..79b1ce841 100644 --- a/src/video_core/swrasterizer/texturing.cpp +++ b/src/video_core/swrasterizer/texturing.cpp | |||
| @@ -89,6 +89,8 @@ Math::Vec3<u8> GetColorModifier(TevStageConfig::ColorModifier factor, | |||
| 89 | case ColorModifier::OneMinusSourceBlue: | 89 | case ColorModifier::OneMinusSourceBlue: |
| 90 | return (Math::Vec3<u8>(255, 255, 255) - values.bbb()).Cast<u8>(); | 90 | return (Math::Vec3<u8>(255, 255, 255) - values.bbb()).Cast<u8>(); |
| 91 | } | 91 | } |
| 92 | |||
| 93 | UNREACHABLE(); | ||
| 92 | }; | 94 | }; |
| 93 | 95 | ||
| 94 | u8 GetAlphaModifier(TevStageConfig::AlphaModifier factor, const Math::Vec4<u8>& values) { | 96 | u8 GetAlphaModifier(TevStageConfig::AlphaModifier factor, const Math::Vec4<u8>& values) { |
| @@ -119,6 +121,8 @@ u8 GetAlphaModifier(TevStageConfig::AlphaModifier factor, const Math::Vec4<u8>& | |||
| 119 | case AlphaModifier::OneMinusSourceBlue: | 121 | case AlphaModifier::OneMinusSourceBlue: |
| 120 | return 255 - values.b(); | 122 | return 255 - values.b(); |
| 121 | } | 123 | } |
| 124 | |||
| 125 | UNREACHABLE(); | ||
| 122 | }; | 126 | }; |
| 123 | 127 | ||
| 124 | Math::Vec3<u8> ColorCombine(TevStageConfig::Operation op, const Math::Vec3<u8> input[3]) { | 128 | Math::Vec3<u8> ColorCombine(TevStageConfig::Operation op, const Math::Vec3<u8> input[3]) { |