summaryrefslogtreecommitdiff
path: root/graphics/vulkan-validation-layers
diff options
context:
space:
mode:
Diffstat (limited to 'graphics/vulkan-validation-layers')
-rw-r--r--graphics/vulkan-validation-layers/Makefile4
-rw-r--r--graphics/vulkan-validation-layers/distinfo10
-rw-r--r--graphics/vulkan-validation-layers/files/patch-revert55
3 files changed, 41 insertions, 28 deletions
diff --git a/graphics/vulkan-validation-layers/Makefile b/graphics/vulkan-validation-layers/Makefile
index be0ffe7fd195..f94aabf7a680 100644
--- a/graphics/vulkan-validation-layers/Makefile
+++ b/graphics/vulkan-validation-layers/Makefile
@@ -1,6 +1,6 @@
PORTNAME= vulkan-validation-layers
DISTVERSIONPREFIX= v
-DISTVERSION= 1.2.203
+DISTVERSION= 1.3.204
CATEGORIES= graphics
MAINTAINER= jbeich@FreeBSD.org
@@ -17,7 +17,7 @@ USE_GITHUB= yes
USE_LDCONFIG= yes
GH_ACCOUNT= KhronosGroup
GH_PROJECT= Vulkan-ValidationLayers
-GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-123-g814e728:headers/external/spirv-headers \
+GH_TUPLE= KhronosGroup:SPIRV-Headers:1.5.4.raytracing.fixed-137-gb42ba6d:headers/external/spirv-headers \
martinus:robin-hood-hashing:3.11.3:robin_hood/external/robin-hood-hashing
CMAKE_OFF= BUILD_TESTS
CMAKE_ON= BUILD_LAYER_SUPPORT_FILES
diff --git a/graphics/vulkan-validation-layers/distinfo b/graphics/vulkan-validation-layers/distinfo
index c2c473f30683..86bec8fb6dc0 100644
--- a/graphics/vulkan-validation-layers/distinfo
+++ b/graphics/vulkan-validation-layers/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1640106300
-SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.2.203_GH0.tar.gz) = 55aa46a001993fe1ab4177d5a03c5e90091dc674d716a560dc0e6c8a1e0158f9
-SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.2.203_GH0.tar.gz) = 3588824
-SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-123-g814e728_GH0.tar.gz) = e4880dccda018f63cdc684afd5e51972d8ad2e3f21e9bab346a865370ea2929e
-SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-123-g814e728_GH0.tar.gz) = 416402
+TIMESTAMP = 1643412585
+SHA256 (KhronosGroup-Vulkan-ValidationLayers-v1.3.204_GH0.tar.gz) = 5ff70d7d7bdd50154fd0e41c72d9e7e4fc9c001fb2d82ffe0009804f2070d0bf
+SIZE (KhronosGroup-Vulkan-ValidationLayers-v1.3.204_GH0.tar.gz) = 3657540
+SHA256 (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-137-gb42ba6d_GH0.tar.gz) = 44985641ced3c7973adc829714ab650e3ae49a741aad1b287a1c1904841d8a67
+SIZE (KhronosGroup-SPIRV-Headers-1.5.4.raytracing.fixed-137-gb42ba6d_GH0.tar.gz) = 417861
SHA256 (martinus-robin-hood-hashing-3.11.3_GH0.tar.gz) = dcf2b7fa9ef9dd0c67102d94c28e8df3effbe1845e0ed1f31f4772ca5e857fc4
SIZE (martinus-robin-hood-hashing-3.11.3_GH0.tar.gz) = 170788
diff --git a/graphics/vulkan-validation-layers/files/patch-revert b/graphics/vulkan-validation-layers/files/patch-revert
index 17c3058659c5..9f7ee4c9bb64 100644
--- a/graphics/vulkan-validation-layers/files/patch-revert
+++ b/graphics/vulkan-validation-layers/files/patch-revert
@@ -13,7 +13,7 @@ CMake Error at CMakeLists.txt:254 (find_package):
"robin_hood" provides a separate development package or SDK, be sure it has
been installed.
---- CMakeLists.txt.orig 2021-12-21 17:05:00 UTC
+--- CMakeLists.txt.orig 2022-01-28 00:29:34 UTC
+++ CMakeLists.txt
@@ -102,21 +102,7 @@ else()
message("********************************************************************************")
@@ -37,25 +37,29 @@ CMake Error at CMakeLists.txt:254 (find_package):
if (TARGET Vulkan::Headers)
message(STATUS "Using Vulkan headers from Vulkan::Headers target")
get_target_property(VulkanHeaders_INCLUDE_DIRS Vulkan::Headers INTERFACE_INCLUDE_DIRECTORIES)
-@@ -251,13 +237,12 @@ option(BUILD_LAYERS "Build layers" ON)
- option(BUILD_LAYER_SUPPORT_FILES "Generate layer files" OFF) # For generating files when not building layers
+@@ -252,17 +238,13 @@ option(BUILD_LAYER_SUPPORT_FILES "Generate layer files
option(USE_ROBIN_HOOD_HASHING "Use robin-hood-hashing" ON)
if (USE_ROBIN_HOOD_HASHING)
-- find_package(robin_hood REQUIRED CONFIG)
-+ if(NOT ROBIN_HOOD_HASHING_INSTALL_DIR)
-+ set(ROBIN_HOOD_HASHING_INSTALL_DIR $ENV{ROBIN_HOOD_HASHING_INSTALL_DIR} PATH "Path to robin-hood-hashing repository")
-+ endif()
-+ set(ROBIN_HOOD_HASHING_INCLUDE_DIR "${ROBIN_HOOD_HASHING_INSTALL_DIR}/src/include" PATH "Path to robin-hood-hashing/src/include")
+ if (NOT TARGET robin_hood::robin_hood)
+- find_package(robin_hood REQUIRED CONFIG)
++ if(NOT ROBIN_HOOD_HASHING_INSTALL_DIR)
++ set(ROBIN_HOOD_HASHING_INSTALL_DIR $ENV{ROBIN_HOOD_HASHING_INSTALL_DIR} PATH "Path to robin-hood-hashing repository")
++ endif()
++ set(ROBIN_HOOD_HASHING_INCLUDE_DIR "${ROBIN_HOOD_HASHING_INSTALL_DIR}/src/include" PATH "Path to robin-hood-hashing/src/include")
+ endif()
endif()
+-set(SPIRV_HEADERS_INCLUDE_DIR "" CACHE STRING "")
-if(BUILD_LAYERS OR BUILD_TESTS)
-- find_package(SPIRV-Headers REQUIRED CONFIG)
+- if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "")
+- find_package(SPIRV-Headers REQUIRED CONFIG)
+- endif()
-endif()
-
if(BUILD_TESTS)
set(GLSLANG_INSTALL_DIR "GLSLANG-NOTFOUND" CACHE PATH "Absolute path to a glslang install directory")
if(NOT GLSLANG_INSTALL_DIR AND NOT DEFINED ENV{GLSLANG_INSTALL_DIR} AND NOT TARGET glslang)
-@@ -269,7 +254,20 @@ if(BUILD_TESTS)
+@@ -274,7 +256,20 @@ if(BUILD_TESTS)
set(GLSLANG_INSTALL_DIR $ENV{GLSLANG_INSTALL_DIR})
endif()
@@ -76,7 +80,7 @@ CMake Error at CMakeLists.txt:254 (find_package):
message(STATUS "Using glslang install located at ${GLSLANG_INSTALL_DIR}")
set(GLSLANG_SEARCH_PATH "${GLSLANG_INSTALL_DIR}/lib")
set(GLSLANG_DEBUG_SEARCH_PATH "${GLSLANG_INSTALL_DIR}/lib")
-@@ -304,6 +302,34 @@ if(BUILD_TESTS)
+@@ -309,6 +304,34 @@ if(BUILD_TESTS)
endif()
endif()
@@ -111,7 +115,7 @@ CMake Error at CMakeLists.txt:254 (find_package):
# Generate dependent helper files ------------------------------------------------------------------------------------------------
set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/scripts")
-@@ -346,7 +372,7 @@ target_include_directories(VkLayer_utils
+@@ -351,7 +374,7 @@ target_include_directories(VkLayer_utils
${VulkanHeaders_INCLUDE_DIR})
if (USE_ROBIN_HOOD_HASHING)
@@ -120,7 +124,7 @@ CMake Error at CMakeLists.txt:254 (find_package):
target_compile_definitions(VkLayer_utils PUBLIC USE_ROBIN_HOOD_HASHING)
endif()
-@@ -387,8 +413,37 @@ endif()
+@@ -392,8 +415,37 @@ endif()
if(BUILD_TESTS)
# Attempt to enable googletest if available.
@@ -160,18 +164,22 @@ CMake Error at CMakeLists.txt:254 (find_package):
endif()
if(BUILD_LAYERS OR BUILD_LAYER_SUPPORT_FILES)
---- layers/CMakeLists.txt.orig 2021-12-21 17:05:00 UTC
+--- layers/CMakeLists.txt.orig 2022-01-28 00:29:34 UTC
+++ layers/CMakeLists.txt
-@@ -269,8 +269,6 @@ if(INSTRUMENT_OPTICK)
+@@ -270,12 +270,6 @@ if(INSTRUMENT_OPTICK)
endif()
if(BUILD_LAYERS)
-- find_package(SPIRV-Tools REQUIRED CONFIG)
-- find_package(SPIRV-Tools-opt REQUIRED CONFIG)
+- if (NOT TARGET SPIRV-Tools)
+- find_package(SPIRV-Tools REQUIRED CONFIG)
+- endif()
+- if (NOT TARGET SPIRV-Tools-opt)
+- find_package(SPIRV-Tools-opt REQUIRED CONFIG)
+- endif()
AddVkLayer(khronos_validation "${KHRONOS_LAYER_COMPILE_DEFINITIONS}"
${CHASSIS_LIBRARY_FILES}
${CORE_VALIDATION_LIBRARY_FILES}
-@@ -298,14 +296,15 @@ if(BUILD_LAYERS)
+@@ -303,19 +297,16 @@ if(BUILD_LAYERS)
# Khronos validation additional dependencies
target_include_directories(VkLayer_khronos_validation PRIVATE ${GLSLANG_INCLUDE_DIR})
@@ -183,12 +191,17 @@ CMake Error at CMakeLists.txt:254 (find_package):
if (USE_ROBIN_HOOD_HASHING)
target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR})
endif()
-- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Headers::SPIRV-Headers SPIRV-Tools-static SPIRV-Tools-opt)
--
+- if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "")
+- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Headers::SPIRV-Headers)
+- else()
+- target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
+- endif()
+
+- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt)
+ target_link_libraries(VkLayer_khronos_validation PRIVATE ${SPIRV_TOOLS_LIBRARIES})
+
# The output file needs Unix "/" separators or Windows "\" separators On top of that, Windows separators actually need to be doubled
- # because the json format uses backslash escapes
--- scripts/common_ci.py.orig 2021-12-21 17:05:00 UTC
+++ scripts/common_ci.py
@@ -76,6 +76,16 @@ def BuildVVL(args, build_tests=False):