forked from pool/vulkan-validationlayers
52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: 2020-08-29 10:10:12.022296526 +0200
|
|
|
|
Avoid the installation of a custom xxhash.h header. Since vk_*.h header files
|
|
still include xxhash.h (and now would source the system xxhash instead of the
|
|
bundled one), it makes sense to build ValidationLayers itself with the system
|
|
xxhash as well, so that the ABI matches.
|
|
|
|
---
|
|
layers/CMakeLists.txt | 2 +-
|
|
layers/utils/hash_util.cpp | 5 +----
|
|
2 files changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
Index: Vulkan-ValidationLayers-vulkan-sdk-1.3.296.0/layers/CMakeLists.txt
|
|
===================================================================
|
|
--- Vulkan-ValidationLayers-vulkan-sdk-1.3.296.0.orig/layers/CMakeLists.txt
|
|
+++ Vulkan-ValidationLayers-vulkan-sdk-1.3.296.0/layers/CMakeLists.txt
|
|
@@ -30,7 +30,6 @@ target_sources(VkLayer_utils PRIVATE
|
|
error_message/error_strings.h
|
|
error_message/record_object.h
|
|
error_message/log_message_type.h
|
|
- external/xxhash.h
|
|
external/inplace_function.h
|
|
${API_TYPE}/generated/error_location_helper.cpp
|
|
${API_TYPE}/generated/error_location_helper.h
|
|
@@ -75,6 +74,7 @@ target_link_libraries(VkLayer_utils PUBL
|
|
Vulkan::SafeStruct
|
|
Vulkan::UtilityHeaders
|
|
${CMAKE_DL_LIBS}
|
|
+ -lxxhash
|
|
)
|
|
target_include_directories(VkLayer_utils SYSTEM PRIVATE external)
|
|
target_include_directories(VkLayer_utils PUBLIC . ${API_TYPE})
|
|
Index: Vulkan-ValidationLayers-vulkan-sdk-1.3.296.0/layers/utils/hash_util.cpp
|
|
===================================================================
|
|
--- Vulkan-ValidationLayers-vulkan-sdk-1.3.296.0.orig/layers/utils/hash_util.cpp
|
|
+++ Vulkan-ValidationLayers-vulkan-sdk-1.3.296.0/layers/utils/hash_util.cpp
|
|
@@ -23,12 +23,9 @@
|
|
#define XXH_IMPLEMENTATION
|
|
|
|
// Only include xxhash.h once!
|
|
-#include "external/xxhash.h"
|
|
+#include <xxhash.h>
|
|
|
|
// Currently using version v0.8.2 of xxhash
|
|
-static_assert(XXH_VERSION_MAJOR == 0);
|
|
-static_assert(XXH_VERSION_MINOR == 8);
|
|
-static_assert(XXH_VERSION_RELEASE == 2);
|
|
|
|
namespace hash_util {
|
|
|