From 1ec5e139866e160bc1970def8c17522e3a318d44 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Fri, 10 Dec 2021 06:52:25 +1000 Subject: [PATCH] build against new spirv-tools --- fix-api.patch | 12 ------------ vulkan-validation-layers.spec | 7 ++++--- 2 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 fix-api.patch diff --git a/fix-api.patch b/fix-api.patch deleted file mode 100644 index 21f051b..0000000 --- a/fix-api.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up Vulkan-ValidationLayers-sdk-1.2.198.0/layers/gpu_validation.cpp.dma Vulkan-ValidationLayers-sdk-1.2.198.0/layers/gpu_validation.cpp ---- Vulkan-ValidationLayers-sdk-1.2.198.0/layers/gpu_validation.cpp.dma 2021-12-09 19:37:52.918639116 +1000 -+++ Vulkan-ValidationLayers-sdk-1.2.198.0/layers/gpu_validation.cpp 2021-12-09 19:38:15.449247456 +1000 -@@ -1300,7 +1300,7 @@ bool GpuAssisted::InstrumentShader(const - optimizer.RegisterPass(CreateInstBindlessCheckPass(desc_set_bind_index, unique_shader_module_id, descriptor_indexing, - descriptor_indexing, buffer_oob_enabled, buffer_oob_enabled)); - // Call CreateAggressiveDCEPass with preserve_interface == true -- optimizer.RegisterPass(CreateAggressiveDCEPass(true)); -+ optimizer.RegisterPass(CreateAggressiveDCEPassPreserveInterface()); - if ((IsExtEnabled(device_extensions.vk_ext_buffer_device_address) || - IsExtEnabled(device_extensions.vk_khr_buffer_device_address)) && - shaderInt64 && enabled_features.core12.bufferDeviceAddress) { diff --git a/vulkan-validation-layers.spec b/vulkan-validation-layers.spec index 6b1f0f2..e7e1fbd 100644 --- a/vulkan-validation-layers.spec +++ b/vulkan-validation-layers.spec @@ -1,6 +1,6 @@ Name: vulkan-validation-layers Version: 1.2.198.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Vulkan validation layers License: ASL 2.0 @@ -9,8 +9,6 @@ Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk- Patch0: fix_shared.patch Patch1: add-missing-export.patch -Patch2: fix-api.patch - BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake3 @@ -75,6 +73,9 @@ developing applications that use %{name}. %{_includedir}/vulkan/ %changelog +* Fri Dec 10 2021 Dave Airlie - 1.2.198.0-3 +- build against new spirv-tools + * Thu Dec 09 2021 Dave Airlie - 1.2.198.0-2 - fix ABI issue with spirv-tools