diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c
index 8fad5402a45..8f428170a3e 100644
--- a/src/compiler/nir/nir_divergence_analysis.c
+++ b/src/compiler/nir/nir_divergence_analysis.c
@@ -764,7 +764,6 @@ visit_intrinsic(nir_intrinsic_instr *instr, struct divergence_state *state)
    case nir_intrinsic_load_vulkan_descriptor:
    case nir_intrinsic_load_heap_descriptor:
    case nir_intrinsic_load_resource_heap_data:
-   case nir_intrinsic_global_addr_to_descriptor:
    case nir_intrinsic_load_input_attachment_target_pan:
    case nir_intrinsic_load_input_attachment_conv_pan:
    case nir_intrinsic_load_global_cvt_pan:
diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py
index cdebefedbb3..264ea5c1d7c 100644
--- a/src/compiler/nir/nir_intrinsics.py
+++ b/src/compiler/nir/nir_intrinsics.py
@@ -1462,9 +1462,6 @@ load("heap_descriptor", [1], [RESOURCE_TYPE], [CAN_ELIMINATE, CAN_REORDER])
 # src[] = { offset }.
 load("resource_heap_data", [1], [ALIGN_MUL, ALIGN_OFFSET],
      flags=[CAN_ELIMINATE, CAN_REORDER])
-# src[] = { addr }.
-intrinsic("global_addr_to_descriptor", src_comp=[1], dest_comp=0,
-          indices=[RESOURCE_TYPE], flags=[CAN_ELIMINATE, CAN_REORDER])
 
 # Select an output vertex in a poly GS. Takes the stream-local vertex ID.
 intrinsic("select_vertex_poly", src_comp=[1], indices=[STREAM_ID])