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

nine: Disable optional use of TTN when MUL_ZERO_WINS is available.

Browse Source 
NIR doesn't have that knob currently, so we end up throwing errors about
it being ignored.

This should fix cases of "tgsi_to_nir: unhandled TGSI property 23 = 1",
and presumably do better at DX9 muls on nv50 and r600.

Acked-by: Timothy Arceri <tarceri@itsqueeze.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14883>
This commit is contained in:
Emma Anholt
2022-03-28 15:07:09 -07:00
committed by Marge Bot
parent 09fd1e94fd
commit 7f01299c40
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gallium/frontends/nine/nine_shader.c
View File

@@ -3893,9 +3893,13 @@ nine_ureg_create_shader(struct ureg_program *ureg,
assert(((struct tgsi_header *) &tgsi_tokens[0])->HeaderSize >= 2); assert(((struct tgsi_header *) &tgsi_tokens[0])->HeaderSize >= 2);
enum pipe_shader_type shader_type = ((struct tgsi_processor *) &tgsi_tokens[1])->Processor; enum pipe_shader_type shader_type = ((struct tgsi_processor *) &tgsi_tokens[1])->Processor;
/* NIR doesn't have mul_zero_wins */
bool ttn_supported = !GET_CAP(TGSI_MUL_ZERO_WINS);
int preferred_ir = screen->get_shader_param(screen, shader_type, PIPE_SHADER_CAP_PREFERRED_IR); int preferred_ir = screen->get_shader_param(screen, shader_type, PIPE_SHADER_CAP_PREFERRED_IR);
int supported_irs = screen->get_shader_param(screen, shader_type, PIPE_SHADER_CAP_SUPPORTED_IRS);
bool prefer_nir = (preferred_ir == PIPE_SHADER_IR_NIR); bool prefer_nir = (preferred_ir == PIPE_SHADER_IR_NIR);
bool use_nir = prefer_nir || bool use_nir = (prefer_nir && ttn_supported) ||
!(supported_irs & (1 << PIPE_SHADER_IR_TGSI)) ||
((shader_type == PIPE_SHADER_VERTEX) && nine_shader_get_debug_flag(NINE_SHADER_DEBUG_OPTION_NIR_VS)) || ((shader_type == PIPE_SHADER_VERTEX) && nine_shader_get_debug_flag(NINE_SHADER_DEBUG_OPTION_NIR_VS)) ||
((shader_type == PIPE_SHADER_FRAGMENT) && nine_shader_get_debug_flag(NINE_SHADER_DEBUG_OPTION_NIR_PS)); ((shader_type == PIPE_SHADER_FRAGMENT) && nine_shader_get_debug_flag(NINE_SHADER_DEBUG_OPTION_NIR_PS));