diff --git a/sdk-1.3.204.0.tar.gz b/sdk-1.3.204.0.tar.gz deleted file mode 100644 index 68d52b4..0000000 --- a/sdk-1.3.204.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82b59c4622e9d1dbe267c4651bb2514b6b89bee90e512ae7d1d7abc76c833a1d -size 3662632 diff --git a/sdk-1.3.211.0.tar.gz b/sdk-1.3.211.0.tar.gz new file mode 100644 index 0000000..51b4b39 --- /dev/null +++ b/sdk-1.3.211.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:927c1cb98c81fe8a1a529cf2d977d701dcda49c495a19583dc00e178b6757203 +size 3967709 diff --git a/ver.diff b/ver.diff index b0215b2..b7710c8 100644 --- a/ver.diff +++ b/ver.diff @@ -5,16 +5,14 @@ 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 +- - tests/CMakeLists.txt | 2 +- - 4 files changed, 5 insertions(+), 4 deletions(-) + 2 files changed, 3 insertions(+), 2 deletions(-) -Index: Vulkan-ValidationLayers-sdk-1.3.204.0/CMakeLists.txt +Index: Vulkan-ValidationLayers-sdk-1.3.211.0/CMakeLists.txt =================================================================== ---- 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 +--- Vulkan-ValidationLayers-sdk-1.3.211.0.orig/CMakeLists.txt ++++ Vulkan-ValidationLayers-sdk-1.3.211.0/CMakeLists.txt +@@ -351,11 +351,12 @@ set(SCRIPTS_DIR "${PROJECT_SOURCE_DIR}/s # files directly in layers. add_library(VkLayer_utils @@ -28,23 +26,10 @@ Index: Vulkan-ValidationLayers-sdk-1.3.204.0/CMakeLists.txt 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.3.204.0/layers/CMakeLists.txt +Index: Vulkan-ValidationLayers-sdk-1.3.211.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 +--- Vulkan-ValidationLayers-sdk-1.3.211.0.orig/layers/vk_layer_config.h ++++ Vulkan-ValidationLayers-sdk-1.3.211.0/layers/vk_layer_config.h @@ -33,7 +33,7 @@ #define SECONDARY_VK_REGISTRY_HIVE_STR "HKEY_CURRENT_USER" #endif @@ -54,16 +39,3 @@ Index: Vulkan-ValidationLayers-sdk-1.3.204.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-rpmlintrc b/vulkan-validationlayers-rpmlintrc deleted file mode 100644 index be4ee7e..0000000 --- a/vulkan-validationlayers-rpmlintrc +++ /dev/null @@ -1 +0,0 @@ -addFilter("shlib-policy-name-error") diff --git a/vulkan-validationlayers.changes b/vulkan-validationlayers.changes index 36ba18a..5707f93 100644 --- a/vulkan-validationlayers.changes +++ b/vulkan-validationlayers.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Apr 18 20:14:48 UTC 2022 - Jan Engelhardt + +- Update to release SDK-1.3.211.0 + * Block Texel View VU 01583 + * Add VK_QCOM_fragment_density_map_offset VUs + * Add VK_KHR_dynamic_rendering VUs and Tests + * Validate viewport and scissor with count + * Validate depth RenderingAttachment resolve mode + * Validate RenderingInfo depth and stencil samples + * Validate BeginRendering depth attachment format + * Validate statistics query queue support + * Validate get query pool results parameters + * Validate non-acquired swapchain image use + * Support VK_KHR_graphics_pipeline + ------------------------------------------------------------------- Sat Feb 19 17:24:34 UTC 2022 - Jan Engelhardt diff --git a/vulkan-validationlayers.spec b/vulkan-validationlayers.spec index f679939..f45492a 100644 --- a/vulkan-validationlayers.spec +++ b/vulkan-validationlayers.spec @@ -17,28 +17,27 @@ Name: vulkan-validationlayers -Version: 1.3.204.0 +Version: 1.3.211.0 Release: 0 -%define lname libVkLayer_utils-1_3_204_0 +%define lname libVkLayer_utils-1_3_211_0 Summary: Validation layers for Vulkan License: Apache-2.0 Group: Development/Tools/Other URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers Source: https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-%version.tar.gz -Source9: %name-rpmlintrc Patch1: ver.diff Patch2: xxhash.diff BuildRequires: cmake >= 3.4 BuildRequires: gcc-c++ >= 4.8 -BuildRequires: glslang-devel >= 11.4.0 +BuildRequires: glslang-devel >= 11.9.0 BuildRequires: memory-constraints BuildRequires: pkg-config BuildRequires: python3-base -BuildRequires: spirv-headers >= 1.6.g6 -BuildRequires: spirv-tools-devel >= 2022.2~sdk204 +BuildRequires: spirv-headers >= 1.6.1+sdk211 +BuildRequires: spirv-tools-devel >= 2022.2 BuildRequires: xxhash-devel -BuildRequires: pkgconfig(vulkan) >= 1.3.204 +BuildRequires: pkgconfig(vulkan) >= 1.3.211 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) Conflicts: vulkan < 1.1 diff --git a/xxhash.diff b/xxhash.diff index 3dba604..4855d15 100644 --- a/xxhash.diff +++ b/xxhash.diff @@ -10,10 +10,10 @@ xxhash as well, so that the ABI matches. layers/CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -Index: Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt +Index: Vulkan-ValidationLayers-sdk-1.3.211.0/layers/CMakeLists.txt =================================================================== ---- Vulkan-ValidationLayers-sdk-1.3.204.0.orig/layers/CMakeLists.txt -+++ Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt +--- Vulkan-ValidationLayers-sdk-1.3.211.0.orig/layers/CMakeLists.txt ++++ Vulkan-ValidationLayers-sdk-1.3.211.0/layers/CMakeLists.txt @@ -59,8 +59,6 @@ if(BUILD_LAYER_SUPPORT_FILES) vk_layer_utils.h vk_layer_utils.cpp @@ -23,7 +23,7 @@ Index: Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt generated/vk_format_utils.h generated/vk_format_utils.cpp generated/vk_validation_error_messages.h -@@ -198,7 +196,7 @@ set(CORE_VALIDATION_LIBRARY_FILES +@@ -200,7 +198,7 @@ set(CORE_VALIDATION_LIBRARY_FILES generated/synchronization_validation_types.cpp gpu_validation.cpp generated/corechecks_optick_instrumentation.cpp @@ -32,10 +32,10 @@ Index: Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt set(OBJECT_LIFETIMES_LIBRARY_FILES generated/object_tracker.cpp -@@ -316,6 +314,7 @@ if(BUILD_LAYERS) +@@ -307,6 +305,7 @@ if(BUILD_LAYERS) endif() - - target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools SPIRV-Tools-opt) + target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) + target_link_libraries(VkLayer_khronos_validation PRIVATE ${SPIRV_TOOLS_TARGET} SPIRV-Tools-opt) + target_link_libraries(VkLayer_khronos_validation PRIVATE -lxxhash)