diff --git a/src/compiler/glsl/gl_nir_link_varyings.c b/src/compiler/glsl/gl_nir_link_varyings.c
index b50ed413625..57cbdba22b4 100644
--- a/src/compiler/glsl/gl_nir_link_varyings.c
+++ b/src/compiler/glsl/gl_nir_link_varyings.c
@@ -4491,43 +4491,6 @@ link_varyings(struct gl_shader_program *prog, unsigned first,
    return prog->data->LinkStatus != LINKING_FAILURE;
 }
 
-/**
- * Store the gl_FragDepth layout in the gl_shader_program struct.
- */
-static void
-store_fragdepth_layout(struct gl_shader_program *prog)
-{
-   if (prog->_LinkedShaders[MESA_SHADER_FRAGMENT] == NULL) {
-      return;
-   }
-
-   nir_shader *nir = prog->_LinkedShaders[MESA_SHADER_FRAGMENT]->Program->nir;
-   nir_foreach_shader_out_variable(var, nir) {
-      if (strcmp(var->name, "gl_FragDepth") == 0) {
-         switch (var->data.depth_layout) {
-         case nir_depth_layout_none:
-            prog->FragDepthLayout = FRAG_DEPTH_LAYOUT_NONE;
-            return;
-         case nir_depth_layout_any:
-            prog->FragDepthLayout = FRAG_DEPTH_LAYOUT_ANY;
-            return;
-         case nir_depth_layout_greater:
-            prog->FragDepthLayout = FRAG_DEPTH_LAYOUT_GREATER;
-            return;
-         case nir_depth_layout_less:
-            prog->FragDepthLayout = FRAG_DEPTH_LAYOUT_LESS;
-            return;
-         case nir_depth_layout_unchanged:
-            prog->FragDepthLayout = FRAG_DEPTH_LAYOUT_UNCHANGED;
-            return;
-         default:
-            assert(0);
-            return;
-         }
-      }
-   }
-}
-
 bool
 gl_assign_attribute_or_color_locations(const struct gl_constants *consts,
                                        struct gl_shader_program *prog)
@@ -4561,8 +4524,6 @@ gl_nir_link_varyings(const struct gl_constants *consts,
 
    MESA_TRACE_FUNC();
 
-   store_fragdepth_layout(prog);
-
    first = MESA_SHADER_STAGES;
    last = 0;
 
diff --git a/src/mesa/main/shader_types.h b/src/mesa/main/shader_types.h
index e8198a604d6..6d84ef94ee5 100644
--- a/src/mesa/main/shader_types.h
+++ b/src/mesa/main/shader_types.h
@@ -422,9 +422,6 @@ struct gl_shader_program
 
    struct gl_program *last_vert_prog;
 
-   /** Post-link gl_FragDepth layout for ARB_conservative_depth. */
-   enum gl_frag_depth_layout FragDepthLayout;
-
    /**
     * Geometry shader state - copied into gl_program by
     * _mesa_copy_linked_program_data().
diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index b1ca14bba72..15f39dbd17b 100644
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -2664,10 +2664,6 @@ _mesa_copy_linked_program_data(const struct gl_shader_program *src,
       dst->info.gs.active_stream_mask = src->Geom.ActiveStreamMask;
       break;
    }
-   case MESA_SHADER_FRAGMENT: {
-      dst->info.fs.depth_layout = src->FragDepthLayout;
-      break;
-   }
    default:
       break;
    }