diff options
| author | 2016-04-24 02:02:45 -0400 | |
|---|---|---|
| committer | 2016-04-24 02:02:45 -0400 | |
| commit | 0964a3ff530f2eb5b7ecdf9dfbb74deea890352d (patch) | |
| tree | c566efaf69f8d3564d1e678a0a31981a52794a8a /src/video_core | |
| parent | Merge pull request #1705 from LittleWhite-tb/compat_gcc49 (diff) | |
| parent | assert: Add _MSG variations for UNREACHABLE and UNIMPLEMENTED (diff) | |
| download | yuzu-0964a3ff530f2eb5b7ecdf9dfbb74deea890352d.tar.gz yuzu-0964a3ff530f2eb5b7ecdf9dfbb74deea890352d.tar.xz yuzu-0964a3ff530f2eb5b7ecdf9dfbb74deea890352d.zip | |
Merge pull request #1576 from smspillaz/fix-build-errors-03272016
Fix various build errors encountered on Clang 3.9 on OS X
Diffstat (limited to 'src/video_core')
| -rw-r--r-- | src/video_core/pica.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/video_core/pica.h b/src/video_core/pica.h index 1810eca98..cf130d7f8 100644 --- a/src/video_core/pica.h +++ b/src/video_core/pica.h | |||
| @@ -747,8 +747,13 @@ struct Regs { | |||
| 747 | case LightingSampler::ReflectGreen: | 747 | case LightingSampler::ReflectGreen: |
| 748 | case LightingSampler::ReflectBlue: | 748 | case LightingSampler::ReflectBlue: |
| 749 | return (config == LightingConfig::Config4) || (config == LightingConfig::Config5) || (config == LightingConfig::Config7); | 749 | return (config == LightingConfig::Config4) || (config == LightingConfig::Config5) || (config == LightingConfig::Config7); |
| 750 | default: | ||
| 751 | UNREACHABLE_MSG("Regs::IsLightingSamplerSupported: Reached " | ||
| 752 | "unreachable section, sampler should be one " | ||
| 753 | "of Distribution0, Distribution1, Fresnel, " | ||
| 754 | "ReflectRed, ReflectGreen or ReflectBlue, instead " | ||
| 755 | "got %i", static_cast<int>(config)); | ||
| 750 | } | 756 | } |
| 751 | return false; | ||
| 752 | } | 757 | } |
| 753 | 758 | ||
| 754 | struct { | 759 | struct { |