KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freedreno/ir3: Fix GS clip-plane lowering 

And also handle tess.  In all cases, we want to use the VS lowering pass
on the last geometry stage.  We don't make a special exception for GS
like other drivers, because GS gets lowered into a quasi-VS.

Signed-off-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17341>
This commit is contained in:
Rob Clark 2022-07-04 08:32:37 -07:00 committed by Marge Bot
parent bbcd04922f
commit 8f77187e3e
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/freedreno/ir3/ir3_nir.c
View File

@ -608,6 +608,25 @@ ir3_nir_lower_view_layer_id(nir_shader *nir, bool layer_zero, bool view_zero)
return progress;
}
static bool
lower_ucp_vs(struct ir3_shader_variant *so)
{
if (!so->key.ucp_enables)
return false;
gl_shader_stage last_geom_stage = MESA_SHADER_VERTEX;
if (so->key.tessellation) {
last_geom_stage = MESA_SHADER_TESS_EVAL;
} else if (so->key.has_gs) {
last_geom_stage = MESA_SHADER_GEOMETRY;
} else {
last_geom_stage = MESA_SHADER_VERTEX;
}
return so->type == last_geom_stage;
}
void
ir3_nir_lower_variant(struct ir3_shader_variant *so, nir_shader *s)
{
@ -647,10 +666,11 @@ ir3_nir_lower_variant(struct ir3_shader_variant *so, nir_shader *s)
}
}
if (s->info.stage == MESA_SHADER_VERTEX) {
if (so->key.ucp_enables)
progress |=
OPT(s, nir_lower_clip_vs, so->key.ucp_enables, false, true, NULL);
/* Note that it is intentional to use the VS lowering pass for GS, since we
* lower GS into something that looks more like a VS in ir3_nir_lower_gs():
*/
if (lower_ucp_vs(so)) {
progress |= OPT(s, nir_lower_clip_vs, so->key.ucp_enables, false, true, NULL);
} else if (s->info.stage == MESA_SHADER_FRAGMENT) {
bool layer_zero =
so->key.layer_zero && (s->info.inputs_read & VARYING_BIT_LAYER);