encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable/avoid some warnings. 

Implement DAWN_DECLARE_UNUSED macro to avoid -Wunneeded-internal-declaration
warning.

Change-Id: I4d087d2b09b74e35ba7ea69533df2c5adef4ef82
Reviewed-on: https://dawn-review.googlesource.com/c/2943
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Stephen White <senorblanco@chromium.org>
This commit is contained in:
Stephen White 2018-12-06 19:01:22 +00:00 committed by Commit Bot service account
parent 5aacd29d5e
commit 0f50114b3c
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
generator/templates/dawn_wire/WireCmd.cpp
View File

@ -110,7 +110,7 @@
}; };
//* Returns the required transfer size for `record` in addition to the transfer structure. //* Returns the required transfer size for `record` in addition to the transfer structure.
size_t {{name}}GetExtraRequiredSize(const {{name}}& record) { DAWN_DECLARE_UNUSED size_t {{name}}GetExtraRequiredSize(const {{name}}& record) {
DAWN_UNUSED(record); DAWN_UNUSED(record);
size_t result = 0; size_t result = 0;

7
src/common/Compiler.h
View File

@ -24,6 +24,9 @@
// (resp. false) to help it generate code that leads to better branch prediction. // (resp. false) to help it generate code that leads to better branch prediction.
// - DAWN_UNUSED(EXPR): Prevents unused variable/expression warnings on EXPR. // - DAWN_UNUSED(EXPR): Prevents unused variable/expression warnings on EXPR.
// - DAWN_UNUSED_FUNC(FUNC): Prevents unused function warnings on FUNC. // - DAWN_UNUSED_FUNC(FUNC): Prevents unused function warnings on FUNC.
// - DAWN_DECLARE_UNUSED: Prevents unused function warnings a subsequent declaration.
// Both DAWN_UNUSED_FUNC and DAWN_DECLARE_UNUSED may be necessary, e.g. to suppress clang's
// unneeded-internal-declaration warning.
// Clang and GCC, check for __clang__ too to catch clang-cl masquarading as MSVC // Clang and GCC, check for __clang__ too to catch clang-cl masquarading as MSVC
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
@ -57,6 +60,8 @@
# define DAWN_NO_DISCARD [[nodiscard]] # define DAWN_NO_DISCARD [[nodiscard]]
# endif # endif
# define DAWN_DECLARE_UNUSED __attribute__((unused))
// MSVC // MSVC
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
# define DAWN_COMPILER_MSVC # define DAWN_COMPILER_MSVC
@ -71,6 +76,8 @@ extern void __cdecl __debugbreak(void);
# define DAWN_NO_DISCARD [[nodiscard]] # define DAWN_NO_DISCARD [[nodiscard]]
# endif # endif
# define DAWN_DECLARE_UNUSED
#else #else
# error "Unsupported compiler" # error "Unsupported compiler"
#endif #endif

8
third_party/BUILD.gn vendored
View File

@ -58,6 +58,9 @@ static_library("spirv_cross") {
"-Wno-return-type", "-Wno-return-type",
"-Wno-sign-compare", "-Wno-sign-compare",
] ]
} else {
# Disable "not all control paths return a value" warning.
cflags_cc = [ "/wd4715" ]
} }
sources = [ sources = [
@ -211,7 +214,10 @@ static_library("glfw") {
# nonstandard extension, function/data pointer conversion in expression # nonstandard extension, function/data pointer conversion in expression
cflags_c = [ "/wd4152" ] cflags_c = [ "/wd4152" ]
} else { } else {
cflags_c = [ "-Wno-sign-compare" ] cflags_c = [
"-Wno-sign-compare",
"-Wno-missing-field-initializers",
]
} }
sources = [ sources = [