diff --git a/sdk-1.2.198.0.tar.gz b/sdk-1.2.198.0.tar.gz deleted file mode 100644 index ef90b08..0000000 --- a/sdk-1.2.198.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a70cc5da26baf873fcf69b081eeeda545515dd66e5904f18fee32b4d275593a -size 3555293 diff --git a/sdk-1.3.204.0.tar.gz b/sdk-1.3.204.0.tar.gz new file mode 100644 index 0000000..68d52b4 --- /dev/null +++ b/sdk-1.3.204.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82b59c4622e9d1dbe267c4651bb2514b6b89bee90e512ae7d1d7abc76c833a1d +size 3662632 diff --git a/ver.diff b/ver.diff index b761fe7..b0215b2 100644 --- a/ver.diff +++ b/ver.diff @@ -5,14 +5,16 @@ We do not want static archives in openSUSE, so need to turn on SHARED mode. As a result, a version needs to be added. --- CMakeLists.txt | 3 ++- + layers/CMakeLists.txt | 2 +- layers/vk_layer_config.h | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) + tests/CMakeLists.txt | 2 +- + 4 files changed, 5 insertions(+), 4 deletions(-) -Index: Vulkan-ValidationLayers-sdk-1.2.189.0/CMakeLists.txt +Index: Vulkan-ValidationLayers-sdk-1.3.204.0/CMakeLists.txt =================================================================== ---- Vulkan-ValidationLayers-sdk-1.2.189.0.orig/CMakeLists.txt -+++ Vulkan-ValidationLayers-sdk-1.2.189.0/CMakeLists.txt -@@ -343,11 +343,12 @@ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/s +--- Vulkan-ValidationLayers-sdk-1.3.204.0.orig/CMakeLists.txt ++++ Vulkan-ValidationLayers-sdk-1.3.204.0/CMakeLists.txt +@@ -319,11 +319,12 @@ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/s # files directly in layers. add_library(VkLayer_utils @@ -21,15 +23,28 @@ Index: Vulkan-ValidationLayers-sdk-1.2.189.0/CMakeLists.txt layers/vk_layer_config.cpp layers/vk_layer_extension_utils.cpp layers/vk_layer_utils.cpp - layers/vk_format_utils.cpp) + layers/generated/vk_format_utils.cpp) +set_target_properties(VkLayer_utils PROPERTIES OUTPUT_NAME "VkLayer_utils-@PACKAGE_VERSION@") target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers) set_target_properties(VkLayer_utils PROPERTIES CXX_STANDARD ${VVL_CPP_STANDARD}) if (VVL_ENABLE_ASAN) -Index: Vulkan-ValidationLayers-sdk-1.2.189.0/layers/vk_layer_config.h +Index: Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt =================================================================== ---- Vulkan-ValidationLayers-sdk-1.2.189.0.orig/layers/vk_layer_config.h -+++ Vulkan-ValidationLayers-sdk-1.2.189.0/layers/vk_layer_config.h +--- Vulkan-ValidationLayers-sdk-1.3.204.0.orig/layers/CMakeLists.txt ++++ Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt +@@ -315,7 +315,7 @@ if(BUILD_LAYERS) + 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 SPIRV-Tools-opt) + + + # The output file needs Unix "/" separators or Windows "\" separators On top of that, Windows separators actually need to be doubled +Index: Vulkan-ValidationLayers-sdk-1.3.204.0/layers/vk_layer_config.h +=================================================================== +--- Vulkan-ValidationLayers-sdk-1.3.204.0.orig/layers/vk_layer_config.h ++++ Vulkan-ValidationLayers-sdk-1.3.204.0/layers/vk_layer_config.h @@ -33,7 +33,7 @@ #define SECONDARY_VK_REGISTRY_HIVE_STR "HKEY_CURRENT_USER" #endif @@ -39,3 +54,16 @@ Index: Vulkan-ValidationLayers-sdk-1.2.189.0/layers/vk_layer_config.h #ifdef __cplusplus extern "C" { +Index: Vulkan-ValidationLayers-sdk-1.3.204.0/tests/CMakeLists.txt +=================================================================== +--- Vulkan-ValidationLayers-sdk-1.3.204.0.orig/tests/CMakeLists.txt ++++ Vulkan-ValidationLayers-sdk-1.3.204.0/tests/CMakeLists.txt +@@ -154,7 +154,7 @@ target_link_libraries(vk_layer_validatio + PRIVATE VkLayer_utils + ${GLSLANG_LIBRARIES} + SPIRV-Headers::SPIRV-Headers +- SPIRV-Tools-static SPIRV-Tools-opt ++ SPIRV-Tools SPIRV-Tools-opt + GTest::gtest GTest::gtest_main) + + if(NOT WIN32) diff --git a/vulkan-validationlayers.changes b/vulkan-validationlayers.changes index c6fb5b7..36ba18a 100644 --- a/vulkan-validationlayers.changes +++ b/vulkan-validationlayers.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Sat Feb 19 17:24:34 UTC 2022 - Jan Engelhardt + +- Update to release SDK-1.3.204.0 + * layers: Add VK_KHR_dynamic_rendering and + VK_ARM_rasterization_order_attachment_access VUs + * layers: Validate VK_EXT_image_view_min_lod + * layers: Add VK_EXT_depth_clip_control + * layers: Add SPIR-V Instruction Table + * layers: Validate 1.3 extended dynamic state and 1.3 private data + ------------------------------------------------------------------- Sat Nov 27 13:51:38 UTC 2021 - Jan Engelhardt diff --git a/vulkan-validationlayers.spec b/vulkan-validationlayers.spec index ed41297..dac0c90 100644 --- a/vulkan-validationlayers.spec +++ b/vulkan-validationlayers.spec @@ -1,7 +1,7 @@ # # spec file for package vulkan-validationlayers # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,9 @@ Name: vulkan-validationlayers -Version: 1.2.198.0 +Version: 1.3.204.0 Release: 0 -%define lname libVkLayer_utils-1_2_198_0 +%define lname libVkLayer_utils-1_3_204_0 Summary: Validation layers for Vulkan License: Apache-2.0 Group: Development/Tools/Other @@ -35,8 +35,8 @@ BuildRequires: glslang-devel >= 11.4.0 BuildRequires: memory-constraints BuildRequires: pkg-config BuildRequires: python3-base -BuildRequires: spirv-headers >= 1.5.4.g81 -BuildRequires: spirv-tools-devel >= 2021.2 +BuildRequires: spirv-headers >= 1.6.g6 +BuildRequires: spirv-tools-devel >= 2022.2~sdk204 BuildRequires: xxhash-devel BuildRequires: pkgconfig(vulkan) >= 1.2.176 BuildRequires: pkgconfig(x11) diff --git a/xxhash.diff b/xxhash.diff index 60e7f72..3dba604 100644 --- a/xxhash.diff +++ b/xxhash.diff @@ -7,23 +7,23 @@ bundled one), it makes sense to build ValidationLayers itself with the system xxhash as well, so that the ABI matches. --- - layers/CMakeLists.txt | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) + layers/CMakeLists.txt | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) -Index: Vulkan-ValidationLayers-sdk-1.2.176.0/layers/CMakeLists.txt +Index: Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt =================================================================== ---- Vulkan-ValidationLayers-sdk-1.2.176.0.orig/layers/CMakeLists.txt -+++ Vulkan-ValidationLayers-sdk-1.2.176.0/layers/CMakeLists.txt -@@ -61,8 +61,6 @@ if(BUILD_LAYER_SUPPORT_FILES) +--- Vulkan-ValidationLayers-sdk-1.3.204.0.orig/layers/CMakeLists.txt ++++ Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt +@@ -59,8 +59,6 @@ if(BUILD_LAYER_SUPPORT_FILES) vk_layer_utils.h vk_layer_utils.cpp vk_loader_platform.h - xxhash.h - xxhash.c + generated/vk_format_utils.h + generated/vk_format_utils.cpp generated/vk_validation_error_messages.h - generated/vk_layer_dispatch_table.h - generated/vk_dispatch_table_helper.h -@@ -173,7 +171,7 @@ set(CORE_VALIDATION_LIBRARY_FILES +@@ -198,7 +196,7 @@ set(CORE_VALIDATION_LIBRARY_FILES generated/synchronization_validation_types.cpp gpu_validation.cpp generated/corechecks_optick_instrumentation.cpp @@ -32,12 +32,11 @@ Index: Vulkan-ValidationLayers-sdk-1.2.176.0/layers/CMakeLists.txt set(OBJECT_LIFETIMES_LIBRARY_FILES generated/object_tracker.cpp -@@ -280,7 +278,7 @@ if(BUILD_LAYERS) - if (USE_ROBIN_HOOD_HASHING) - target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR}) +@@ -316,6 +314,7 @@ if(BUILD_LAYERS) endif() -- target_link_libraries(VkLayer_khronos_validation PRIVATE ${SPIRV_TOOLS_LIBRARIES}) -+ target_link_libraries(VkLayer_khronos_validation PRIVATE ${SPIRV_TOOLS_LIBRARIES} -lxxhash) + + target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools SPIRV-Tools-opt) ++ target_link_libraries(VkLayer_khronos_validation PRIVATE -lxxhash) + # 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