diff options
| author | Léo Lam <leo@leolam.fr> | 2023-04-14 01:29:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-14 01:29:46 +0100 |
| commit | ae18aa0639bdf2d51c8bf738bd7f794d89aa22e4 (patch) | |
| tree | 1dc008a5333267aea8e48c20f5a59029b9aba27e /Source/Core/VideoCommon/VertexLoaderManager.cpp | |
| parent | 5c03b8af88e80e9502dcb0b20e17d9debf2617b3 (diff) | |
| parent | f29019180f12e8287661ebde19f0b1baed966bc9 (diff) | |
Merge pull request #11687 from Minty-Meeo/warnings
Resolve GCC/Clang Warnings
Diffstat (limited to 'Source/Core/VideoCommon/VertexLoaderManager.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoaderManager.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Source/Core/VideoCommon/VertexLoaderManager.cpp b/Source/Core/VideoCommon/VertexLoaderManager.cpp index 0236201001..fb24803f1c 100644 --- a/Source/Core/VideoCommon/VertexLoaderManager.cpp +++ b/Source/Core/VideoCommon/VertexLoaderManager.cpp @@ -8,6 +8,7 @@ #include <memory> #include <mutex> #include <string> +#include <type_traits> #include <unordered_map> #include <utility> #include <vector> @@ -153,14 +154,8 @@ NativeVertexFormat* GetUberVertexFormat(const PortableVertexDeclaration& decl) // The padding in the structs can cause the memcmp() in the map to create duplicates. // Avoid this by initializing the padding to zero. PortableVertexDeclaration new_decl; -#ifdef __GNUC__ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wclass-memaccess" -#endif - std::memset(&new_decl, 0, sizeof(new_decl)); -#ifdef __GNUC__ -#pragma GCC diagnostic pop -#endif + static_assert(std::is_trivially_copyable_v<PortableVertexDeclaration>); + std::memset(static_cast<void*>(&new_decl), 0, sizeof(new_decl)); new_decl.stride = decl.stride; auto MakeDummyAttribute = [](AttributeFormat& attr, ComponentFormat type, int components, |