Fix implicit fallthrough warnings treated as errors

Ideally we'd use the [[fallthrough]] attribute to silence this, but that isn't supported until C++17 and we're sticking with C++11 for now. Bug b/120382288 Change-Id: I98f28e42505ed496b0b35c29a7dc03fca18cf4ff Reviewed-on: https://swiftshader-review.googlesource.com/c/23128Reviewed-by: Greg Hartman <ghartman@google.com> Reviewed-by: Chris Forbes <chrisforbes@google.com> Tested-by: Nicolas Capens <nicolascapens@google.com>

Fix implicit fallthrough warnings treated as errors
7cfb50cd · Nicolas Capens · Nicolas Capens · 2661e840 · 7cfb50cd · 7cfb50cd
Commit 7cfb50cd authored Dec 08, 2018 by Nicolas Capens Committed by Nicolas Capens Dec 11, 2018
12 changed files
--- a/src/Android.bp
+++ b/src/Android.bp
@@ -32,6 +32,7 @@ cc_defaults {
        "-DNO_SANITIZE_FUNCTION=",
        // FIXME: Use <android/api-level.h> instead?
        "-DANDROID_PLATFORM_SDK_VERSION=10000",
+        "-Wno-implicit-fallthrough",
        "-Wno-unused-parameter",
        "-Wno-unused-local-typedef",
    ],

--- a/src/Android.mk
+++ b/src/Android.mk
@@ -128,6 +128,7 @@ COMMON_CFLAGS := \
 	-Wno-unused-value \
 	-Wno-unused-variable \
 	-Wno-implicit-exception-spec-mismatch \
+	-Wno-implicit-fallthrough \
 	-Wno-overloaded-virtual \
 	-Wno-non-virtual-dtor \
 	-Wno-attributes \

--- a/src/OpenGL/compiler/Android.mk
+++ b/src/OpenGL/compiler/Android.mk
@@ -29,6 +29,7 @@ COMMON_CFLAGS := \
 	-Wno-unused-parameter \
 	-Wno-unused-variable \
 	-Wno-implicit-exception-spec-mismatch \
+	-Wno-implicit-fallthrough \
 	-Wno-overloaded-virtual \
 	-Wno-attributes \
 	-Wno-unknown-attributes \

--- a/src/OpenGL/libEGL/Android.mk
+++ b/src/OpenGL/libEGL/Android.mk
@@ -13,6 +13,7 @@ COMMON_CFLAGS := \
 	-Wno-unused-function \
 	-Wno-unused-parameter \
 	-Wno-implicit-exception-spec-mismatch \
+	-Wno-implicit-fallthrough \
 	-Wno-overloaded-virtual \
 	-Wno-attributes \
 	-Wno-unknown-attributes \

--- a/src/OpenGL/libGLES_CM/Android.mk
+++ b/src/OpenGL/libGLES_CM/Android.mk
@@ -20,6 +20,7 @@ COMMON_CFLAGS := \
 	-Wno-unused-parameter \
 	-Wno-unused-variable \
 	-Wno-implicit-exception-spec-mismatch \
+	-Wno-implicit-fallthrough \
 	-Wno-overloaded-virtual \
 	-Wno-attributes \
 	-Wno-unknown-attributes \

--- a/src/OpenGL/libGLESv2/Android.mk
+++ b/src/OpenGL/libGLESv2/Android.mk
@@ -20,6 +20,7 @@ COMMON_CFLAGS := \
 	-Wno-unused-private-field \
 	-Wno-unused-variable \
 	-Wno-implicit-exception-spec-mismatch \
+	-Wno-implicit-fallthrough \
 	-Wno-overloaded-virtual \
 	-Wno-attributes \
 	-Wno-unknown-attributes \

--- a/src/OpenGL/libGLESv2/libGLESv2.cpp
+++ b/src/OpenGL/libGLESv2/libGLESv2.cpp
@@ -5624,6 +5624,8 @@ void VertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normal
 	case GL_FLOAT:
 	case GL_HALF_FLOAT_OES:   // GL_OES_vertex_half_float
 	case GL_HALF_FLOAT:
+	case GL_INT:
+	case GL_UNSIGNED_INT:
 		break;
 	case GL_INT_2_10_10_10_REV:
 	case GL_UNSIGNED_INT_2_10_10_10_REV:
@@ -5631,8 +5633,6 @@ void VertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normal
 		{
 			return error(GL_INVALID_OPERATION);
 		}
-	case GL_INT:
-	case GL_UNSIGNED_INT:
 		break;
 	default:
 		return error(GL_INVALID_ENUM);

--- a/src/Reactor/Android.mk
+++ b/src/Reactor/Android.mk
@@ -116,6 +116,7 @@ LOCAL_CFLAGS += \
 	-Wno-unused-lambda-capture \
 	-Wno-unused-parameter \
 	-Wno-implicit-exception-spec-mismatch \
+	-Wno-implicit-fallthrough \
 	-Wno-overloaded-virtual \
 	-Wno-non-virtual-dtor \
 	-Wno-unknown-warning-option \

--- a/third_party/LLVM/Android.bp
+++ b/third_party/LLVM/Android.bp
@@ -59,6 +59,7 @@ cc_library_static {
        "-D__STDC_CONSTANT_MACROS",
        "-D__STDC_FORMAT_MACROS",
        "-DLOG_TAG=\"libLLVM_swiftshader\"",
+        "-Wno-implicit-fallthrough",
        "-Wno-unused-result",
        "-Wno-unused-function",
        "-Wno-unused-variable",

--- a/third_party/LLVM/Android.mk
+++ b/third_party/LLVM/Android.mk
@@ -401,6 +401,7 @@ LOCAL_CFLAGS += \
 	-Wall \
 	-Werror \
 	-Wno-implicit-exception-spec-mismatch \
+	-Wno-implicit-fallthrough \
 	-Wno-overloaded-virtual \
 	-Wno-undefined-var-template \
 	-Wno-unneeded-internal-declaration \

--- a/third_party/llvm-subzero/Android.bp
+++ b/third_party/llvm-subzero/Android.bp
@@ -28,6 +28,7 @@ cc_library_static {
        "-D__STDC_CONSTANT_MACROS",
        "-D__STDC_FORMAT_MACROS",
        "-DLOG_TAG=\"libsubzero\"",
+        "-Wno-implicit-fallthrough",
        "-Wno-unused-parameter",
    ],


--- a/third_party/subzero/Android.bp
+++ b/third_party/subzero/Android.bp
@@ -28,6 +28,7 @@ cc_library_static {
        "-D__STDC_CONSTANT_MACROS",
        "-D__STDC_FORMAT_MACROS",
        "-DLOG_TAG=\"libsubzero\"",
+        "-Wno-implicit-fallthrough",
        "-Wno-unused-parameter",
        "-Wno-undefined-var-template",
        "-Wno-unused-lambda-capture",