From: Dylan Baker <dylan.c.baker@intel.com>
Date: Fri, 18 Mar 2022 21:05:05 +0000 (-0700)
Subject: gallium/opencl: set OCL_ICD_FILENAMES with devenv
X-Git-Tag: upstream/22.3.5~11419
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe65c5671b6cee094b9c2d177bc2bfae9729f827;p=platform%2Fupstream%2Fmesa.git

gallium/opencl: set OCL_ICD_FILENAMES with devenv

So that `meson devenv` also sets up OpenCL.

Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15471>
---

diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
index ec65fcb..14df6b8 100644
--- a/src/gallium/targets/opencl/meson.build
+++ b/src/gallium/targets/opencl/meson.build
@@ -114,4 +114,12 @@ if with_opencl_icd
     install : true,
     install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
   )
+
+  if meson.version().version_compare('>= 0.58')
+    # .so is hardcoded in the icd as well
+    devenv.prepend(
+      'OCL_ICD_FILENAMES',
+      meson.current_build_dir() / 'libMesaOpenCL.so.@0@'.format(opencl_version)
+    )
+  endif
 endif