diff options
| author | Léo Lam <leo@innovatetechnologi.es> | 2018-06-04 20:50:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 20:50:50 +0200 |
| commit | 6ce9c96d91d976cffb95e774e89182c0f79e1e7a (patch) | |
| tree | 9a7df5023e403b26d1fbb0c31388ef468fb5abfd /Source/Core/VideoBackends/Vulkan/ShaderCache.cpp | |
| parent | 2a89ad9c394bbd854d646f6b971335f856ca38be (diff) | |
| parent | fb124c2eb0b4087d85bb6e97b1603c68cc3bccfa (diff) | |
Merge pull request #7027 from leoetlino/cleanup
Use some C++17 features available since GCC 6
Diffstat (limited to 'Source/Core/VideoBackends/Vulkan/ShaderCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/ShaderCache.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Source/Core/VideoBackends/Vulkan/ShaderCache.cpp b/Source/Core/VideoBackends/Vulkan/ShaderCache.cpp index 2fa75f4913..eb03177be9 100644 --- a/Source/Core/VideoBackends/Vulkan/ShaderCache.cpp +++ b/Source/Core/VideoBackends/Vulkan/ShaderCache.cpp @@ -532,14 +532,8 @@ struct VK_PIPELINE_CACHE_HEADER u8 uuid[VK_UUID_SIZE]; }; #pragma pack(pop) -// TODO: Remove the #if here when GCC 5 is a minimum build requirement. -#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 5 -static_assert(std::has_trivial_copy_constructor<VK_PIPELINE_CACHE_HEADER>::value, - "VK_PIPELINE_CACHE_HEADER must be trivially copyable"); -#else static_assert(std::is_trivially_copyable<VK_PIPELINE_CACHE_HEADER>::value, "VK_PIPELINE_CACHE_HEADER must be trivially copyable"); -#endif bool ShaderCache::ValidatePipelineCache(const u8* data, size_t data_length) { |