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

Revert "st/mesa: don't pass NIR to draw module if IO is lowered" 

This reverts commit 493fdcf446.

The lowered IO support has been added to Draw recently:
    https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6698

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6950>
This commit is contained in:
Marek Olšák 2020-09-28 13:12:14 -04:00 committed by Marge Bot
parent 233520035a
commit 1126b5cd2f
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mesa/state_tracker/st_program.c
View File

@ -534,8 +534,7 @@ st_translate_vertex_program(struct st_context *st,
/* For st_draw_feedback, we need to generate TGSI too if draw doesn't
* use LLVM.
*/
/* TODO: Draw can't handle lowered IO. */
if (draw_has_llvm() && !stp->Base.info.io_lowered) {
if (draw_has_llvm()) {
st_prepare_vertex_program(stp);
return true;
}
@ -715,9 +714,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 ||
/* TODO: Draw can't handle lowered IO. */
(draw_has_llvm() && !stvp->Base.info.io_lowered))) {
(!key->is_draw_shader || draw_has_llvm())) {
bool finalize = false;
state.type = PIPE_SHADER_IR_NIR;