From c74005eaaa7fd1a92a6d9f5f6d39fa7b3ac5f172b4e10f34ac9199eaa7695753 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 25 Oct 2022 00:26:09 +0000 Subject: [PATCH] adapt gzdoom-vulkan.patch to work with multiple glslang versions OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=86 --- gzdoom-vulkan.patch | 8 +++++--- gzdoom.spec | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gzdoom-vulkan.patch b/gzdoom-vulkan.patch index 1fe3a33..e74250b 100644 --- a/gzdoom-vulkan.patch +++ b/gzdoom-vulkan.patch @@ -6,8 +6,8 @@ Use Vulkan/glslang/spirv system libraries instead of bundled code. --- CMakeLists.txt | 4 +--- src/CMakeLists.txt | 2 +- - src/common/rendering/vulkan/system/vk_builders.cpp | 2 ++ - 3 files changed, 4 insertions(+), 4 deletions(-) + src/common/rendering/vulkan/system/vk_builders.cpp | 4 ++++ + 3 files changed, 6 insertions(+), 4 deletions(-) Index: gzdoom-g4.8.2/CMakeLists.txt =================================================================== @@ -49,11 +49,13 @@ Index: gzdoom-g4.8.2/src/common/rendering/vulkan/system/vk_builders.cpp static const TBuiltInResource DefaultTBuiltInResource = { /* .MaxLights = */ 32, -@@ -119,6 +120,7 @@ static const TBuiltInResource DefaultTBu +@@ -119,6 +120,9 @@ static const TBuiltInResource DefaultTBu /* .maxTaskWorkGroupSizeY_NV = */ 1, /* .maxTaskWorkGroupSizeZ_NV = */ 1, /* .maxMeshViewCountNV = */ 4, ++#if GLSLANG_VERSION_MAJOR == 11 && GLSLANG_VERSION_MINOR >= 12 + 256, 256, 128, 128, 128, 128, 128, 128, 4, ++#endif /* .maxDualSourceDrawBuffersEXT = */ 1, /* .limits = */ { diff --git a/gzdoom.spec b/gzdoom.spec index 76ff07f..78d7a3e 100644 --- a/gzdoom.spec +++ b/gzdoom.spec @@ -50,7 +50,7 @@ BuildRequires: pkgconfig(sdl2) >= 2.0.6 BuildRequires: pkgconfig(vpx) BuildRequires: pkgconfig(zlib) %if 0%{?suse_version} >= 1550 -BuildRequires: glslang-devel >= 11.12 +BuildRequires: glslang-devel >= 11.10 BuildRequires: pkgconfig(vulkan) >= 1.2.162 %else Provides: bundled(glslang) = 11.10.0