Mesa (master): st/mesa: don't generate TGSI for the draw VS because it now supports NIR too
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Mon Dec 7 21:18:16 UTC 2020
Module: Mesa
Branch: master
Commit: 44b7e1497f91e1ad0c4bb6a95a19e2f1b456897a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=44b7e1497f91e1ad0c4bb6a95a19e2f1b456897a
Author: Marek Olšák <marek.olsak at amd.com>
Date: Sat Nov 28 02:41:46 2020 -0500
st/mesa: don't generate TGSI for the draw VS because it now supports NIR too
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7826>
---
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;
More information about the mesa-commit
mailing list