AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/mesa: don't generate TGSI for the draw VS because it now supports NIR too

Browse Source 
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7826>
This commit is contained in:
Marek Olšák
2020-11-28 02:41:46 -05:00
committed by Marge Bot
parent df11ceaaaf
commit 44b7e1497f
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/state_tracker/st_program.c
+3 -9
View File
@@ -531,13 +531,8 @@ st_translate_vertex_program(struct st_context *st,
MESA_SHADER_VERTEX); MESA_SHADER_VERTEX);
stp->Base.info = stp->Base.nir->info; stp->Base.info = stp->Base.nir->info;
/* For st_draw_feedback, we need to generate TGSI too if draw doesn't st_prepare_vertex_program(stp);
* use LLVM. return true;
*/
if (draw_has_llvm()) {
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; state.stream_output = stvp->state.stream_output;
if (stvp->state.type == PIPE_SHADER_IR_NIR && if (stvp->state.type == PIPE_SHADER_IR_NIR) {
(!key->is_draw_shader || draw_has_llvm())) {
bool finalize = false; bool finalize = false;
state.type = PIPE_SHADER_IR_NIR; state.type = PIPE_SHADER_IR_NIR;