radeonsi: stop using AC_EXP_PARAM_UNDEFINED because it's not useful
Just use AC_EXP_PARAM_DEFAULT_VAL_0000 to keep things simple. Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12656>
This commit is contained in:
parent
2027831aaa
commit
0aed2d0cd3
|
@ -35,7 +35,7 @@ enum
|
||||||
AC_EXP_PARAM_DEFAULT_VAL_0001,
|
AC_EXP_PARAM_DEFAULT_VAL_0001,
|
||||||
AC_EXP_PARAM_DEFAULT_VAL_1110,
|
AC_EXP_PARAM_DEFAULT_VAL_1110,
|
||||||
AC_EXP_PARAM_DEFAULT_VAL_1111,
|
AC_EXP_PARAM_DEFAULT_VAL_1111,
|
||||||
AC_EXP_PARAM_UNDEFINED = 255,
|
AC_EXP_PARAM_UNDEFINED = 255, /* deprecated, use AC_EXP_PARAM_DEFAULT_VAL_0000 instead */
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1447,7 +1447,7 @@ bool si_compile_shader(struct si_screen *sscreen, struct ac_llvm_compiler *compi
|
||||||
si_dump_streamout(&sel->so);
|
si_dump_streamout(&sel->so);
|
||||||
}
|
}
|
||||||
|
|
||||||
memset(shader->info.vs_output_param_offset, AC_EXP_PARAM_UNDEFINED,
|
memset(shader->info.vs_output_param_offset, AC_EXP_PARAM_DEFAULT_VAL_0000,
|
||||||
sizeof(shader->info.vs_output_param_offset));
|
sizeof(shader->info.vs_output_param_offset));
|
||||||
|
|
||||||
shader->info.uses_instanceid = sel->info.uses_instanceid;
|
shader->info.uses_instanceid = sel->info.uses_instanceid;
|
||||||
|
|
|
@ -3358,15 +3358,10 @@ static unsigned si_get_ps_input_cntl(struct si_context *sctx, struct si_shader *
|
||||||
/* The input is loaded from parameter memory. */
|
/* The input is loaded from parameter memory. */
|
||||||
ps_input_cntl |= S_028644_OFFSET(offset);
|
ps_input_cntl |= S_028644_OFFSET(offset);
|
||||||
} else if (!G_028644_PT_SPRITE_TEX(ps_input_cntl)) {
|
} else if (!G_028644_PT_SPRITE_TEX(ps_input_cntl)) {
|
||||||
if (offset == AC_EXP_PARAM_UNDEFINED) {
|
|
||||||
/* This can happen with depth-only rendering. */
|
|
||||||
offset = 0;
|
|
||||||
} else {
|
|
||||||
/* The input is a DEFAULT_VAL constant. */
|
/* The input is a DEFAULT_VAL constant. */
|
||||||
assert(offset >= AC_EXP_PARAM_DEFAULT_VAL_0000 &&
|
assert(offset >= AC_EXP_PARAM_DEFAULT_VAL_0000 &&
|
||||||
offset <= AC_EXP_PARAM_DEFAULT_VAL_1111);
|
offset <= AC_EXP_PARAM_DEFAULT_VAL_1111);
|
||||||
offset -= AC_EXP_PARAM_DEFAULT_VAL_0000;
|
offset -= AC_EXP_PARAM_DEFAULT_VAL_0000;
|
||||||
}
|
|
||||||
|
|
||||||
ps_input_cntl = S_028644_OFFSET(0x20) | S_028644_DEFAULT_VAL(offset);
|
ps_input_cntl = S_028644_OFFSET(0x20) | S_028644_DEFAULT_VAL(offset);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue