OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
The draw module can't handle it.

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6442>
This commit is contained in:
Marek Olšák
2020-08-14 01:30:49 -04:00
committed by Marge Bot
parent 484a60d547
commit 493fdcf446
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -546,7 +546,8 @@ 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.
*/ */
if (draw_has_llvm()) { /* TODO: Draw can't handle lowered IO. */
if (draw_has_llvm() && !stp->Base.info.io_lowered) {
st_prepare_vertex_program(stp); st_prepare_vertex_program(stp);
return true; return true;
} }
@@ -731,7 +732,9 @@ 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())) { (!key->is_draw_shader ||
/* 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;