diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi_info.c b/src/gallium/auxiliary/nir/nir_to_tgsi_info.c
index 83a3b5ba357..8261a53f9c4 100644
--- a/src/gallium/auxiliary/nir/nir_to_tgsi_info.c
+++ b/src/gallium/auxiliary/nir/nir_to_tgsi_info.c
@@ -166,10 +166,6 @@ static void scan_instruction(const struct nir_shader *nir,
 
    if (instr->type == nir_instr_type_tex) {
       nir_tex_instr *tex = nir_instr_as_tex(instr);
-      const nir_variable *texture = tex_get_texture_var(tex);
-
-      if (texture && texture->data.bindless)
-         info->uses_bindless_samplers = true;
 
       switch (tex->op) {
       case nir_texop_tex:
diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c
index b793caf13a5..3e8c0f0ae88 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.c
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.c
@@ -247,7 +247,6 @@ scan_instruction(struct tgsi_shader_info *info,
 {
    unsigned i;
    bool is_mem_inst = false;
-   unsigned sampler_src;
 
    assert(fullinst->Instruction.Opcode < TGSI_OPCODE_LAST);
    info->opcode_count[fullinst->Instruction.Opcode]++;
@@ -263,25 +262,6 @@ scan_instruction(struct tgsi_shader_info *info,
    case TGSI_OPCODE_ENDLOOP:
       (*current_depth)--;
       break;
-   case TGSI_OPCODE_TEX:
-   case TGSI_OPCODE_TEX_LZ:
-   case TGSI_OPCODE_TXB:
-   case TGSI_OPCODE_TXD:
-   case TGSI_OPCODE_TXL:
-   case TGSI_OPCODE_TXP:
-   case TGSI_OPCODE_TXQ:
-   case TGSI_OPCODE_TXQS:
-   case TGSI_OPCODE_TXF:
-   case TGSI_OPCODE_TXF_LZ:
-   case TGSI_OPCODE_TEX2:
-   case TGSI_OPCODE_TXB2:
-   case TGSI_OPCODE_TXL2:
-   case TGSI_OPCODE_TG4:
-   case TGSI_OPCODE_LODQ:
-      sampler_src = fullinst->Instruction.NumSrcRegs - 1;
-      if (fullinst->Src[sampler_src].Register.File != TGSI_FILE_SAMPLER)
-         info->uses_bindless_samplers = true;
-      break;
    case TGSI_OPCODE_RESQ:
       if (tgsi_is_bindless_image_file(fullinst->Src[0].Register.File))
          info->uses_bindless_images = true;
diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.h b/src/gallium/auxiliary/tgsi/tgsi_scan.h
index 83eed40fa57..6b143d68ce2 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_scan.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h
@@ -104,7 +104,6 @@ struct tgsi_shader_info
    bool writes_viewport_index;
    bool writes_layer;
    bool writes_memory; /**< contains stores or atomics to buffers or images */
-   bool uses_bindless_samplers;
    bool uses_bindless_images;
    bool uses_fbfetch;
    unsigned clipdist_writemask;