Compare commits

..

No commits in common. "rawhide" and "f38" have entirely different histories.

5 changed files with 45 additions and 81 deletions

16
.gitignore vendored
View file

@ -22,19 +22,3 @@
/Vulkan-ValidationLayers-sdk-1.3.231.1.tar.gz
/Vulkan-ValidationLayers-sdk-1.3.239.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.3.243.0.tar.gz
/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
/Vulkan-ValidationLayers-sdk-1.3.275.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.3.280.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.3.283.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.3.290.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.3.296.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.4.304.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.4.309.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.4.313.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.4.321.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.4.328.1.tar.gz
/Vulkan-ValidationLayers-sdk-1.4.341.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.4.350.0.tar.gz

View file

@ -1,29 +0,0 @@
# packit config for vulkan-validation-layers
# Build Stage 4 - depends on glslang, vulkan-utility-libraries
jobs:
- job: koji_build
trigger: commit | koji_build
allowed_committers: [all_admins]
dist_git_branches:
- fedora-all
sidetag_group: vulkan-sdk-releases
dependencies:
- glslang
- vulkan-utility-libraries
- job: bodhi_update
trigger: commit
dist_git_branches:
- fedora-branched
sidetag_group: vulkan-sdk-releases
dependencies:
- spirv-headers
- vulkan-headers
- spirv-tools
- vulkan-loader
- glslang
- vulkan-utility-libraries
- vulkan-volk
- vulkan-tools
- shaderc

View file

@ -5,8 +5,8 @@ Subject: [PATCH] add missing VK_LAYER_EXPORTs
---
layers/layer_options.h | 2 +-
layers/stateless/stateless_validation.h | 2 +-
scripts/generators/layer_chassis_generator.py | 2 +-
layers/stateless_validation.h | 2 +-
scripts/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 @@
#define OBJECT_LAYER_NAME "VK_LAYER_KHRONOS_validation"
#include "chassis.h"
-extern std::vector<std::pair<uint32_t, uint32_t>> custom_stype_info;
+VK_LAYER_EXPORT extern std::vector<std::pair<uint32_t, uint32_t>> custom_stype_info;
// Process validation features, flags and settings specified through extensions, a layer settings file, or environment variables
diff --git a/layers/stateless/stateless_validation.h b/layers/stateless/stateless_validation.h
diff --git a/layers/stateless_validation.h b/layers/stateless_validation.h
index e0f21b7a6..2fb8c6142 100644
--- a/layers/stateless/stateless_validation.h
+++ b/layers/stateless/stateless_validation.h
--- a/layers/stateless_validation.h
+++ b/layers/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/generators/layer_chassis_generator.py b/scripts/generators/layer_chassis_generator.py
diff --git a/scripts/layer_chassis_generator.py b/scripts/layer_chassis_generator.py
index be76d4204..62b442e8b 100644
--- a/scripts/generators/layer_chassis_generator.py
+++ b/scripts/generators/layer_chassis_generator.py
@@ -845,7 +845,7 @@ class LayerChassisOutputGenerator(BaseGenerator):
--- 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"
out.append('''
// Global list of sType,size identifiers
- std::vector<std::pair<uint32_t, uint32_t>> custom_stype_info{};
+ VK_LAYER_EXPORT std::vector<std::pair<uint32_t, uint32_t>> custom_stype_info{};
// Global list of sType,size identifiers
-std::vector<std::pair<uint32_t, uint32_t>> custom_stype_info{};
+VK_LAYER_EXPORT std::vector<std::pair<uint32_t, uint32_t>> custom_stype_info{};
"""
template <typename ValidationObjectType>
ValidationObjectType* ValidationObject::GetValidationObject() const {
inline_custom_source_preamble_2 = """
--
2.39.1

View file

@ -1 +1 @@
SHA512 (Vulkan-ValidationLayers-sdk-1.4.350.0.tar.gz) = 7005b696069d5580ffd1942f115b32a7b3fd2aa24bf9666222174e2d6f4d8471e5df7433b49c08360f9126dbd02cd4009dfcee4a6642948b8e36d658aad4d72b
SHA512 (Vulkan-ValidationLayers-sdk-1.3.243.0.tar.gz) = d2bba9afc2013ccd41953eb699e9568c85f90bb99d1be9866126a8bc18ae492e55970acc2ca4d7b9850b0201b0451acbb5335ea19dcd030dc71d545feb261a19

View file

@ -1,15 +1,15 @@
Name: vulkan-validation-layers
Version: 1.4.350.0
Version: 1.3.243.0
Release: %autorelease
Summary: Vulkan validation layers
License: Apache-2.0
License: ASL 2.0
URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers
Source0: %url/archive/vulkan-sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz
Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: cmake3
BuildRequires: glslang-devel
BuildRequires: ninja-build
BuildRequires: python%{python3_pkgversion}-devel
@ -17,7 +17,6 @@ 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)
@ -29,26 +28,32 @@ BuildRequires: pkgconfig(xcb)
%description
Vulkan validation layers
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: vulkan-headers
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%prep
%autosetup -p1 -n Vulkan-ValidationLayers-vulkan-sdk-%{version}
%autosetup -p1 -n Vulkan-ValidationLayers-sdk-%{version}
%build
# Decrease debuginfo verbosity to reduce memory consumption even more
%ifarch %{ix86}
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%global optflags %(echo %{optflags} | sed 's/-O2 /-O1 /')
%endif
%cmake -DCMAKE_BUILD_TYPE=Release \
-DUPDATE_DEPS=OFF \
-DBUILD_WERROR=OFF \
-DGLSLANG_INSTALL_DIR=%{_prefix} \
-DBUILD_LAYER_SUPPORT_FILES:BOOL=ON \
-DUSE_ROBIN_HOOD_HASHING:BOOL=OFF \
-DSPIRV_HEADERS_INSTALL_DIR=%{_prefix} \
-DVULKAN_HEADERS_INSTALL_DIR=%{_prefix} \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}
%cmake3 -DCMAKE_BUILD_TYPE=Release \
-DBUILD_WERROR=OFF \
-DGLSLANG_INSTALL_DIR=%{_prefix} \
-DBUILD_LAYER_SUPPORT_FILES:BOOL=ON \
-DUSE_ROBIN_HOOD_HASHING:BOOL=OFF \
-DSPIRV_HEADERS_INSTALL_DIR=%{_prefix} \
-DVULKAN_HEADERS_INSTALL_DIR=%{_prefix} \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}
%cmake_build
@ -61,9 +66,13 @@ Vulkan validation layers
%files
%license LICENSE.txt
%doc README.md CONTRIBUTING.md
%doc README.md CONTRIBUTING.md LAYER_CONFIGURATION.md
%{_datadir}/vulkan/explicit_layer.d/*.json
%{_libdir}/libVkLayer_*.so
%files devel
%{_includedir}/vulkan/
%{_libdir}/libVkLayer_utils.a
%changelog
%autochangelog