Compare commits

...

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

8 changed files with 158 additions and 153 deletions

31
.gitignore vendored
View File

@ -1,2 +1,29 @@
SOURCES/Vulkan-Utility-Libraries-sdk-1.3.283.0.tar.gz
SOURCES/Vulkan-ValidationLayers-sdk-1.3.283.0.tar.gz
/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.283.0.tar.gz

View File

@ -1,2 +0,0 @@
68939c3fdd039989313139f41e999a32f15043dd SOURCES/Vulkan-Utility-Libraries-sdk-1.3.283.0.tar.gz
bdc6adb09db8470740d0ea498d0bfdb9dc48ead2 SOURCES/Vulkan-ValidationLayers-sdk-1.3.283.0.tar.gz

View File

@ -0,0 +1,53 @@
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

3
README.md Normal file
View File

@ -0,0 +1,3 @@
# vulkan-validation-layers
The vulkan-validation-layers package

View File

@ -1,149 +0,0 @@
Name: vulkan-validation-layers
Version: 1.3.283.0
Release: 3%{?dist}
Summary: Vulkan validation layers
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
# vulkan-utility-libraries is required but not available in CentOS/RHEL 8
Source1: https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/vulkan-sdk-%{version}.tar.gz#/Vulkan-Utility-Libraries-sdk-%{version}.tar.gz
Obsoletes: vulkan-validation-layers-devel <= 1.3.250.1-1
Provides: vulkan-validation-layers-devel = %{version}-%{release}
Provides: vulkan-validation-layers-devel%{?_isa} = %{version}-%{release}
BuildRequires: gcc
BuildRequires: gcc-c++
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: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-cursor)
BuildRequires: pkgconfig(wayland-server)
BuildRequires: pkgconfig(wayland-egl)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xcb)
%description
Vulkan validation layers
%prep
%autosetup -p1 -n Vulkan-ValidationLayers-vulkan-sdk-%{version}
# Extract vulkan-utility-libraries in "utility"
mkdir -p utility
tar -xvf %{SOURCE1} -C utility --strip-components=1
%build
# vulkan-utility-libraries can't be compiled and linked because it contains .a
# libraries and check-buildroot would complain about debug symbols containing
# "/builddir/build/BUILDROOT" paths.
# Instead, add vulkan-utility-libraries as a subproject
echo "add_subdirectory(utility)" >> CMakeLists.txt
# Decrease debuginfo verbosity to reduce memory consumption even more
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%global optflags %(echo %{optflags} | sed 's/-O2 /-O1 /')
%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} \
-DCMAKE_CXX_STANDARD_LIBRARIES="-lstdc++fs"
%cmake_build
%install
%cmake_install
%ldconfig_scriptlets
%files
%license LICENSE.txt
%doc README.md CONTRIBUTING.md
%{_datadir}/vulkan/explicit_layer.d/*.json
%{_libdir}/libVkLayer_*.so
%changelog
* Fri Sep 13 2024 José Expósito <jexposit@redhat.com> - 1.3.283.0-3
- Provides/Obsoletes vulkan-validation-layers-devel
Resolves: https://issues.redhat.com/browse/RHEL-54290
* Fri Sep 13 2024 José Expósito <jexposit@redhat.com> - 1.3.283.0-2
- Link stdc++fs
Resolves: https://issues.redhat.com/browse/RHEL-54290
* Wed Sep 11 2024 José Expósito <jexposit@redhat.com> - 1.3.283.0-1
- Update to 1.3.283.0 SDK
Resolves: https://issues.redhat.com/browse/RHEL-54290
* Wed Jul 12 2023 Dave Airlie <airlied@redhat.com> - 1.3.250.1-1
- Update to 1.3.250.1
* Wed Feb 15 2023 Dave Airlie <airlied@redhat.com> - 1.3.239.0-2
- Try and fix validation layer exports
* Tue Feb 14 2023 Dave Airlie <airlied@redhat.com> - 1.3.239.0-1
- Update to 1.3.239.0
* Wed Aug 24 2022 Dave Airlie <airlied@redhat.com> - 1.3.224.0-1
- Update to 1.3.224.0
* Mon Jun 20 2022 Dave Airlie <airlied@redhat.com> - 1.3.216.0-1
- Update to 1.3.216.0
* Tue Feb 22 2022 Dave Airlie <airlied@redhat.com> - 1.3.204.0-1
- Update to 1.3.204.0
* Mon Feb 01 2021 Dave Airlie <airlied@redhat.com> - 1.2.162.0-1
- Update to 1.2.162.0
* Wed Aug 05 2020 Dave Airlie <airlied@redhat.com> - 1.2.148.0-1
- Update to 1.2.148.0
* Wed Jan 29 2020 Dave Airlie <airlied@redhat.com> - 1.2.131.1-1
- Update for 8.2.0 for vulkan 1.2
* Sat Dec 07 2019 Dave Airlie <airlied@redhat.com> - 1.1.126.0-3
- Update for 8.2.0
* Fri Nov 29 2019 Dave Airlie <airlied@redhat.com> - 1.1.126.0-2
- Add explicit spirv toos libs requires
* Wed Nov 13 2019 Dave Airlie <airlied@redhat.com> - 1.1.126.0-1
- Update validation layers to 1.1.126.0
* Wed Jul 31 2019 Dave Airlie <airlied@redhat.com> - 1.1.114.0-1
- Update validation layers to 1.1.114.0
* Wed Mar 06 2019 Dave Airlie <airlied@redhat.com> - 1.1.101.0-1
- Update valdiation layers to 1.1.101.0
* 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

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-10
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (Vulkan-ValidationLayers-sdk-1.3.283.0.tar.gz) = fc2ca2c79be8e01fc39a7802644d5e10b5196317eaac246a17b73093409739e771ac267c1ed8aad08ba68afdebc583702980f195a5f93421a0c041da3f4b6e49

View File

@ -0,0 +1,66 @@
Name: vulkan-validation-layers
Version: 1.3.283.0
Release: %autorelease
Summary: Vulkan validation layers
License: Apache-2.0
URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers
Source0: %url/archive/vulkan-sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz
BuildRequires: gcc
BuildRequires: gcc-c++
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)
BuildRequires: pkgconfig(wayland-egl)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xcb)
%description
Vulkan validation layers
%prep
%autosetup -p1 -n Vulkan-ValidationLayers-vulkan-sdk-%{version}
%build
# Decrease debuginfo verbosity to reduce memory consumption even more
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%global optflags %(echo %{optflags} | sed 's/-O2 /-O1 /')
%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
%install
%cmake_install
%ldconfig_scriptlets
%files
%license LICENSE.txt
%doc README.md CONTRIBUTING.md
%{_datadir}/vulkan/explicit_layer.d/*.json
%{_libdir}/libVkLayer_*.so
%changelog
%autochangelog