From f73f986f775afc157ffc24995f3c64045422e2c90d08bc297f4a9133b5628d5e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sun, 31 Dec 2023 00:32:34 +0000 Subject: [PATCH] - Add glslang14.diff OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/vulkan-validationlayers?expand=0&rev=131 --- glslang14.diff | 30 ++++++++++++++++++++++++++++++ vulkan-validationlayers.changes | 5 +++++ vulkan-validationlayers.spec | 1 + 3 files changed, 36 insertions(+) create mode 100644 glslang14.diff diff --git a/glslang14.diff b/glslang14.diff new file mode 100644 index 0000000..06678b1 --- /dev/null +++ b/glslang14.diff @@ -0,0 +1,30 @@ +From: Jan Engelhardt +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 + #include +@@ -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: { diff --git a/vulkan-validationlayers.changes b/vulkan-validationlayers.changes index 3b8378c..383493a 100644 --- a/vulkan-validationlayers.changes +++ b/vulkan-validationlayers.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Dec 31 00:23:33 UTC 2023 - Jan Engelhardt + +- Add glslang14.diff + ------------------------------------------------------------------- Wed Nov 15 10:52:15 UTC 2023 - Jan Engelhardt diff --git a/vulkan-validationlayers.spec b/vulkan-validationlayers.spec index 3196749..c0ad0bd 100644 --- a/vulkan-validationlayers.spec +++ b/vulkan-validationlayers.spec @@ -25,6 +25,7 @@ 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++