diff options
| author | Vasily Khoruzhick <anarsoul@gmail.com> | 2020-01-25 11:40:37 -0800 |
|---|---|---|
| committer | Dylan Baker <dylan@pnwbakers.com> | 2020-02-03 08:31:30 -0800 |
| commit | f585257cb0367fccd42a544a149b793be4b03210 (patch) | |
| tree | cb15ec6b274c561e1c7accb0dde4c217311f8302 /src/gallium | |
| parent | 9250fb9f0e4f14aeb86c54eeea20dab5d43ee4ea (diff) | |
| download | mesa-f585257cb0367fccd42a544a149b793be4b03210.tar.gz | |
lima: ppir: don't delete root ld_tex nodes without successors in current block
We don't clone ld_tex nodes into each block anymore, so ld_tex may have
successors in another block.
Fixes: c8554f849e41 ("lima/ppir: don't clone texture loads")
Reviewed-by: Erico Nunes <nunes.erico@gmail.com>
Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3564>
(cherry picked from commit 4a0f62f1fcab5350d6173c843fd95089953431a0)
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/lima/ir/pp/lower.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gallium/drivers/lima/ir/pp/lower.c b/src/gallium/drivers/lima/ir/pp/lower.c index c0070480a68..068d4a85d01 100644 --- a/src/gallium/drivers/lima/ir/pp/lower.c +++ b/src/gallium/drivers/lima/ir/pp/lower.c @@ -150,14 +150,9 @@ static bool ppir_lower_texture(ppir_block *block, ppir_node *node) { ppir_load_texture_node *load_tex = ppir_node_to_load_texture(node); ppir_dest *dest = ppir_node_get_dest(node); - - if (ppir_node_is_root(node) && dest->type == ppir_target_ssa) { - ppir_node_delete(node); - return true; - } - ppir_node *src_coords = ppir_node_get_src(node, 0)->node; ppir_load_node *load = NULL; + if (src_coords && ppir_node_has_single_src_succ(src_coords) && (src_coords->op == ppir_op_load_coords)) load = ppir_node_to_load(src_coords); |