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:
parent
233520035a
commit
1126b5cd2f
|
@ -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
|
/* For st_draw_feedback, we need to generate TGSI too if draw doesn't
|
||||||
* use LLVM.
|
* use LLVM.
|
||||||
*/
|
*/
|
||||||
/* TODO: Draw can't handle lowered IO. */
|
if (draw_has_llvm()) {
|
||||||
if (draw_has_llvm() && !stp->Base.info.io_lowered) {
|
|
||||||
st_prepare_vertex_program(stp);
|
st_prepare_vertex_program(stp);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -715,9 +714,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 ||
|
(!key->is_draw_shader || draw_has_llvm())) {
|
||||||
/* TODO: Draw can't handle lowered IO. */
|
|
||||||
(draw_has_llvm() && !stvp->Base.info.io_lowered))) {
|
|
||||||
bool finalize = false;
|
bool finalize = false;
|
||||||
|
|
||||||
state.type = PIPE_SHADER_IR_NIR;
|
state.type = PIPE_SHADER_IR_NIR;
|
||||||
|
|
Loading…
Reference in New Issue