File u_fix_rust_bindgen.patch of Package Mesa

Overview Repositories Revisions Requests Users Attributes Meta

File u_fix_rust_bindgen.patch of Package Mesa (Revision cb80cd8b8c2f6327d428d81f615961b0)

Currently displaying revision cb80cd8b8c2f6327d428d81f615961b0 , Show latest

From 93e96da9458c9d0348f2390dc0bea67cf140b1a0 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(-)

Index: mesa-24.1.3/src/gallium/frontends/rusticl/api/device.rs
===================================================================
--- mesa-24.1.3.orig/src/gallium/frontends/rusticl/api/device.rs
+++ mesa-24.1.3/src/gallium/frontends/rusticl/api/device.rs
@@ -198,7 +198,7 @@ impl CLInfo<cl_device_info> for cl_devic
             // 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),
Index: mesa-24.1.3/src/gallium/frontends/rusticl/meson.build
===================================================================
--- mesa-24.1.3.orig/src/gallium/frontends/rusticl/meson.build
+++ mesa-24.1.3/src/gallium/frontends/rusticl/meson.build
@@ -160,6 +160,7 @@ rusticl_opencl_bindings_rs = rust.bindge
     '--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
     '--allowlist-var', 'GL_.*',

Places

File u_fix_rust_bindgen.patch of Package Mesa (Revision cb80cd8b8c2f6327d428d81f615961b0)

Places