From a7969b5d424eac91116c41713612801e9b264f8a Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Wed, 16 Jul 2025 15:28:49 -0700
Subject: [PATCH] intel/brw: Apply 7e1362e9c070ad037 to pre-xe3 codepath of
 brw_compile_fs().

This applies the same workaround as 7e1362e9c070ad037 to the pre-xe3
codepath of brw_compile_fs(), since ray queries appear to be
unsupported from SIMD32 fragment shaders.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36618>
---
 src/intel/compiler/brw_compile_fs.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/intel/compiler/brw_compile_fs.cpp b/src/intel/compiler/brw_compile_fs.cpp
index 9535156fba5..c312c27a8a6 100644
--- a/src/intel/compiler/brw_compile_fs.cpp
+++ b/src/intel/compiler/brw_compile_fs.cpp
@@ -1786,7 +1786,8 @@ brw_compile_fs(const struct brw_compiler *compiler,
       if (!has_spilled &&
           dispatch_width_limit >= 32 &&
           reqd_dispatch_width == SUBGROUP_SIZE_VARYING &&
-          !simd16_failed && INTEL_SIMD(FS, 32)) {
+          !simd16_failed && INTEL_SIMD(FS, 32) &&
+          !prog_data->base.ray_queries) {
          /* Try a SIMD32 compile */
          brw_shader_params shader_params = base_shader_params;
          shader_params.dispatch_width = 32;