diff --git a/.pick_status.json b/.pick_status.json index 0b03aab26aa..548434c1124 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -184,7 +184,7 @@ "description": "nir/opt_move_discards_to_top: use nir_tex_instr_has_implicit_derivative", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "48158636bf1b0e62ebab4835e1f474866a34c6fe", "notes": null diff --git a/src/compiler/nir/nir_opt_move_discards_to_top.c b/src/compiler/nir/nir_opt_move_discards_to_top.c index 80531d5dc58..b36febbb4ba 100644 --- a/src/compiler/nir/nir_opt_move_discards_to_top.c +++ b/src/compiler/nir/nir_opt_move_discards_to_top.c @@ -26,13 +26,6 @@ #include "nir_control_flow.h" #include "nir_worklist.h" -static bool -nir_texop_implies_derivative(nir_texop op) -{ - return op == nir_texop_tex || - op == nir_texop_txb || - op == nir_texop_lod; -} #define MOVE_INSTR_FLAG 1 #define STOP_PROCESSING_INSTR_FLAG 2 @@ -149,7 +142,7 @@ opt_move_discards_to_top_impl(nir_function_impl *impl) case nir_instr_type_tex: { nir_tex_instr *tex = nir_instr_as_tex(instr); - if (nir_texop_implies_derivative(tex->op)) + if (nir_tex_instr_has_implicit_derivative(tex)) consider_discards = false; continue; }