meson: add a new option to enable intel-clc without building RT shaders

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26797>

meson.build

@@ -295,14 +295,18 @@ with_any_broadcom = [
   with_broadcom_vk,
 ].contains(true)
 
-if ['x86_64'].contains(host_machine.cpu_family())
+if ['x86_64'].contains(host_machine.cpu_family()) and \
+   get_option('intel-clc') != 'system'
+  # Require intel-clc with Anv & Iris (for internal shaders)
   with_intel_clc = get_option('intel-clc') == 'enabled'
-  with_intel_vk_rt = with_intel_vk and get_option('intel-clc') != 'disabled'
 else
   with_intel_clc = false
-  with_intel_vk_rt = false
 endif
 
+with_intel_vk_rt = with_intel_vk and \
+                   get_option('intel-clc') != 'disabled' and \
+                   get_option('intel-rt') != 'disabled'
+
 with_any_intel = [
   with_gallium_crocus,
   with_gallium_i915,

meson_options.txt

@@ -639,8 +639,18 @@ option(
   choices : [
     'enabled', 'disabled', 'system',
   ],
-  description : 'Build the intel-clc compiler (enables Vulkan Intel ' +
+  description : 'Build the intel-clc compiler.'
-                'Ray Tracing on supported hardware).'
+)
+
+option(
+  'intel-rt',
+  type : 'combo',
+  deprecated: {'true': 'enabled', 'false': 'disabled'},
+  value : 'disabled',
+  choices : [
+    'enabled', 'disabled',
+  ],
+  description : 'Build Ray Tracing on supported hardware.'
 )
 
 option(