Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa-24.2.3

Browse Source
This commit is contained in:
Rmys
2024-09-19 14:28:55 +03:00
parent 187740c0c4
commit eae46181e0
2 changed files with 9 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/library/mesa/files/0001-rusticl-do-not-use-CL-vector-types-in-bindings-and-c.patch
-40
View File
@@ -1,40 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Sun, 18 Aug 2024 00:08:50 +0200
Subject: [PATCH] rusticl: do not use CL vector types in bindings and code
Bindgen seems to miscompile them and I kinda thought I've done this
already in the past, but apparently not.
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11722
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30710>
---
src/gallium/frontends/rusticl/api/device.rs | 2 +-
src/gallium/frontends/rusticl/meson.build | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/gallium/frontends/rusticl/api/device.rs b/src/gallium/frontends/rusticl/api/device.rs
index 7aca92527a4e..c4b2b0bc7423 100644
--- a/src/gallium/frontends/rusticl/api/device.rs
+++ b/src/gallium/frontends/rusticl/api/device.rs
@@ -196,7 +196,7 @@ impl CLInfo<cl_device_info> for cl_device_id {
// TODO proper retrival from devices
CL_DEVICE_MEM_BASE_ADDR_ALIGN => cl_prop::<cl_uint>(0x1000),
CL_DEVICE_MIN_DATA_TYPE_ALIGN_SIZE => {
- cl_prop::<cl_uint>(size_of::<cl_ulong16>() as cl_uint)
+ cl_prop::<cl_uint>(16 * size_of::<cl_ulong>() as cl_uint)
}
CL_DEVICE_NAME => cl_prop::<&str>(&dev.screen().name()),
CL_DEVICE_NATIVE_VECTOR_WIDTH_CHAR => cl_prop::<cl_uint>(1),
diff --git a/src/gallium/frontends/rusticl/meson.build b/src/gallium/frontends/rusticl/meson.build
index 9cf603c6a6d4..459b94cf17a1 100644
--- a/src/gallium/frontends/rusticl/meson.build
+++ b/src/gallium/frontends/rusticl/meson.build
@@ -157,6 +157,7 @@ rusticl_opencl_bindings_rs = rust.bindgen(
'--raw-line', 'unsafe impl std::marker::Send for _cl_image_desc {}',
'--raw-line', 'unsafe impl std::marker::Sync for _cl_image_desc {}',
'--allowlist-type', 'cl_.*',
+ '--blocklist-type', '(__)?cl_.*[2348(16)]',
'--allowlist-type', 'cl.*_fn',
'--allowlist-var', 'CL_.*',
# needed for gl_sharing extension
x11/library/mesa/pspec.xml
+9 -2
View File
@@ -14,7 +14,7 @@
<Icon>mesa</Icon>
<Summary>Mesa graphics libraries and utilities</Summary>
<Description>Mesa is an open-source implementation of the OpenGL specification - a system for rendering interactive 3D graphics.</Description>
<Archive sha1sum="93ef18fbcedac9adaab146ec2fe422ab42d9b08c" type="tarxz">https://archive.mesa3d.org/mesa-24.2.2.tar.xz</Archive>
<Archive sha1sum="aff8a9ad499759498d98cec3605546c3e2391874" type="tarxz">https://archive.mesa3d.org/mesa-24.2.3.tar.xz</Archive>
<BuildDependencies>
<Dependency>meson</Dependency>
<Dependency>cbindgen</Dependency>
@@ -77,7 +77,7 @@
<AdditionalFile owner="root" permission="0644" target="crossfile.ini">crossfile.ini</AdditionalFile>
</AdditionalFiles>
<Patches>
<Patch level="1">0001-rusticl-do-not-use-CL-vector-types-in-bindings-and-c.patch</Patch>
<!-- <Patch level="1">0001-rusticl-do-not-use-CL-vector-types-in-bindings-and-c.patch</Patch> -->
</Patches>
</Source>
@@ -275,6 +275,13 @@
</Package>
<History>
<Update release="119">
<Date>2024-09-19</Date>
<Version>24.2.3</Version>
<Comment>Version bump.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="118">
<Date>2024-09-06</Date>
<Version>24.2.2</Version>