Accepting request 1140013 from X11:Wayland

- Update to release 1.3.275.0

OBS-URL: https://build.opensuse.org/request/show/1140013
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vulkan-validationlayers?expand=0&rev=49

glslang14.diff

@@ -1,30 +0,0 @@
-From: Jan Engelhardt <jengelh@inai.de>
-Date: 2023-12-31 01:23:14.975791155 +0100
-
-Unbreak compilation after system was updated to glslang 14.
-Patch created by looking at commit db7389064ffd286726009a630b14e2e6114159e2.
-
----
- layers/gpu_validation/gpu_error_message.cpp |    2 ++
- 1 file changed, 2 insertions(+)
-
-Index: Vulkan-ValidationLayers-vulkan-sdk-1.3.268.0/layers/gpu_validation/gpu_error_message.cpp
-===================================================================
---- Vulkan-ValidationLayers-vulkan-sdk-1.3.268.0.orig/layers/gpu_validation/gpu_error_message.cpp
-+++ Vulkan-ValidationLayers-vulkan-sdk-1.3.268.0/layers/gpu_validation/gpu_error_message.cpp
-@@ -18,6 +18,7 @@
- #include "gpu_validation/gpu_error_message.h"
- #include "spirv-tools/instrument.hpp"
- #include "state_tracker/shader_module.h"
-+#include "gpu_shaders/gpu_shaders_constants.h"
- 
- #include <algorithm>
- #include <regex>
-@@ -25,6 +26,7 @@
- // Generate the stage-specific part of the message.
- void UtilGenerateStageMessage(const uint32_t *debug_record, std::string &msg) {
-     using namespace spvtools;
-+    using namespace gpuav_glsl;
-     std::ostringstream strm;
-     switch (debug_record[kInstCommonOutStageIdx]) {
-         case spv::ExecutionModelVertex: {

vulkan-sdk-1.3.268.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7f6912ab49c2d379dd9ede59b4257d13dcac218ecd43df395a7d5914c7dfd024
-size 5004147

vulkan-sdk-1.3.275.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:acfd84039109220129624b0ecb69980bbc3a858978c62b556dbe16efd0f26755
+size 5280585

vulkan-validationlayers.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Jan 19 11:25:12 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 1.3.275.0
+  * gpu: Add ability to select which shaders get instrumented
+  * gpu: Use vku utilities for GPU-AV settings
+  * layers: Add support for VK_EXT_external_memory_host,
+    vkSetDeviceMemoryPriorityEXT, vkTraceRaysIndirectKHR,
+    VK_KHR_calibrated_timestamps, VK_KHR_vertex_attribute_divisor,
+    VK_ANDROID_external_format_resolve
+  * gpu: Add vkTraceRaysIndirectKHR
+  * layers: Improve SPIRV-Tools related error message
+- Delete glslang14.diff (not needed)
+
 -------------------------------------------------------------------
 Sun Dec 31 00:23:33 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 

vulkan-validationlayers.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package vulkan-validationlayers
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           vulkan-validationlayers
-Version:        1.3.268.0
+Version:        1.3.275.0
 Release:        0
 Summary:        Validation layers for Vulkan
 License:        Apache-2.0
@@ -25,7 +25,6 @@ Group:          Development/Tools/Other
 URL:            https://github.com/KhronosGroup/Vulkan-ValidationLayers
 Source:         https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/vulkan-sdk-%version.tar.gz
 Patch2:         xxhash.diff
-Patch3:         glslang14.diff
 BuildRequires:  cmake >= 3.7.12
 %if 0%{?suse_version} >= 1599
 BuildRequires:  gcc-c++
@@ -36,12 +35,12 @@ BuildRequires:  glslang-devel >= 13.1.0
 BuildRequires:  memory-constraints
 BuildRequires:  pkg-config
 BuildRequires:  python3-base
-BuildRequires:  spirv-headers >= 1.6.1+sdk268
+BuildRequires:  spirv-headers >= 1.6.1+sdk275
-BuildRequires:  spirv-tools-devel >= 2023.5~rc1
+BuildRequires:  spirv-tools-devel >= 2023.6~rc1
 BuildRequires:  vulkan-headers
-BuildRequires:  vulkan-utility-libraries-devel >= 1.3.268
+BuildRequires:  vulkan-utility-libraries-devel >= 1.3.275
 BuildRequires:  xxhash-devel
-BuildRequires:  pkgconfig(vulkan) >= 1.3.268
+BuildRequires:  pkgconfig(vulkan) >= 1.3.275
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcb)
 Conflicts:      vulkan < 1.1

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 |    3 +--
+ layers/CMakeLists.txt      |    2 +-
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ layers/utils/hash_util.cpp |    5 +----
+ 2 files changed, 2 insertions(+), 5 deletions(-)
 
-Index: Vulkan-ValidationLayers-vulkan-sdk-1.3.268.0/layers/CMakeLists.txt
+Index: Vulkan-ValidationLayers-vulkan-sdk-1.3.275.0/layers/CMakeLists.txt
 ===================================================================
---- Vulkan-ValidationLayers-vulkan-sdk-1.3.268.0.orig/layers/CMakeLists.txt
+--- Vulkan-ValidationLayers-vulkan-sdk-1.3.275.0.orig/layers/CMakeLists.txt
-+++ Vulkan-ValidationLayers-vulkan-sdk-1.3.268.0/layers/CMakeLists.txt
++++ Vulkan-ValidationLayers-vulkan-sdk-1.3.275.0/layers/CMakeLists.txt
-@@ -28,8 +28,6 @@ target_sources(VkLayer_utils PRIVATE
+@@ -28,7 +28,6 @@ target_sources(VkLayer_utils PRIVATE
      error_message/error_location.cpp
      error_message/error_location.h
      error_message/record_object.h
 -    external/xxhash.h
--    external/xxhash.cpp
      ${API_TYPE}/generated/error_location_helper.cpp
      ${API_TYPE}/generated/error_location_helper.h
-     ${API_TYPE}/generated/pnext_chain_extraction.cpp
+     ${API_TYPE}/generated/feature_requirements_helper.cpp
-@@ -76,6 +74,7 @@ target_link_libraries(VkLayer_utils PUBL
+@@ -72,6 +71,7 @@ target_link_libraries(VkLayer_utils PUBL
      Vulkan::LayerSettings
      Vulkan::UtilityHeaders
      ${CMAKE_DL_LIBS}
@@ -31,3 +31,21 @@ Index: Vulkan-ValidationLayers-vulkan-sdk-1.3.268.0/layers/CMakeLists.txt
  )
  target_include_directories(VkLayer_utils SYSTEM PRIVATE external)
  target_include_directories(VkLayer_utils PUBLIC . ${API_TYPE})
+Index: Vulkan-ValidationLayers-vulkan-sdk-1.3.275.0/layers/utils/hash_util.cpp
+===================================================================
+--- Vulkan-ValidationLayers-vulkan-sdk-1.3.275.0.orig/layers/utils/hash_util.cpp
++++ Vulkan-ValidationLayers-vulkan-sdk-1.3.275.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 {
+