fix powervr vulkan driver build on archs where unsigned long != uint64_t

diff --git a/Mesa.spec b/Mesa.spec
index 54c6174afbd9cb2d1c98f87567ce9c70d38ffe44..61c2072a1b305893e56321deda52db1ac19de8c8 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -80,6 +80,7 @@ Group:                X11/Libraries
 Source0:       https://gitlab.freedesktop.org/mesa/mesa/-/archive/mesa-%{version}/mesa-mesa-%{version}.tar.bz2
 # Source0-md5: f7c130d69f0c6928ef1f9a250755081b
 Patch0:                zink_x32.patch
+Patch1:                powervr_uint64.patch
 URL:           https://www.mesa3d.org/
 %{?with_opencl_spirv:BuildRequires:    SPIRV-LLVM-Translator-devel >= 8.0.1.3}
 %{?with_gallium_zink:BuildRequires:    Vulkan-Loader-devel}
@@ -1423,6 +1424,9 @@ radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD.
 %prep
 %setup -q -n mesa-mesa-%{version}
 %patch0 -p1
+%ifarch %{arm} aarch64
+%patch1 -p1
+%endif
 
 %build
 %if %{with opencl}

diff --git a/powervr_uint64.patch b/powervr_uint64.patch
new file mode 100644 (file)
index 0000000..4a1a35f
--- /dev/null
+++ b/powervr_uint64.patch
@@ -0,0 +1,28 @@
+From 2d46abb200f6631d8689ecf8f18d55e9c2bb2cc6 Mon Sep 17 00:00:00 2001
+From: Jan Palus <jpalus@fastmail.com>
+Date: Fri, 20 May 2022 11:20:33 +0200
+Subject: [PATCH] pvr: use UINT64_C for 64-bit constant
+
+Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6528
+
+Signed-off-by: Jan Palus <jpalus@fastmail.com>
+---
+ src/imagination/vulkan/pvr_cmd_buffer.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/imagination/vulkan/pvr_cmd_buffer.c b/src/imagination/vulkan/pvr_cmd_buffer.c
+index f043054bcb0b..0afd463e2fb0 100644
+--- a/src/imagination/vulkan/pvr_cmd_buffer.c
++++ b/src/imagination/vulkan/pvr_cmd_buffer.c
+@@ -2760,7 +2760,7 @@ static VkResult pvr_setup_descriptor_mappings(
+                PVR_ROGUE_PDSINST_DOUT_FIELDS_DOUTD_SRC1_BSIZE_CLRMSK;
+ 
+             PVR_WRITE(qword_buffer,
+-                      0UL,
++                      UINT64_C(0),
+                       desc_set_entry->const_offset,
+                       pds_info->data_size_in_dwords);
+ 
+-- 
+GitLab
+