tgsi: remove unused tgsi_shader_info.uses_bindless_images
authorThomas H.P. Andersen <phomes@gmail.com>
Tue, 11 Jul 2023 16:22:29 +0000 (18:22 +0200)
committerMarge Bot <emma+marge@anholt.net>
Wed, 19 Jul 2023 12:41:27 +0000 (12:41 +0000)
Reviewed-by: Charmaine Lee <charmainel@vmware.com>
Reviewed-by: Christian Gmeiner <cgmeiner@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24100>

src/gallium/auxiliary/nir/nir_to_tgsi_info.c
src/gallium/auxiliary/tgsi/tgsi_scan.c
src/gallium/auxiliary/tgsi/tgsi_scan.h

index 8261a53..bf5a0db 100644 (file)
@@ -203,20 +203,12 @@ static void scan_instruction(const struct nir_shader *nir,
          info->uses_primid = 1;
          break;
       case nir_intrinsic_bindless_image_load:
-         info->uses_bindless_images = true;
-
          if (nir_intrinsic_image_dim(intr) == GLSL_SAMPLER_DIM_BUF)
             info->uses_bindless_buffer_load = true;
          else
             info->uses_bindless_image_load = true;
          break;
-      case nir_intrinsic_bindless_image_size:
-      case nir_intrinsic_bindless_image_samples:
-         info->uses_bindless_images = true;
-         break;
       case nir_intrinsic_bindless_image_store:
-         info->uses_bindless_images = true;
-
          if (nir_intrinsic_image_dim(intr) == GLSL_SAMPLER_DIM_BUF)
             info->uses_bindless_buffer_store = true;
          else
@@ -230,8 +222,6 @@ static void scan_instruction(const struct nir_shader *nir,
          break;
       case nir_intrinsic_bindless_image_atomic:
       case nir_intrinsic_bindless_image_atomic_swap:
-         info->uses_bindless_images = true;
-
          if (nir_intrinsic_image_dim(intr) == GLSL_SAMPLER_DIM_BUF)
             info->uses_bindless_buffer_atomic = true;
          else
index 3e8c0f0..ce715af 100644 (file)
@@ -262,14 +262,8 @@ scan_instruction(struct tgsi_shader_info *info,
    case TGSI_OPCODE_ENDLOOP:
       (*current_depth)--;
       break;
-   case TGSI_OPCODE_RESQ:
-      if (tgsi_is_bindless_image_file(fullinst->Src[0].Register.File))
-         info->uses_bindless_images = true;
-      break;
    case TGSI_OPCODE_LOAD:
       if (tgsi_is_bindless_image_file(fullinst->Src[0].Register.File)) {
-         info->uses_bindless_images = true;
-
          if (fullinst->Memory.Texture == TGSI_TEXTURE_BUFFER)
             info->uses_bindless_buffer_load = true;
          else
@@ -290,8 +284,6 @@ scan_instruction(struct tgsi_shader_info *info,
    case TGSI_OPCODE_ATOMINC_WRAP:
    case TGSI_OPCODE_ATOMDEC_WRAP:
       if (tgsi_is_bindless_image_file(fullinst->Src[0].Register.File)) {
-         info->uses_bindless_images = true;
-
          if (fullinst->Memory.Texture == TGSI_TEXTURE_BUFFER)
             info->uses_bindless_buffer_atomic = true;
          else
@@ -300,8 +292,6 @@ scan_instruction(struct tgsi_shader_info *info,
       break;
    case TGSI_OPCODE_STORE:
       if (tgsi_is_bindless_image_file(fullinst->Dst[0].Register.File)) {
-         info->uses_bindless_images = true;
-
          if (fullinst->Memory.Texture == TGSI_TEXTURE_BUFFER)
             info->uses_bindless_buffer_store = true;
          else
index 6b143d6..8d0f6ff 100644 (file)
@@ -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_images;
    bool uses_fbfetch;
    unsigned clipdist_writemask;
    unsigned culldist_writemask;