Fix 'control reaches end of non-void function' warnings treated as errors

All switch control flows return, but the compiler doesn't seem smart enough to notice this. This magically started happening when I switched to using ninja, possibly suggesting that it is either suddenly using a different compiler or the flags are different. While something I'll try investigating, here's a fix all the same. Bug: b/130335507 Change-Id: I3c6d00c00ecd03bbd34d51ac62d02fefdc026526 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/32649 Kokoro-Presubmit: kokoro <noreply+kokoro@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Ben Clayton <bclayton@google.com>

Fix 'control reaches end of non-void function' warnings treated as errors
8115f1e7 · Ben Clayton · 1934b10f · 8115f1e7 · 8115f1e7
Commit 8115f1e7 authored Jun 11, 2019 by Ben Clayton
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

libGLESv3.cpp src/OpenGL/libGLESv2/libGLESv3.cpp +3 -1

SpirvShaderSampling.cpp src/Pipeline/SpirvShaderSampling.cpp +4 -2

No files found.
--- a/src/OpenGL/libGLESv2/libGLESv3.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv3.cpp
@@ -183,8 +183,10 @@ bool ValidateTexParamParameters(GLenum pname, GLint param)
 		return true;

 	default:
-		return error(GL_INVALID_ENUM, false);
+		break;
 	}
+
+	return error(GL_INVALID_ENUM, false);
 }

 static bool ValidateSamplerObjectParameter(GLenum pname)

--- a/src/Pipeline/SpirvShaderSampling.cpp
+++ b/src/Pipeline/SpirvShaderSampling.cpp
@@ -277,9 +277,11 @@ sw::FilterType SpirvShader::convertFilterMode(const vk::Sampler *sampler)
 		}
 		break;
 	default:
-		UNIMPLEMENTED("magFilter %d", sampler->magFilter);
-		return FILTER_POINT;
+		break;
 	}
+
+	UNIMPLEMENTED("magFilter %d", sampler->magFilter);
+	return FILTER_POINT;
 }

 sw::MipmapType SpirvShader::convertMipmapMode(const vk::Sampler *sampler)