From 949c4ec5b7144710bcfa235f0518003f5f4a68b7 Mon Sep 17 00:00:00 2001 From: Karol Herbst Date: Sat, 19 Nov 2022 21:44:28 +0100 Subject: [PATCH] rusticl/device: put space at the end of CL_DEVICE_VERSION Apparently some software relies on that and the spec kind of says it's there. Fixes: 20c90fed5a0 ("rusticl: added") Reported-by: sobkas Signed-off-by: Karol Herbst Part-of: (cherry picked from commit b51eb98cf65566f0f177031a34603ba8068521f8) --- .pick_status.json | 2 +- src/gallium/frontends/rusticl/api/device.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 40bd6d786f8..38dd938c3e3 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -760,7 +760,7 @@ "description": "rusticl/device: put space at the end of CL_DEVICE_VERSION", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "20c90fed5a0ab0202ee1ef474c71cb816164a448" }, diff --git a/src/gallium/frontends/rusticl/api/device.rs b/src/gallium/frontends/rusticl/api/device.rs index acb426af2df..cabe3bf8d0d 100644 --- a/src/gallium/frontends/rusticl/api/device.rs +++ b/src/gallium/frontends/rusticl/api/device.rs @@ -186,7 +186,7 @@ impl CLInfo for cl_device_id { CL_DEVICE_TYPE => cl_prop::(dev.device_type(false)), CL_DEVICE_VENDOR => cl_prop(dev.screen().device_vendor()), CL_DEVICE_VENDOR_ID => cl_prop::(dev.vendor_id()), - CL_DEVICE_VERSION => cl_prop::(format!("OpenCL {}", dev.cl_version.api_str())), + CL_DEVICE_VERSION => cl_prop::(format!("OpenCL {} ", dev.cl_version.api_str())), CL_DRIVER_VERSION => cl_prop::<&CStr>(unsafe { CStr::from_ptr(mesa_version_string()) }), CL_DEVICE_WORK_GROUP_COLLECTIVE_FUNCTIONS_SUPPORT => cl_prop::(false), // CL_INVALID_VALUE if param_name is not one of the supported values