fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-04-26 13:20:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

brw: Fix mesh shader asserts in clip/cull distance setting

Browse source 
mesh doesn't use brw_vue_prog_data.  Also, I had been catching TCS
shaders here, and shouldn't.

Fixes: bf76e86bc8 ("brw: Refactor clip/cull distance mask setting into a helper")
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37809>
This commit is contained in:
Kenneth Graunke 2025-10-10 01:35:20 -07:00 • committed by Marge Bot
parent 9f45f09b86
commit dd9e002129
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/intel/compiler/brw/brw_from_nir.cpp
View file

@ -7929,21 +7929,30 @@ set_clip_cull_distance_masks(brw_shader &s)
{
const shader_info &info = s.nir->info;
if (info.stage >= MESA_SHADER_FRAGMENT && info.stage != MESA_SHADER_MESH)
if (info.stage != MESA_SHADER_VERTEX &&
info.stage != MESA_SHADER_TESS_EVAL &&
info.stage != MESA_SHADER_GEOMETRY &&
info.stage != MESA_SHADER_MESH)
return;
struct brw_vue_prog_data *prog_data = brw_vue_prog_data(s.prog_data);
if (info.outputs_written &
(VARYING_BIT_CLIP_DIST0 | VARYING_BIT_CLIP_DIST1 |
VARYING_BIT_CULL_DIST0 | VARYING_BIT_CULL_DIST1)) {
prog_data->clip_distance_mask =
BITFIELD_MASK(info.clip_distance_array_size);
uint32_t clip_mask = BITFIELD_MASK(info.clip_distance_array_size);
prog_data->cull_distance_mask =
BITFIELD_RANGE(info.clip_distance_array_size,
info.cull_distance_array_size);
uint32_t cull_mask = BITFIELD_RANGE(info.clip_distance_array_size,
info.cull_distance_array_size);
if (info.stage == MESA_SHADER_MESH) {
struct brw_mesh_prog_data *prog_data = brw_mesh_prog_data(s.prog_data);
prog_data->clip_distance_mask = clip_mask;
prog_data->cull_distance_mask = cull_mask;
} else {
struct brw_vue_prog_data *prog_data = brw_vue_prog_data(s.prog_data);
prog_data->clip_distance_mask = clip_mask;
prog_data->cull_distance_mask = cull_mask;
}
}
}