diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi_info.c b/src/gallium/auxiliary/nir/nir_to_tgsi_info.c
index 8a5f14013f5..d44a065c6b3 100644
--- a/src/gallium/auxiliary/nir/nir_to_tgsi_info.c
+++ b/src/gallium/auxiliary/nir/nir_to_tgsi_info.c
@@ -240,9 +240,6 @@ static void scan_instruction(const struct nir_shader *nir,
       case nir_intrinsic_load_base_vertex:
          info->uses_basevertex = 1;
          break;
-      case nir_intrinsic_load_draw_id:
-         info->uses_drawid = 1;
-         break;
       case nir_intrinsic_load_primitive_id:
          info->uses_primid = 1;
          break;
diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c
index 0eb0f0f8cf7..4fd0b228588 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.c
@@ -606,9 +606,6 @@ scan_declaration(struct tgsi_shader_info *info,
          case TGSI_SEMANTIC_BASEVERTEX:
             info->uses_basevertex = true;
             break;
-         case TGSI_SEMANTIC_DRAWID:
-            info->uses_drawid = true;
-            break;
          case TGSI_SEMANTIC_PRIMID:
             info->uses_primid = true;
             break;
diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.h b/src/gallium/auxiliary/tgsi/tgsi_scan.h
index 010b4d895ce..2dfd158526d 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h
@@ -94,7 +94,6 @@ struct tgsi_shader_info
    bool uses_vertexid;
    bool uses_vertexid_nobase;
    bool uses_basevertex;
-   bool uses_drawid;
    bool uses_primid;
    bool uses_frontface;
    bool uses_invocationid;