From 576fc784c96714d1085b0c8d3d0dc2ee0060e1e5 Mon Sep 17 00:00:00 2001
From: Calder Young <calder.young@intel.com>
Date: Tue, 2 Jun 2026 17:23:24 -0700
Subject: [PATCH] jay: Disable SIMD32 if ray queries are used

Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/42006>
---
 src/intel/compiler/jay/jay_nir.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/intel/compiler/jay/jay_nir.c b/src/intel/compiler/jay/jay_nir.c
index 9e53dce70a3..c3bf942bfb1 100644
--- a/src/intel/compiler/jay/jay_nir.c
+++ b/src/intel/compiler/jay/jay_nir.c
@@ -354,6 +354,10 @@ jay_process_nir(const struct intel_device_info *devinfo,
    if (stage == MESA_SHADER_FRAGMENT && nir->info.fs.color_is_dual_source)
       do_simd32 = false;
 
+   /* SIMD splitting of ray queries is inefficient, avoid it when possible */
+   if (prog_data->base.ray_queries && nir->info.min_subgroup_size < 32)
+      do_simd32 = false;
+
    unsigned simd_width = do_simd32 ? (nir->info.api_subgroup_size ?: 32) : 16;
 
    brw_pass_tracker pt_ = {