OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ac/nir: Export clip distances according to clip_cull_mask

Browse Source 
Avoids a mismatch between PA_CL_VS_OUT_CNTL and what the shader exports.
Outputs that are not written export zero.

Fixes: f823581 ("ac/nir: add ac_nir_export_position")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/9187
Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26812>
This commit is contained in:
Konstantin Seurer
2023-12-24 21:48:45 +01:00
committed by Marge Bot
parent f12ffc6b04
commit b38c776690
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/amd/common/ac_nir.c
View File

@@ -352,10 +352,19 @@ ac_nir_export_position(nir_builder *b,
}
for (int i = 0; i < 2; i++) {
if ((outputs_written & (VARYING_BIT_CLIP_DIST0 << i)) &&
(clip_cull_mask & BITFIELD_RANGE(i * 4, 4))) {
/* Do not check outputs_written to prevent unwritten clip/cull
* distance outputs by the shader, and export zero instead.
*/
if (clip_cull_mask & BITFIELD_RANGE(i * 4, 4)) {
nir_def *clip_dist[4];
for (int j = 0; j < 4; j++) {
if (outputs[VARYING_SLOT_CLIP_DIST0 + i][j])
clip_dist[j] = nir_u2uN(b, outputs[VARYING_SLOT_CLIP_DIST0 + i][j], 32);
else
clip_dist[j] = nir_imm_zero(b, 1, 32);
}
exp[exp_num] = export(
b, get_export_output(b, outputs[VARYING_SLOT_CLIP_DIST0 + i]), row,
b, nir_vec(b, clip_dist, ARRAY_SIZE(clip_dist)), row,
V_008DFC_SQ_EXP_POS + exp_num + exp_pos_offset, 0,
(clip_cull_mask >> (i * 4)) & 0xf);
exp_num++;