fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-21 10:00:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

glsl: switch to NIR distance lowering pass

Browse source 
Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25860>
This commit is contained in:
Timothy Arceri 2023-10-18 14:22:57 +11:00 • committed by Marge Bot
parent 110887de2b
commit 33c2b64aa3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/compiler/glsl/gl_nir_linker.c
View file

@ -1125,6 +1125,10 @@ prelink_lowering(const struct gl_constants *consts,
opt_access_options.is_vulkan = false;
NIR_PASS_V(nir, nir_opt_access, &opt_access_options);
if (consts->ShaderCompilerOptions[i].LowerCombinedClipCullDistance) {
NIR_PASS_V(nir, nir_lower_clip_cull_distance_to_vec4s);
}
/* Combine clip and cull outputs into one array and set:
* - shader_info::clip_distance_array_size
* - shader_info::cull_distance_array_size

4
src/compiler/glsl/linker.cpp
View file

@ -3155,10 +3155,6 @@ link_shaders(struct gl_context *ctx, struct gl_shader_program *prog)
detect_recursion_linked(prog, prog->_LinkedShaders[i]->ir);
if (!prog->data->LinkStatus)
goto done;
if (consts->ShaderCompilerOptions[i].LowerCombinedClipCullDistance) {
lower_clip_cull_distance(prog, prog->_LinkedShaders[i]);
}
}
/* Check and validate stream emissions in geometry shaders */