From 9adf6d9d7e7ed6e27ad62e178ffd5ccb2fcefd27 Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Wed, 20 Apr 2022 10:51:48 +0300 Subject: nir/lower_shader_calls: put inserted instructions into a dummy block When moving code into the main block or loop blocks, put the code into its own : if(true) { ... } block so that we avoid break/continue/return issues. v2: Also take care of the main block with return instructions v3: Make deletion more obvious with dummy if blocks (Jason) v4: Fixup assert for loops (Lionel) Signed-off-by: Lionel Landwerlin Fixes: 8dfb240b1f06 ("nir: Add raytracing shader call lowering pass.") Reviewed-by: Jason Ekstrand Part-of: (cherry picked from commit 35d82ecf1ee117bef575731100fa6ae532f225fc) --- .pick_status.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.pick_status.json') diff --git a/.pick_status.json b/.pick_status.json index ac0f909a93a..51c8d305099 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2101,7 +2101,7 @@ "description": "nir/lower_shader_calls: put inserted instructions into a dummy block", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "8dfb240b1f063307aa5e53fb1bd0865105eef986" }, -- cgit v1.2.3