pool/gzdoom
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adapt gzdoom-vulkan.patch to work with multiple glslang versions

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=86
This commit is contained in:
Jan Engelhardt 2022-10-25 00:26:09 +00:00 committed by Git OBS Bridge
parent 46b5cc7440
commit c74005eaaa
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gzdoom-vulkan.patch
View File

@ -6,8 +6,8 @@ Use Vulkan/glslang/spirv system libraries instead of bundled code.
--- ---
CMakeLists.txt | 4 +--- CMakeLists.txt | 4 +---
src/CMakeLists.txt | 2 +- src/CMakeLists.txt | 2 +-
src/common/rendering/vulkan/system/vk_builders.cpp | 2 ++ src/common/rendering/vulkan/system/vk_builders.cpp | 4 ++++
3 files changed, 4 insertions(+), 4 deletions(-) 3 files changed, 6 insertions(+), 4 deletions(-)
Index: gzdoom-g4.8.2/CMakeLists.txt 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 = { static const TBuiltInResource DefaultTBuiltInResource = {
/* .MaxLights = */ 32, /* .MaxLights = */ 32,
@@ -119,6 +120,7 @@ static const TBuiltInResource DefaultTBu @@ -119,6 +120,9 @@ static const TBuiltInResource DefaultTBu
/* .maxTaskWorkGroupSizeY_NV = */ 1, /* .maxTaskWorkGroupSizeY_NV = */ 1,
/* .maxTaskWorkGroupSizeZ_NV = */ 1, /* .maxTaskWorkGroupSizeZ_NV = */ 1,
/* .maxMeshViewCountNV = */ 4, /* .maxMeshViewCountNV = */ 4,
+#if GLSLANG_VERSION_MAJOR == 11 && GLSLANG_VERSION_MINOR >= 12
+ 256, 256, 128, 128, 128, 128, 128, 128, 4, + 256, 256, 128, 128, 128, 128, 128, 128, 4,
+#endif
/* .maxDualSourceDrawBuffersEXT = */ 1, /* .maxDualSourceDrawBuffersEXT = */ 1,
/* .limits = */ { /* .limits = */ {

2
gzdoom.spec
View File

@ -50,7 +50,7 @@ BuildRequires: pkgconfig(sdl2) >= 2.0.6
BuildRequires: pkgconfig(vpx) BuildRequires: pkgconfig(vpx)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
%if 0%{?suse_version} >= 1550 %if 0%{?suse_version} >= 1550
BuildRequires: glslang-devel >= 11.12 BuildRequires: glslang-devel >= 11.10
BuildRequires: pkgconfig(vulkan) >= 1.2.162 BuildRequires: pkgconfig(vulkan) >= 1.2.162
%else %else
Provides: bundled(glslang) = 11.10.0 Provides: bundled(glslang) = 11.10.0