From 44b7e1497f91e1ad0c4bb6a95a19e2f1b456897a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 28 Nov 2020 02:41:46 -0500 Subject: [PATCH] st/mesa: don't generate TGSI for the draw VS because it now supports NIR too Reviewed-by: Eric Anholt Part-of: --- src/mesa/state_tracker/st_program.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 1d21e1267bc..afe1dd1eae2 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -531,13 +531,8 @@ st_translate_vertex_program(struct st_context *st, MESA_SHADER_VERTEX); stp->Base.info = stp->Base.nir->info; - /* For st_draw_feedback, we need to generate TGSI too if draw doesn't - * use LLVM. - */ - if (draw_has_llvm()) { - st_prepare_vertex_program(stp); - return true; - } + st_prepare_vertex_program(stp); + return true; } } @@ -713,8 +708,7 @@ st_create_vp_variant(struct st_context *st, state.stream_output = stvp->state.stream_output; - if (stvp->state.type == PIPE_SHADER_IR_NIR && - (!key->is_draw_shader || draw_has_llvm())) { + if (stvp->state.type == PIPE_SHADER_IR_NIR) { bool finalize = false; state.type = PIPE_SHADER_IR_NIR;