jengelh/gzdoom
SHA256
1
0
Fork 0
forked from pool/gzdoom
Code Pull Requests Activity

- Update gzdoom-vulkan.patch for glslang-11.12.

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

30
gzdoom-vulkan.patch
View File

@ -6,13 +6,13 @@ 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 | 1 + src/common/rendering/vulkan/system/vk_builders.cpp | 2 ++
3 files changed, 3 insertions(+), 4 deletions(-) 3 files changed, 4 insertions(+), 4 deletions(-)
Index: gzdoom-g4.8.1/CMakeLists.txt Index: gzdoom-g4.8.2/CMakeLists.txt
=================================================================== ===================================================================
--- gzdoom-g4.8.1.orig/CMakeLists.txt --- gzdoom-g4.8.2.orig/CMakeLists.txt
+++ gzdoom-g4.8.1/CMakeLists.txt +++ gzdoom-g4.8.2/CMakeLists.txt
@@ -325,9 +325,7 @@ option(FORCE_INTERNAL_ASMJIT "Use intern @@ -325,9 +325,7 @@ option(FORCE_INTERNAL_ASMJIT "Use intern
mark_as_advanced( FORCE_INTERNAL_ASMJIT ) mark_as_advanced( FORCE_INTERNAL_ASMJIT )
@ -24,10 +24,10 @@ Index: gzdoom-g4.8.1/CMakeLists.txt
endif() endif()
add_subdirectory( libraries/discordrpc EXCLUDE_FROM_ALL ) add_subdirectory( libraries/discordrpc EXCLUDE_FROM_ALL )
Index: gzdoom-g4.8.1/src/CMakeLists.txt Index: gzdoom-g4.8.2/src/CMakeLists.txt
=================================================================== ===================================================================
--- gzdoom-g4.8.1.orig/src/CMakeLists.txt --- gzdoom-g4.8.2.orig/src/CMakeLists.txt
+++ gzdoom-g4.8.1/src/CMakeLists.txt +++ gzdoom-g4.8.2/src/CMakeLists.txt
@@ -368,7 +368,7 @@ add_custom_target( revision_check ALL @@ -368,7 +368,7 @@ add_custom_target( revision_check ALL
set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${CMAKE_DL_LIBS}" "${DRPC_LIBRARIES}") set( PROJECT_LIBRARIES ${PROJECT_LIBRARIES} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${CMAKE_DL_LIBS}" "${DRPC_LIBRARIES}")
@ -37,10 +37,10 @@ Index: gzdoom-g4.8.1/src/CMakeLists.txt
endif() endif()
# ZMUSIC # ZMUSIC
Index: gzdoom-g4.8.1/src/common/rendering/vulkan/system/vk_builders.cpp Index: gzdoom-g4.8.2/src/common/rendering/vulkan/system/vk_builders.cpp
=================================================================== ===================================================================
--- gzdoom-g4.8.1.orig/src/common/rendering/vulkan/system/vk_builders.cpp --- gzdoom-g4.8.2.orig/src/common/rendering/vulkan/system/vk_builders.cpp
+++ gzdoom-g4.8.1/src/common/rendering/vulkan/system/vk_builders.cpp +++ gzdoom-g4.8.2/src/common/rendering/vulkan/system/vk_builders.cpp
@@ -25,6 +25,7 @@ @@ -25,6 +25,7 @@
#include "renderstyle.h" #include "renderstyle.h"
#include <ShaderLang.h> #include <ShaderLang.h>
@ -49,3 +49,11 @@ Index: gzdoom-g4.8.1/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
/* .maxTaskWorkGroupSizeY_NV = */ 1,
/* .maxTaskWorkGroupSizeZ_NV = */ 1,
/* .maxMeshViewCountNV = */ 4,
+ 256, 256, 128, 128, 128, 128, 128, 128, 4,
/* .maxDualSourceDrawBuffersEXT = */ 1,
/* .limits = */ {

5
gzdoom.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 24 23:24:06 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- Update gzdoom-vulkan.patch for glslang-11.12.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jul 24 07:43:09 UTC 2022 - Jan Engelhardt <jengelh@inai.de> Sun Jul 24 07:43:09 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

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 BuildRequires: glslang-devel >= 11.12
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