nir/zink: move clip_halfz-lowering to common code

Etnaviv also does the same thing, so let's try to avoid repetition here,
and use the same for it code as well.

Reviewed-by: Jonathan Marek <[email protected]>
Tested-by: Paul Cercueil <[email protected]>

1 files changed, 1 insertions, 54 deletions

diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index 846efa85e2e..7a89dc1088a 100644
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -116,59 +116,6 @@ lower_uniforms_to_ubo(nir_shader *shader)
    return progress;
 }
 
-static void
-lower_pos_write(nir_builder *b, struct nir_instr *instr)
-{
-   if (instr->type != nir_instr_type_intrinsic)
-      return;
-
-   nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
-   if (intr->intrinsic != nir_intrinsic_store_deref)
-      return;
-
-   nir_variable *var = nir_intrinsic_get_var(intr, 0);
-   if (var->data.mode != nir_var_shader_out ||
-       var->data.location != VARYING_SLOT_POS)
-      return;
-
-   b->cursor = nir_before_instr(&intr->instr);
-
-   nir_ssa_def *pos = nir_ssa_for_src(b, intr->src[1], 4);
-   nir_ssa_def *def = nir_vec4(b,
-                               nir_channel(b, pos, 0),
-                               nir_channel(b, pos, 1),
-                               nir_fmul_imm(b,
-                                            nir_fadd(b,
-                                                     nir_channel(b, pos, 2),
-                                                     nir_channel(b, pos, 3)),
-                                            0.5),
-                               nir_channel(b, pos, 3));
-   nir_instr_rewrite_src(&intr->instr, intr->src + 1, nir_src_for_ssa(def));
-}
-
-static void
-lower_clip_halfz(nir_shader *s)
-{
-   if (s->info.stage != MESA_SHADER_VERTEX)
-      return;
-
-   nir_foreach_function(function, s) {
-      if (function->impl) {
-         nir_builder b;
-         nir_builder_init(&b, function->impl);
-
-         nir_foreach_block(block, function->impl) {
-            nir_foreach_instr_safe(instr, block) {
-               lower_pos_write(&b, instr);
-            }
-         }
-
-         nir_metadata_preserve(function->impl, nir_metadata_block_index |
-                                               nir_metadata_dominance);
-      }
-   }
-}
-
 static bool
 lower_discard_if_instr(nir_intrinsic_instr *instr, nir_builder *b)
 {
@@ -292,7 +239,7 @@ zink_compile_nir(struct zink_screen *screen, struct nir_shader *nir)
    struct zink_shader *ret = CALLOC_STRUCT(zink_shader);
 
    NIR_PASS_V(nir, lower_uniforms_to_ubo);
-   NIR_PASS_V(nir, lower_clip_halfz);
+   NIR_PASS_V(nir, nir_lower_clip_halfz);
    NIR_PASS_V(nir, nir_lower_regs_to_ssa);
    optimize_nir(nir);
    NIR_PASS_V(nir, nir_remove_dead_variables, nir_var_function_temp);