diff options
| author | skidau <skidau@gmail.com> | 2014-12-13 19:47:06 +1100 |
|---|---|---|
| committer | skidau <skidau@gmail.com> | 2014-12-13 19:47:06 +1100 |
| commit | d02eb3ca59c8ca435aae617ff1484525c796a330 (patch) | |
| tree | 7b2044a4a065571f7362f9927f5e1f451c2f0de2 /Source/Core/VideoBackends | |
| parent | 00b05bb18c6a367044895ff2dcc485524a0f711f (diff) | |
| parent | b030d290671c283020c405dfd9e8658935dcf1cf (diff) | |
Merge pull request #1640 from rohit-n/switch-default
Silence some -Wswitch-default warnings.
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 5 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/Tev.cpp | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index cb0ba569ba..439c4c9040 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -55,9 +55,10 @@ static std::string GetGLSLVersionString() return "#version 140"; case GLSL_150: return "#version 150"; + default: + // Shouldn't ever hit this + return "#version ERROR"; } - // Shouldn't ever hit this - return "#version ERROR"; } void SHADER::SetProgramVariables() diff --git a/Source/Core/VideoBackends/Software/Tev.cpp b/Source/Core/VideoBackends/Software/Tev.cpp index 122e1293da..37c8563ae2 100644 --- a/Source/Core/VideoBackends/Software/Tev.cpp +++ b/Source/Core/VideoBackends/Software/Tev.cpp @@ -347,9 +347,8 @@ static bool AlphaCompare(int alpha, int ref, AlphaTest::CompareMode comp) case AlphaTest::GREATER: return alpha > ref; case AlphaTest::EQUAL: return alpha == ref; case AlphaTest::NEQUAL: return alpha != ref; + default: return true; } - - return true; } static bool TevAlphaTest(int alpha) @@ -363,8 +362,8 @@ static bool TevAlphaTest(int alpha) case 1: return comp0 || comp1; // or case 2: return comp0 ^ comp1; // xor case 3: return !(comp0 ^ comp1); // xnor + default: return true; } - return true; } static inline s32 WrapIndirectCoord(s32 coord, int wrapMode) @@ -385,8 +384,9 @@ static inline s32 WrapIndirectCoord(s32 coord, int wrapMode) return (coord % (16 << 7)); case ITW_0: return 0; + default: + return 0; } - return 0; } void Tev::Indirect(unsigned int stageNum, s32 s, s32 t) |