From 43365f806415619b1ed8b44b5b0f8d8c6213fd7c5926637f1d3dc86412ab72d0 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 30 May 2023 22:07:48 +0000 Subject: [PATCH 1/3] - Update to release SDK-1.3.250.0 OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-validationlayers?expand=0&rev=121 --- sdk-1.3.250.0.tar.gz | 3 +++ v1.3.247.tar.gz | 3 --- vulkan-validationlayers.changes | 12 ++++++++++++ vulkan-validationlayers.spec | 16 ++++++++-------- 4 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 sdk-1.3.250.0.tar.gz delete mode 100644 v1.3.247.tar.gz diff --git a/sdk-1.3.250.0.tar.gz b/sdk-1.3.250.0.tar.gz new file mode 100644 index 0000000..e591f88 --- /dev/null +++ b/sdk-1.3.250.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc7989c019c8b7a18b8c3baabb30c1eba7921b2c63c54b46366f9ade4a9a7d1f +size 4829919 diff --git a/v1.3.247.tar.gz b/v1.3.247.tar.gz deleted file mode 100644 index 50c1cec..0000000 --- a/v1.3.247.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f24b37ada8545389239b7fb3caa5e2dd93acede96c23a471dc8dd8cbae2bcbf9 -size 4778794 diff --git a/vulkan-validationlayers.changes b/vulkan-validationlayers.changes index c7aaf5c..56938a6 100644 --- a/vulkan-validationlayers.changes +++ b/vulkan-validationlayers.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue May 30 21:41:55 UTC 2023 - Jan Engelhardt + +- Update to release SDK-1.3.250.0 + * Add VK_KHR_maintenance4 AHB check + * Add sparseImageInt64Atomics ImageView + * Add Mesh/Task shader workgroup memory limits + * Add 64-bit vertex validation + * Add support for VK_EXT_shader_tile_image, + VK_EXT_shader_tile_image, + VK_EXT_attachment_feedback_loop_dynamic_state + ------------------------------------------------------------------- Wed Apr 19 21:08:03 UTC 2023 - Jan Engelhardt diff --git a/vulkan-validationlayers.spec b/vulkan-validationlayers.spec index 645a799..4c241f4 100644 --- a/vulkan-validationlayers.spec +++ b/vulkan-validationlayers.spec @@ -17,27 +17,27 @@ Name: vulkan-validationlayers -Version: 1.3.247 +Version: 1.3.250.0 Release: 0 -%define lname libVkLayer_utils-1_3_247_0 +%define lname libVkLayer_utils-1_3_250_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/refs/tags/v%version.tar.gz +Source: https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/sdk-%version.tar.gz Patch2: xxhash.diff Patch3: gcc13.diff BuildRequires: cmake >= 3.7.12 BuildRequires: gcc-c++ >= 4.8 -BuildRequires: glslang-devel >= 12 +BuildRequires: glslang-devel >= 12.2 BuildRequires: memory-constraints BuildRequires: pkg-config BuildRequires: python3-base -BuildRequires: spirv-headers >= 1.6.1+sdk239 -BuildRequires: spirv-tools-devel >= 2023.1 +BuildRequires: spirv-headers >= 1.6.1+sdk250 +BuildRequires: spirv-tools-devel >= 2023.3~rc1 BuildRequires: vulkan-headers BuildRequires: xxhash-devel -BuildRequires: pkgconfig(vulkan) >= 1.3.241 +BuildRequires: pkgconfig(vulkan) >= 1.3.250 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcb) Conflicts: vulkan < 1.1 @@ -49,7 +49,7 @@ Vulkan is a 3D graphics and compute API. This package contains the Khronos official Vulkan validation layers. %prep -%autosetup -n Vulkan-ValidationLayers-%version -p1 +%autosetup -n Vulkan-ValidationLayers-sdk-%version -p1 perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt */CMakeLists.txt %build From 2fd9fb0689df69b798dd8f6dc5e90eafeea46422241c7119268f5fc8ee0d605d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 31 May 2023 00:01:55 +0000 Subject: [PATCH 2/3] rediff xxhash OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-validationlayers?expand=0&rev=122 --- xxhash.diff | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xxhash.diff b/xxhash.diff index 026109e..4c1d8ca 100644 --- a/xxhash.diff +++ b/xxhash.diff @@ -10,25 +10,25 @@ xxhash as well, so that the ABI matches. layers/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -Index: Vulkan-ValidationLayers-1.3.247/layers/CMakeLists.txt +Index: Vulkan-ValidationLayers-sdk-1.3.250.0/layers/CMakeLists.txt =================================================================== ---- Vulkan-ValidationLayers-1.3.247.orig/layers/CMakeLists.txt -+++ Vulkan-ValidationLayers-1.3.247/layers/CMakeLists.txt -@@ -19,8 +19,6 @@ target_sources(VkLayer_utils PRIVATE +--- Vulkan-ValidationLayers-sdk-1.3.250.0.orig/layers/CMakeLists.txt ++++ Vulkan-ValidationLayers-sdk-1.3.250.0/layers/CMakeLists.txt +@@ -26,8 +26,6 @@ target_sources(VkLayer_utils PRIVATE containers/custom_containers.h error_message/logging.h error_message/logging.cpp - external/xxhash.h - external/xxhash.cpp - generated/vk_format_utils.h - generated/vk_format_utils.cpp - generated/vk_validation_error_messages.h -@@ -51,7 +49,7 @@ target_sources(VkLayer_utils PRIVATE + ${API_TYPE}/generated/lvt_function_pointers.cpp + ${API_TYPE}/generated/lvt_function_pointers.h + ${API_TYPE}/generated/vk_format_utils.h +@@ -66,7 +64,7 @@ target_sources(VkLayer_utils PRIVATE # https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/4640 target_compile_definitions(VkLayer_utils PUBLIC XXH_NO_LONG_LONG) -target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers) +target_link_libraries(VkLayer_utils PUBLIC Vulkan::Headers -lxxhash) target_include_directories(VkLayer_utils SYSTEM PRIVATE external) - target_include_directories(VkLayer_utils PUBLIC .) + target_include_directories(VkLayer_utils PUBLIC . ${API_TYPE}) From acc10d8198370b6f0c1ddba988e35e57d30509545dbd44049db4a017177f0429 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 31 May 2023 00:30:34 +0000 Subject: [PATCH 3/3] 15.4 compiler OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-validationlayers?expand=0&rev=123 --- vulkan-validationlayers.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/vulkan-validationlayers.spec b/vulkan-validationlayers.spec index 4c241f4..44be83c 100644 --- a/vulkan-validationlayers.spec +++ b/vulkan-validationlayers.spec @@ -28,7 +28,11 @@ Source: https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/ Patch2: xxhash.diff Patch3: gcc13.diff BuildRequires: cmake >= 3.7.12 -BuildRequires: gcc-c++ >= 4.8 +%if 0%{?suse_version} >= 1599 +BuildRequires: gcc-c++ +%else +BuildRequires: gcc11-c++ +%endif BuildRequires: glslang-devel >= 12.2 BuildRequires: memory-constraints BuildRequires: pkg-config @@ -60,6 +64,12 @@ cat >gxx <<-EOF #!/bin/sh exec g++ "\$@" -lpthread EOF +%if 0%{?suse_version} < 1599 +cat >gxx <<-EOF + #!/bin/sh + exec g++-11 "\$@" -lpthread +EOF +%endif chmod a+x gxx export CXX="$PWD/gxx" %cmake -DGLSLANG_INSTALL_DIR="%_bindir" \