diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build
index 65053f4437c..a69a5d0fed3 100644
--- a/src/compiler/nir/meson.build
+++ b/src/compiler/nir/meson.build
@@ -210,6 +210,7 @@ files_libnir = files(
   'nir_lower_subgroups.c',
   'nir_lower_system_values.c',
   'nir_lower_task_shader.c',
+  'nir_lower_tess_coord_z.c',
   'nir_lower_tex_shadow.c',
   'nir_lower_tex.c',
   'nir_lower_texcoord_replace.c',
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 373222b076f..a05ae3fc26d 100644
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -5864,6 +5864,8 @@ typedef enum {
 
 bool nir_lower_gs_intrinsics(nir_shader *shader, nir_lower_gs_intrinsics_flags options);
 
+bool nir_lower_tess_coord_z(nir_shader *shader, bool triangles);
+
 typedef struct {
    bool payload_to_shared_for_atomics : 1;
    bool payload_to_shared_for_small_types : 1;
diff --git a/src/compiler/nir/nir_lower_tess_coord_z.c b/src/compiler/nir/nir_lower_tess_coord_z.c
new file mode 100644
index 00000000000..2daaabcd911
--- /dev/null
+++ b/src/compiler/nir/nir_lower_tess_coord_z.c
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2023 Valve Corporation
+ * SPDX-License-Identifier: MIT
+ */
+
+#include "nir.h"
+#include "nir_builder.h"
+#include "nir_intrinsics.h"
+#include "shader_enums.h"
+
+static bool
+lower_tess_coord_z(nir_builder *b, nir_instr *instr, void *state)
+{
+   if (instr->type != nir_instr_type_intrinsic)
+      return false;
+
+   nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
+   if (intr->intrinsic != nir_intrinsic_load_tess_coord)
+      return false;
+
+   b->cursor = nir_instr_remove(instr);
+   nir_ssa_def *xy = nir_load_tess_coord_xy(b);
+   nir_ssa_def *x = nir_channel(b, xy, 0);
+   nir_ssa_def *y = nir_channel(b, xy, 1);
+   nir_ssa_def *z;
+
+   bool *triangles = state;
+   if (*triangles)
+      z = nir_fsub(b, nir_fsub_imm(b, 1.0f, y), x);
+   else
+      z = nir_imm_float(b, 0.0f);
+
+   nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_vec3(b, x, y, z));
+   return true;
+}
+
+bool
+nir_lower_tess_coord_z(nir_shader *shader, bool triangles)
+{
+   return nir_shader_instructions_pass(shader, lower_tess_coord_z,
+                                       nir_metadata_block_index |
+                                       nir_metadata_dominance, &triangles);
+}