rpms/vulkan-validation-layers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: rpms:rawhide
Branches Tags
rpms:rawhide
rpms:main
rpms:f45
rpms:f43
rpms:f44
rpms:f42
rpms:f41
rpms:f40
rpms:f39
rpms:f38
rpms:f37
rpms:f35
rpms:f36
rpms:f34
rpms:f32
rpms:f33
rpms:f31
rpms:f30
rpms:f29
rpms:f27
rpms:f28
..
compare: rpms:f29
Branches Tags
rpms:main
rpms:rawhide
rpms:f45
rpms:f43
rpms:f44
rpms:f42
rpms:f41
rpms:f40
rpms:f39
rpms:f38
rpms:f37
rpms:f35
rpms:f36
rpms:f34
rpms:f32
rpms:f33
rpms:f31
rpms:f30
rpms:f29
rpms:f27
rpms:f28

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

6 changed files with 54 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

38
.gitignore vendored
View file

@ -1,40 +1,2 @@
/Vulkan-ValidationLayers-sdk-1.1.77.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.1.82.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.1.92.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.1.97.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.1.101.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.1.108.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.1.114.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.1.126.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.2.131.1.tar.gz
/Vulkan-ValidationLayers-sdk-1.2.135.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.2.148.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.2.154.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.2.162.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.2.176.1.tar.gz
/Vulkan-ValidationLayers-sdk-1.2.182.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.2.189.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.2.198.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.3.204.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.3.211.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.3.216.0.tar.gz
/Vulkan-ValidationLayers-sdk-1.3.224.0.tar.gz
/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

29
.packit.yaml
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: koji_build
dist_git_branches:
- fedora-all
sidetag_group: vulkan-sdk-releases
dependencies:
- spirv-headers
- vulkan-headers
- spirv-tools
- vulkan-loader
- glslang
- vulkan-utility-libraries
- vulkan-volk
- vulkan-tools
- shaderc

53
0001-add-missing-VK_LAYER_EXPORTs.patch
View file

@ -1,53 +0,0 @@
From f519c98e77ae1e48efeda49db144e786dd99339b Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Wed, 15 Feb 2023 17:37:08 +1000
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 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/layers/layer_options.h b/layers/layer_options.h
index 97909a5ed..d19e42c01 100644
--- a/layers/layer_options.h
+++ b/layers/layer_options.h
@@ -22,7 +22,7 @@
#define OBJECT_LAYER_NAME "VK_LAYER_KHRONOS_validation"
-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
index e0f21b7a6..2fb8c6142 100644
--- 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";
-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;
// 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
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):
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{};
template <typename ValidationObjectType>
ValidationObjectType* ValidationObject::GetValidationObject() const {
--
2.39.1

12
fix_shared.patch Normal file
View file

@ -0,0 +1,12 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -300,7 +300,7 @@
add_library(VkLayer_utils STATIC ${VALIDATION_LAYER_UTILS_SOURCES})
target_compile_definitions(VkLayer_utils PUBLIC _CRT_SECURE_NO_WARNINGS)
else()
- add_library(VkLayer_utils STATIC ${VALIDATION_LAYER_UTILS_SOURCES})
+ add_library(VkLayer_utils SHARED ${VALIDATION_LAYER_UTILS_SOURCES})
endif()
install(TARGETS VkLayer_utils DESTINATION ${CMAKE_INSTALL_LIBDIR})
set_target_properties(VkLayer_utils PROPERTIES LINKER_LANGUAGE CXX)

2
sources
View file

@ -1 +1 @@
SHA512 (Vulkan-ValidationLayers-sdk-1.4.350.0.tar.gz) = 7005b696069d5580ffd1942f115b32a7b3fd2aa24bf9666222174e2d6f4d8471e5df7433b49c08360f9126dbd02cd4009dfcee4a6642948b8e36d658aad4d72b
SHA512 (Vulkan-ValidationLayers-sdk-1.1.82.0.tar.gz) = 57ad54f119e2000cb288098edf1dac2ac62708596b45d7dd317e52d6c6cd4a3408fed8f4b23b0d64a1fb203c144227cf2e1ad66fb1b6b404243e3c3d5f2151ef

66
vulkan-validation-layers.spec
View file

@ -1,23 +1,21 @@
Name: vulkan-validation-layers
Version: 1.4.350.0
Release: %autorelease
Version: 1.1.82.0
Release: 1%{?dist}
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
Patch0: fix_shared.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: cmake
BuildRequires: cmake3
BuildRequires: glslang-devel
BuildRequires: ninja-build
BuildRequires: python%{python3_pkgversion}-devel
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,41 +27,59 @@ 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}
%cmake_build
%cmake3 -GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DGLSLANG_INSTALL_DIR=%{_bindir} \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/vulkan/ .
%ninja_build
%install
%cmake_install
%ninja_install
%ldconfig_scriptlets
%files
%license LICENSE.txt
%license LICENSE.txt COPYRIGHT.txt
%doc README.md CONTRIBUTING.md
%{_datadir}/vulkan/explicit_layer.d/*.json
%{_libdir}/libVkLayer_*.so
%files devel
%{_includedir}/vulkan/
%changelog
%autochangelog
* Tue Aug 07 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.82.0-1
- Update to 1.1.82.0
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.77.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jun 26 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.77.0-3
- Workaround i686 build issue
* Tue Jun 26 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.77.0-2
- Exclude i686 due to 'virtual memory exhausted' FTBFS
* Sat Jun 23 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.1.77.0-1
- Initial package