mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

ir3: Do not set clip/cull mask if no one writes clip/cull 

This may happen when undefined value is written into gl_ClipDistance,
then it gets optimized out by nir_opt_undef.

Fixes GPU faults in Tropico 5 (D3D11) on at least A750.

Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28109>
This commit is contained in:
Danylo Piliaiev 2024-03-11 16:29:39 +01:00 committed by Marge Bot
parent 35831dded5
commit 56dba5489a
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/freedreno/ir3/ir3_compiler_nir.c
View File

@ -5202,6 +5202,21 @@ ir3_compile_shader_nir(struct ir3_compiler *compiler,
}
}
uint8_t clip_cull_mask = ctx->so->clip_mask | ctx->so->cull_mask;
/* Having non-zero clip/cull mask and not writting corresponding regs
* leads to a GPU fault on A7XX.
*/
if (clip_cull_mask &&
ir3_find_output_regid(ctx->so, VARYING_SLOT_CLIP_DIST0) == regid(63, 0)) {
ctx->so->clip_mask &= 0xf0;
ctx->so->cull_mask &= 0xf0;
}
if ((clip_cull_mask >> 4) &&
ir3_find_output_regid(ctx->so, VARYING_SLOT_CLIP_DIST1) == regid(63, 0)) {
ctx->so->clip_mask &= 0xf;
ctx->so->cull_mask &= 0xf;
}
if (ctx->astc_srgb)
fixup_astc_srgb(ctx);