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

Add a NXT_NO_DISCARD that is C++17 [[nodiscard]] where available

This commit is contained in:
Corentin Wallez 2018-05-23 16:56:55 -04:00 committed by Corentin Wallez
parent b711b9b2c9
commit b1341db700
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -49,6 +49,7 @@ option(NXT_ENABLE_NULL "Enable compilation of the Null backend" ON)
option(NXT_ENABLE_OPENGL "Enable compilation of the OpenGL backend" ON) option(NXT_ENABLE_OPENGL "Enable compilation of the OpenGL backend" ON)
option(NXT_ENABLE_VULKAN "Enable compilation of the Vulkan backend" OFF) option(NXT_ENABLE_VULKAN "Enable compilation of the Vulkan backend" OFF)
option(NXT_ALWAYS_ASSERT "Enable assertions on all build types" OFF) option(NXT_ALWAYS_ASSERT "Enable assertions on all build types" OFF)
option(NXT_USE_CPP17 "Use some optional C++17 features for compile-time checks" OFF)
################################################################################ ################################################################################
# Precompute compile flags and defines, functions to set them # Precompute compile flags and defines, functions to set them
@ -64,6 +65,12 @@ set(NXT_ENABLE_ASSERTS $<OR:$<CONFIG:Debug>,$<BOOL:${NXT_ALWAYS_ASSERT}>>)
list(APPEND NXT_DEFS $<${NXT_ENABLE_ASSERTS}:NXT_ENABLE_ASSERTS>) list(APPEND NXT_DEFS $<${NXT_ENABLE_ASSERTS}:NXT_ENABLE_ASSERTS>)
if (NXT_USE_CPP17)
list(APPEND NXT_INTERNAL_DEFS "NXT_CPP_VERSION=17")
else()
list(APPEND NXT_INTERNAL_DEFS "NXT_CPP_VERSION=14")
endif()
if (NXT_ENABLE_D3D12) if (NXT_ENABLE_D3D12)
list(APPEND NXT_INTERNAL_DEFS "NXT_ENABLE_BACKEND_D3D12") list(APPEND NXT_INTERNAL_DEFS "NXT_ENABLE_BACKEND_D3D12")
endif() endif()

24
src/common/Compiler.h
View File

@ -19,6 +19,7 @@
// - NXT_COMPILER_[CLANG|GCC|MSVC]: Compiler detection // - NXT_COMPILER_[CLANG|GCC|MSVC]: Compiler detection
// - NXT_BREAKPOINT(): Raises an exception and breaks in the debugger // - NXT_BREAKPOINT(): Raises an exception and breaks in the debugger
// - NXT_BUILTIN_UNREACHABLE(): Hints the compiler that a code path is unreachable // - NXT_BUILTIN_UNREACHABLE(): Hints the compiler that a code path is unreachable
// - NXT_NO_DISCARD: An attribute that is C++17 [[nodiscard]] where available
// Clang and GCC // Clang and GCC
#if defined(__GNUC__) #if defined(__GNUC__)
@ -36,6 +37,19 @@
# define NXT_BUILTIN_UNREACHABLE() __builtin_unreachable() # define NXT_BUILTIN_UNREACHABLE() __builtin_unreachable()
# if !defined(__has_cpp_attribute)
# define __has_cpp_attribute(name) 0
# endif
// Use warn_unused_result on clang otherwise we can a c++1z extension warning in C++14 mode
// Also avoid warn_unused_result with GCC because it is only a function attribute and not a type
// attribute.
# if __has_cpp_attribute(warn_unused_result) && defined(__clang__)
# define NXT_NO_DISCARD __attribute__((warn_unused_result))
# elif NXT_CPP_VERSION >= 17 && __has_cpp_attribute(nodiscard)
# define NXT_NO_DISCARD [[nodiscard]]
# endif
// MSVC // MSVC
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
# define NXT_COMPILER_MSVC # define NXT_COMPILER_MSVC
@ -45,8 +59,18 @@ extern void __cdecl __debugbreak(void);
# define NXT_BUILTIN_UNREACHABLE() __assume(false) # define NXT_BUILTIN_UNREACHABLE() __assume(false)
// Visual Studio 2017 15.3 adds support for [[nodiscard]]
# if _MSC_VER >= 1911 && NXT_CPP_VERSION >= 17
# define NXT_NO_DISCARD [[nodiscard]]
# endif
#else #else
# error "Unsupported compiler" # error "Unsupported compiler"
#endif #endif
// Add noop replacements for macros for features that aren't supported by the compiler.
#if !defined(NXT_NO_DISCARD)
# define NXT_NO_DISCARD
#endif
#endif // COMMON_COMPILER_H_ #endif // COMMON_COMPILER_H_