Commit 850c9462 by Greg Hartman

Fix some warnings

I sheilded a MSVC pragma, silenced some classes of warnings. One of the classes involves an overload that hides a member function. I filed a bug to make certain that this isn't masking a coding error: https://b.corp.google.com/issues/22117892 Change-Id: I7090cddc78880c9ee7814aecc72cc107003dfede Reviewed-on: https://swiftshader-review.googlesource.com/3483Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarGreg Hartman <ghartman@google.com>
parent 52862824
......@@ -73,7 +73,12 @@ LOCAL_SRC_FILES += \
OpenGL/common/Object.cpp \
OpenGL/common/MatrixStack.cpp \
LOCAL_CFLAGS += -DLOG_TAG=\"swiftshader\" -Wno-unused-parameter -DDISPLAY_LOGO=0
LOCAL_CFLAGS += -DLOG_TAG=\"swiftshader\" \
-Wno-unused-parameter \
-DDISPLAY_LOGO=0 \
-Wno-implicit-exception-spec-mismatch \
-Wno-overloaded-virtual
LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
LOCAL_CFLAGS += -std=c++11
......
......@@ -13,7 +13,9 @@
#define sw_MetaMacro_hpp
// Disables the "identifier was truncated to '255' characters in the browser information" warning
#ifdef _MSC_VER
#pragma warning(disable: 4786)
#endif
namespace Meta
{
......
......@@ -396,7 +396,11 @@ LOCAL_SRC_FILES += \
lib/VMCore/Verifier.cpp \
LOCAL_CFLAGS += -DLOG_TAG=\"libLLVM_swiftshader\" -Wno-unused-parameter
LOCAL_CFLAGS += -DLOG_TAG=\"libLLVM_swiftshader\" \
-Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \
-Wno-overloaded-virtual
LOCAL_CFLAGS += -fomit-frame-pointer -Os -ffunction-sections -fdata-sections
LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
LOCAL_CFLAGS += -std=c++11
......
......@@ -43,13 +43,16 @@ LOCAL_SRC_FILES += \
ValidateLimitations.cpp \
ValidateSwitch.cpp \
LOCAL_CFLAGS += -DLOG_TAG=\"swiftshader_compiler\" -Wno-unused-parameter
LOCAL_CFLAGS += -DLOG_TAG=\"swiftshader_compiler\" \
-Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \
-Wno-overloaded-virtual
# Android's make system also uses NDEBUG, so we need to set/unset it forcefully
# Uncomment for ON:
# LOCAL_CFLAGS += -UNDEBUG -g -O0
# Uncomment for OFF:
LOCAL_CFLAGS += -fomit-frame-pointer -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE
LOCAL_CFLAGS += -ffunction-sections -fdata-sections -DANGLE_DISABLE_TRACE
LOCAL_CFLAGS += -fno-operator-names -msse2 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
LOCAL_CFLAGS += -std=c++11
......
......@@ -5,7 +5,9 @@ COMMON_CFLAGS := \
-std=c++11 \
-DEGLAPI= \
-DEGL_EGLEXT_PROTOTYPES \
-Wno-unused-parameter
-Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \
-Wno-overloaded-virtual
COMMON_SRC_FILES := \
Config.cpp \
......
......@@ -11,7 +11,9 @@ COMMON_CFLAGS := \
-DGL_API= \
-DGL_APICALL= \
-DGL_GLEXT_PROTOTYPES \
-Wno-unused-parameter
-Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \
-Wno-overloaded-virtual
COMMON_SRC_FILES := \
......
......@@ -10,7 +10,9 @@ COMMON_CFLAGS := \
-DGL_API= \
-DGL_APICALL= \
-DGL_GLEXT_PROTOTYPES \
-Wno-unused-parameter
-Wno-unused-parameter \
-Wno-implicit-exception-spec-mismatch \
-Wno-overloaded-virtual
COMMON_SRC_FILES := \
Buffer.cpp \
......
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