pool/vkquake
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1071513 from home:bobbie424242:branches:games

Browse Source 
- removed patch fix-aarch64-build.patch, not needed anymore
- requires vulkan-devel >= 1.2.162
- Update to version 1.33.0
  * Support for remastered models (Needs data from remastered Quake)
  * Support for dynamic lightmap shadows (requires an RT capable GPU)
  * Reworked all option menus
  * Support for modern HUD style
  * Transparency sorting (thanks @temx)
  * Dynamic lights are now computed in world instead of texel space for more consistent light sizes
  * New GPU memory allocator
  * Improved level load times

OBS-URL: https://build.opensuse.org/request/show/1071513
OBS-URL: https://build.opensuse.org/package/show/games/vkquake?expand=0&rev=33
This commit is contained in:
Martin Hauke 2023-03-14 20:29:18 +00:00 committed by Git OBS Bridge
parent 71730cbb66
commit fb33948442
5 changed files with 23 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fix-aarch64-build.patch
View File

@ -1,31 +0,0 @@
From a4298dcf0a56ddcdd7d81493ffa91fc3db109e0c Mon Sep 17 00:00:00 2001
From: Axel Gneiting <axelgneiting@gmail.com>
Date: Mon, 12 Dec 2022 10:56:35 -0800
Subject: [PATCH] Linux ARM compile fixes
---
Quake/r_brush.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Quake/r_brush.c b/Quake/r_brush.c
index f416226e..b259b045 100644
--- a/Quake/r_brush.c
+++ b/Quake/r_brush.c
@@ -2211,7 +2211,7 @@ void R_AccumulateLightmap (byte *lightmap, unsigned scale, int texels)
while (size >= 8)
{
uint8x8_t lm_uint_8x8 = vld1_u8 (lightmap);
- uint16x8_t lm_uint_16x8 = vmovl_s8 (lm_uint_8x8);
+ uint16x8_t lm_uint_16x8 = vmovl_u8 (lm_uint_8x8);
uint32x4_t lm_old_low_4x32bit = vld1q_u32 (bl);
uint16x4_t lm_uint_low_16x4 = vget_low_u16 (lm_uint_16x8);
@@ -2279,7 +2279,7 @@ void R_StoreLightmap (byte *dest, int width, int height, int stride)
uint16x4_t lm_shifted_16x4_masked = vset_lane_u16 (0xFF, lm_shifted_16x4, 3);
uint16x8_t lm_shifted_16x8 = vcombine_u16 (lm_shifted_16x4_masked, vcreate_u16 (0));
uint8x8_t lm_shifted_saturated_8x8 = vqmovn_u16 (lm_shifted_16x8);
- uint32x2_t lm_shifted_saturated_32x2 = vreinterpret_s32_u8 (lm_shifted_saturated_8x8);
+ uint32x2_t lm_shifted_saturated_32x2 = vreinterpret_u32_u8 (lm_shifted_saturated_8x8);
((uint32_t *)dest)[i] = vget_lane_u32 (lm_shifted_saturated_32x2, 0);
src += 3;
}

3
vkQuake-1.22.3.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1e0bcf9bb82a2c514f1474fa74ef1d63502c780331e44634e31a5b5902be8a85
size 47717524

3
vkQuake-1.30.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:073c8f0f734d0c2404e3ad77e9c8be56048b7569b147a1a0e5b292bf964a9a60
size 47516157

15
vkquake.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Mar 14 12:33:56 UTC 2023 - Michael Pujos <pujos.michael@gmail.com>
- removed patch fix-aarch64-build.patch, not needed anymore
- requires vulkan-devel >= 1.2.162
- Update to version 1.33.0
* Support for remastered models (Needs data from remastered Quake)
* Support for dynamic lightmap shadows (requires an RT capable GPU)
* Reworked all option menus
* Support for modern HUD style
* Transparency sorting (thanks @temx)
* Dynamic lights are now computed in world instead of texel space for more consistent light sizes
* New GPU memory allocator
* Improved level load times
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 12 11:15:37 UTC 2022 - Michael Pujos <pujos.michael@gmail.com> Mon Dec 12 11:15:37 UTC 2022 - Michael Pujos <pujos.michael@gmail.com>

10
vkquake.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package vkquake # spec file for package vkquake
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# Copyright (c) 2017 Luke Jones <luke.nukem.jones@gmail.com> # Copyright (c) 2017 Luke Jones <luke.nukem.jones@gmail.com>
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
@ -18,7 +18,7 @@
Name: vkquake Name: vkquake
Version: 1.22.3 Version: 1.30.0
Release: 0 Release: 0
Summary: Quake 1 port using Vulkan instead of OpenGL for rendering Summary: Quake 1 port using Vulkan instead of OpenGL for rendering
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -28,9 +28,9 @@ Source: https://github.com/Novum/vkQuake/archive/refs/tags/%{version}.ta
Source99: %{name}.changes Source99: %{name}.changes
Source100: appdata.xml Source100: appdata.xml
Source101: %{name}.desktop Source101: %{name}.desktop
Patch0: fix-aarch64-build.patch BuildRequires: glslang-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: vulkan-devel BuildRequires: vulkan-devel >= 1.2.162
BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(flac)
BuildRequires: pkgconfig(libmikmod) BuildRequires: pkgconfig(libmikmod)
BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(opus)
@ -43,7 +43,7 @@ vkQuake is a Quake 1 port using Vulkan instead of OpenGL for rendering. It is ba
Game data must be placed in ~/.vkquake/id1 . Game data must be placed in ~/.vkquake/id1 .
%prep %prep
%autosetup -p1 -n vkQuake-%{version} %autosetup -n vkQuake-%{version}
%if 0%{?sle_version} < 150200 %if 0%{?sle_version} < 150200
sed -i 's#vulkan_core.h#vulkan.h#' Quake/quakedef.h sed -i 's#vulkan_core.h#vulkan.h#' Quake/quakedef.h