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

spirv2dxil: Move clip/cull merging from common passes to just spirv2dxil passes
Some checks are pending
macOS-CI / macOS-CI (dri) (push) Waiting to run
Details
macOS-CI / macOS-CI (xlib) (push) Waiting to run
Details

Browse source 
Otherwise it gets run twice since it's part of vk_spirv_to_nir

Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38465>
This commit is contained in:
Jesse Natalie 2025-12-08 10:29:18 -08:00 • committed by Marge Bot
parent 0c400fbed9
commit 0330b19b86
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/microsoft/spirv_to_dxil/dxil_spirv_nir.c
View file

@ -30,6 +30,7 @@
#include "spirv/spirv_info.h"
#include "util/blob.h"
#include "dxil_spirv_nir.h"
#include "nir_xfb_info.h"
#include "git_sha1.h"
#include "vulkan/vulkan.h"
@ -142,6 +143,18 @@ dxil_spirv_nir_prep(nir_shader *nir)
nir_var_shader_in | nir_var_shader_out | nir_var_system_value |
nir_var_shader_call_data | nir_var_ray_hit_attrib,
NULL);
/* This needs to happen after remove_dead_vars because GLSLang likes to
* insert dead clip/cull vars and we don't want to clip/cull based on
* uninitialized garbage.
*/
nir_gather_clip_cull_distance_sizes_from_vars(nir);
NIR_PASS(_, nir, nir_merge_clip_cull_distance_vars);
if (nir->info.stage == MESA_SHADER_VERTEX ||
nir->info.stage == MESA_SHADER_TESS_EVAL ||
nir->info.stage == MESA_SHADER_GEOMETRY)
nir_shader_gather_xfb_info(nir);
NIR_PASS(_, nir, nir_propagate_invariant, false);
}
@ -1028,8 +1041,6 @@ dxil_spirv_nir_passes(nir_shader *nir,
NIR_PASS(_, nir, dxil_nir_lower_int_cubemaps, false);
nir_gather_clip_cull_distance_sizes_from_vars(nir);
NIR_PASS(_, nir, nir_merge_clip_cull_distance_vars);
NIR_PASS(_, nir, nir_lower_io_vars_to_temporaries, nir_shader_get_entrypoint(nir),
nir_var_shader_out | nir_var_shader_in);
NIR_PASS(_, nir, nir_lower_global_vars_to_local);