rpms/vulkan-validation-layers
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fixup validation layers for upstream regressions

Browse Source
This commit is contained in:
Dave Airlie 2022-02-16 13:12:51 +10:00
parent c744aef1da
commit 943bc6d569
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fix-spirv-tools-shared.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt.dma Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt
--- Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt.dma 2022-02-16 12:57:50.396556235 +1000
+++ Vulkan-ValidationLayers-sdk-1.3.204.0/layers/CMakeLists.txt 2022-02-16 12:57:54.312630300 +1000
@@ -315,7 +315,7 @@ if(BUILD_LAYERS)
target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
endif()
- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt)
+ target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools SPIRV-Tools-opt)
# The output file needs Unix "/" separators or Windows "\" separators On top of that, Windows separators actually need to be doubled

11
try-fix-headers.patch Normal file
View File

@ -0,0 +1,11 @@
diff -up Vulkan-ValidationLayers-sdk-1.3.204.0/CMakeLists.txt.dma Vulkan-ValidationLayers-sdk-1.3.204.0/CMakeLists.txt
--- Vulkan-ValidationLayers-sdk-1.3.204.0/CMakeLists.txt.dma 2022-02-16 12:29:43.131617038 +1000
+++ Vulkan-ValidationLayers-sdk-1.3.204.0/CMakeLists.txt 2022-02-16 12:29:48.095711141 +1000
@@ -256,7 +256,6 @@ if (USE_ROBIN_HOOD_HASHING)
endif()
endif()
-set(SPIRV_HEADERS_INCLUDE_DIR "" CACHE STRING "")
if(BUILD_LAYERS OR BUILD_TESTS)
if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "")
find_package(SPIRV-Headers REQUIRED CONFIG)

4
vulkan-validation-layers.spec
View File

@ -8,6 +8,8 @@ URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers
Source0: %url/archive/sdk-%{version}.tar.gz#/Vulkan-ValidationLayers-sdk-%{version}.tar.gz
Patch0: fix_shared.patch
Patch1: add-missing-export.patch
Patch2: try-fix-headers.patch
Patch3: fix-spirv-tools-shared.patch
BuildRequires: gcc
BuildRequires: gcc-c++
@ -51,7 +53,7 @@ developing applications that use %{name}.
-DGLSLANG_INSTALL_DIR=%{_prefix} \
-DBUILD_LAYER_SUPPORT_FILES:BOOL=ON \
-DUSE_ROBIN_HOOD_HASHING:BOOL=OFF \
-DSPIRV_HEADERS_INSTALL_DIR=%{_includedir} \
-DSPIRV_HEADERS_INSTALL_DIR=%{_includedir}/spirv \
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/vulkan/
%cmake_build