Skip to content

S
swiftshader
Commit 7cfb50cd by Nicolas Capens Committed by Nicolas Capens
Options

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: 's avatarGreg Hartman <ghartman@google.com> Reviewed-by: 's avatarChris Forbes <chrisforbes@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com>
parent 2661e840
Showing with 13 additions and 2 deletions
src/Android.bp
...@@ -32,6 +32,7 @@ cc_defaults { ...@@ -32,6 +32,7 @@ cc_defaults {
"-DNO_SANITIZE_FUNCTION=", "-DNO_SANITIZE_FUNCTION=",
// FIXME: Use <android/api-level.h> instead? // FIXME: Use <android/api-level.h> instead?
"-DANDROID_PLATFORM_SDK_VERSION=10000", "-DANDROID_PLATFORM_SDK_VERSION=10000",
"-Wno-implicit-fallthrough",
"-Wno-unused-parameter", "-Wno-unused-parameter",
"-Wno-unused-local-typedef", "-Wno-unused-local-typedef",
], ],
......
src/Android.mk
...@@ -128,6 +128,7 @@ COMMON_CFLAGS := \ ...@@ -128,6 +128,7 @@ COMMON_CFLAGS := \
-Wno-unused-value \ -Wno-unused-value \
-Wno-unused-variable \ -Wno-unused-variable \
-Wno-implicit-exception-spec-mismatch \ -Wno-implicit-exception-spec-mismatch \
-Wno-implicit-fallthrough \
-Wno-overloaded-virtual \ -Wno-overloaded-virtual \
-Wno-non-virtual-dtor \ -Wno-non-virtual-dtor \
-Wno-attributes \ -Wno-attributes \
......
src/OpenGL/compiler/Android.mk
...@@ -29,6 +29,7 @@ COMMON_CFLAGS := \ ...@@ -29,6 +29,7 @@ COMMON_CFLAGS := \
-Wno-unused-parameter \ -Wno-unused-parameter \
-Wno-unused-variable \ -Wno-unused-variable \
-Wno-implicit-exception-spec-mismatch \ -Wno-implicit-exception-spec-mismatch \
-Wno-implicit-fallthrough \
-Wno-overloaded-virtual \ -Wno-overloaded-virtual \
-Wno-attributes \ -Wno-attributes \
-Wno-unknown-attributes \ -Wno-unknown-attributes \
......
src/OpenGL/libEGL/Android.mk
...@@ -13,6 +13,7 @@ COMMON_CFLAGS := \ ...@@ -13,6 +13,7 @@ COMMON_CFLAGS := \
-Wno-unused-function \ -Wno-unused-function \
-Wno-unused-parameter \ -Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \ -Wno-implicit-exception-spec-mismatch \
-Wno-implicit-fallthrough \
-Wno-overloaded-virtual \ -Wno-overloaded-virtual \
-Wno-attributes \ -Wno-attributes \
-Wno-unknown-attributes \ -Wno-unknown-attributes \
......
src/OpenGL/libGLES_CM/Android.mk
...@@ -20,6 +20,7 @@ COMMON_CFLAGS := \ ...@@ -20,6 +20,7 @@ COMMON_CFLAGS := \
-Wno-unused-parameter \ -Wno-unused-parameter \
-Wno-unused-variable \ -Wno-unused-variable \
-Wno-implicit-exception-spec-mismatch \ -Wno-implicit-exception-spec-mismatch \
-Wno-implicit-fallthrough \
-Wno-overloaded-virtual \ -Wno-overloaded-virtual \
-Wno-attributes \ -Wno-attributes \
-Wno-unknown-attributes \ -Wno-unknown-attributes \
......
src/OpenGL/libGLESv2/Android.mk
...@@ -20,6 +20,7 @@ COMMON_CFLAGS := \ ...@@ -20,6 +20,7 @@ COMMON_CFLAGS := \
-Wno-unused-private-field \ -Wno-unused-private-field \
-Wno-unused-variable \ -Wno-unused-variable \
-Wno-implicit-exception-spec-mismatch \ -Wno-implicit-exception-spec-mismatch \
-Wno-implicit-fallthrough \
-Wno-overloaded-virtual \ -Wno-overloaded-virtual \
-Wno-attributes \ -Wno-attributes \
-Wno-unknown-attributes \ -Wno-unknown-attributes \
......
src/OpenGL/libGLESv2/libGLESv2.cpp
...@@ -5624,6 +5624,8 @@ void VertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normal ...@@ -5624,6 +5624,8 @@ void VertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normal
case GL_FLOAT: case GL_FLOAT:
case GL_HALF_FLOAT_OES: // GL_OES_vertex_half_float case GL_HALF_FLOAT_OES: // GL_OES_vertex_half_float
case GL_HALF_FLOAT: case GL_HALF_FLOAT:
case GL_INT:
case GL_UNSIGNED_INT:
break; break;
case GL_INT_2_10_10_10_REV: case GL_INT_2_10_10_10_REV:
case GL_UNSIGNED_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 ...@@ -5631,8 +5633,6 @@ void VertexAttribPointer(GLuint index, GLint size, GLenum type, GLboolean normal
{ {
return error(GL_INVALID_OPERATION); return error(GL_INVALID_OPERATION);
} }
case GL_INT:
case GL_UNSIGNED_INT:
break; break;
default: default:
return error(GL_INVALID_ENUM); return error(GL_INVALID_ENUM);
......
src/Reactor/Android.mk
...@@ -116,6 +116,7 @@ LOCAL_CFLAGS += \ ...@@ -116,6 +116,7 @@ LOCAL_CFLAGS += \
-Wno-unused-lambda-capture \ -Wno-unused-lambda-capture \
-Wno-unused-parameter \ -Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \ -Wno-implicit-exception-spec-mismatch \
-Wno-implicit-fallthrough \
-Wno-overloaded-virtual \ -Wno-overloaded-virtual \
-Wno-non-virtual-dtor \ -Wno-non-virtual-dtor \
-Wno-unknown-warning-option \ -Wno-unknown-warning-option \
......
third_party/LLVM/Android.bp
...@@ -59,6 +59,7 @@ cc_library_static { ...@@ -59,6 +59,7 @@ cc_library_static {
"-D__STDC_CONSTANT_MACROS", "-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS", "-D__STDC_FORMAT_MACROS",
"-DLOG_TAG=\"libLLVM_swiftshader\"", "-DLOG_TAG=\"libLLVM_swiftshader\"",
"-Wno-implicit-fallthrough",
"-Wno-unused-result", "-Wno-unused-result",
"-Wno-unused-function", "-Wno-unused-function",
"-Wno-unused-variable", "-Wno-unused-variable",
......
third_party/LLVM/Android.mk
...@@ -401,6 +401,7 @@ LOCAL_CFLAGS += \ ...@@ -401,6 +401,7 @@ LOCAL_CFLAGS += \
-Wall \ -Wall \
-Werror \ -Werror \
-Wno-implicit-exception-spec-mismatch \ -Wno-implicit-exception-spec-mismatch \
-Wno-implicit-fallthrough \
-Wno-overloaded-virtual \ -Wno-overloaded-virtual \
-Wno-undefined-var-template \ -Wno-undefined-var-template \
-Wno-unneeded-internal-declaration \ -Wno-unneeded-internal-declaration \
......
third_party/llvm-subzero/Android.bp
...@@ -28,6 +28,7 @@ cc_library_static { ...@@ -28,6 +28,7 @@ cc_library_static {
"-D__STDC_CONSTANT_MACROS", "-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS", "-D__STDC_FORMAT_MACROS",
"-DLOG_TAG=\"libsubzero\"", "-DLOG_TAG=\"libsubzero\"",
"-Wno-implicit-fallthrough",
"-Wno-unused-parameter", "-Wno-unused-parameter",
], ],
......
third_party/subzero/Android.bp
...@@ -28,6 +28,7 @@ cc_library_static { ...@@ -28,6 +28,7 @@ cc_library_static {
"-D__STDC_CONSTANT_MACROS", "-D__STDC_CONSTANT_MACROS",
"-D__STDC_FORMAT_MACROS", "-D__STDC_FORMAT_MACROS",
"-DLOG_TAG=\"libsubzero\"", "-DLOG_TAG=\"libsubzero\"",
"-Wno-implicit-fallthrough",
"-Wno-unused-parameter", "-Wno-unused-parameter",
"-Wno-undefined-var-template", "-Wno-undefined-var-template",
"-Wno-unused-lambda-capture", "-Wno-unused-lambda-capture",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment