From bd3483c0f0da2a94e275c8181e3600e6f3e9dbe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Mon, 20 Nov 2023 08:51:29 +0100 Subject: [PATCH] update to 1.3.268.0 SDK --- .gitignore | 1 + 0001-add-missing-VK_LAYER_EXPORTs.patch | 32 ++++++++++++------------- sources | 2 +- vulkan-validation-layers.spec | 16 ++++++++----- 4 files changed, 28 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 9954a1b..854d970 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ /Vulkan-ValidationLayers-sdk-1.3.250.0.tar.gz /Vulkan-ValidationLayers-sdk-1.3.250.1.tar.gz /Vulkan-ValidationLayers-sdk-1.3.261.1.tar.gz +/Vulkan-ValidationLayers-sdk-1.3.268.0.tar.gz diff --git a/0001-add-missing-VK_LAYER_EXPORTs.patch b/0001-add-missing-VK_LAYER_EXPORTs.patch index 1e960f5..9850547 100644 --- a/0001-add-missing-VK_LAYER_EXPORTs.patch +++ b/0001-add-missing-VK_LAYER_EXPORTs.patch @@ -5,8 +5,8 @@ Subject: [PATCH] add missing VK_LAYER_EXPORTs --- layers/layer_options.h | 2 +- - layers/stateless_validation.h | 2 +- - scripts/layer_chassis_generator.py | 2 +- + layers/stateless/stateless_validation.h | 2 +- + scripts/generators/layer_chassis_generator.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/layers/layer_options.h b/layers/layer_options.h @@ -15,17 +15,17 @@ index 97909a5ed..d19e42c01 100644 +++ b/layers/layer_options.h @@ -22,7 +22,7 @@ - #include "chassis.h" + #define OBJECT_LAYER_NAME "VK_LAYER_KHRONOS_validation" -extern std::vector> custom_stype_info; +VK_LAYER_EXPORT extern std::vector> custom_stype_info; // Process validation features, flags and settings specified through extensions, a layer settings file, or environment variables -diff --git a/layers/stateless_validation.h b/layers/stateless_validation.h +diff --git a/layers/stateless/stateless_validation.h b/layers/stateless/stateless_validation.h index e0f21b7a6..2fb8c6142 100644 ---- a/layers/stateless_validation.h -+++ b/layers/stateless_validation.h +--- a/layers/stateless/stateless_validation.h ++++ b/layers/stateless/stateless_validation.h @@ -31,7 +31,7 @@ [[maybe_unused]] static const char *kVUID_PVError_ExtensionNotEnabled = "UNASSIGNED-GeneralParameterError-ExtensionNotEnabled"; [[maybe_unused]] static const char *kVUID_PVError_ApiVersionViolation = "UNASSIGNED-API-Version-Violation"; @@ -35,19 +35,19 @@ index e0f21b7a6..2fb8c6142 100644 // String returned by string_VkStructureType for an unrecognized type. const std::string UnsupportedStructureTypeString = "Unhandled VkStructureType"; -diff --git a/scripts/layer_chassis_generator.py b/scripts/layer_chassis_generator.py +diff --git a/scripts/generators/layer_chassis_generator.py b/scripts/generators/layer_chassis_generator.py index be76d4204..62b442e8b 100644 ---- a/scripts/layer_chassis_generator.py -+++ b/scripts/layer_chassis_generator.py -@@ -600,7 +600,7 @@ bool wrap_handles = true; - #include "chassis_dispatch_helper.h" +--- a/scripts/generators/layer_chassis_generator.py ++++ b/scripts/generators/layer_chassis_generator.py +@@ -845,7 +845,7 @@ class LayerChassisOutputGenerator(BaseGenerator): - // Global list of sType,size identifiers --std::vector> custom_stype_info{}; -+VK_LAYER_EXPORT std::vector> custom_stype_info{}; - """ + out.append(''' + // Global list of sType,size identifiers +- std::vector> custom_stype_info{}; ++ VK_LAYER_EXPORT std::vector> custom_stype_info{}; - inline_custom_source_preamble_2 = """ + template + ValidationObjectType* ValidationObject::GetValidationObject() const { -- 2.39.1 diff --git a/sources b/sources index e4f09d4..8de25c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Vulkan-ValidationLayers-sdk-1.3.261.1.tar.gz) = 454c6aa699ee2f97496f4e26037c050db001d0fe274011d80bc7055ddab40ce74b082980b2295cab483df9fea9b8dc5ee8718e844cb75cd17b3bf0b84807155b +SHA512 (Vulkan-ValidationLayers-sdk-1.3.268.0.tar.gz) = 74282cede73f67ee39ab78b99cd53f78ac0427ec6ca897ec41eb28b0e2d1106006d688bfbfdb2f0924b84149d516d42b1abe3680cdc6019c66457451f19b44dd diff --git a/vulkan-validation-layers.spec b/vulkan-validation-layers.spec index 60c5b89..b108d83 100644 --- a/vulkan-validation-layers.spec +++ b/vulkan-validation-layers.spec @@ -1,11 +1,11 @@ Name: vulkan-validation-layers -Version: 1.3.261.1 +Version: 1.3.268.0 Release: %autorelease Summary: Vulkan validation layers License: Apache-2.0 URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers -Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz +Source0: %url/archive/vulkan-sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz BuildRequires: gcc BuildRequires: gcc-c++ @@ -17,6 +17,7 @@ BuildRequires: spirv-tools-devel BuildRequires: spirv-headers-devel BuildRequires: vulkan-headers BuildRequires: vulkan-loader-devel +BuildRequires: vulkan-utility-libraries-devel BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-server) @@ -32,13 +33,16 @@ Vulkan validation layers Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: vulkan-headers +# The devel files are now provided by vulkan-utility-libraries-devel +# Deprecate vulkan-validation-layers-devel +Provides: deprecated() %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -p1 -n Vulkan-ValidationLayers-sdk-%{version} +%autosetup -p1 -n Vulkan-ValidationLayers-vulkan-sdk-%{version} %build @@ -66,13 +70,13 @@ developing applications that use %{name}. %files %license LICENSE.txt -%doc README.md CONTRIBUTING.md LAYER_CONFIGURATION.md +%doc README.md CONTRIBUTING.md %{_datadir}/vulkan/explicit_layer.d/*.json %{_libdir}/libVkLayer_*.so %files devel -%{_includedir}/vulkan/ -%{_libdir}/libVkLayer_utils.a +# The devel files are now provided by vulkan-utility-libraries-devel +# Keep empty for backwards compatibility %changelog %autochangelog