From 98b157bd9c3e2cd7ec9c09ef24cb511d9d4f494e Mon Sep 17 00:00:00 2001 From: "Thomas H.P. Andersen" Date: Tue, 11 Jul 2023 18:22:31 +0200 Subject: [PATCH] tgsi: remove unused tgsi_shader_info.uses_bindless_buffer_load Reviewed-by: Charmaine Lee Reviewed-by: Christian Gmeiner Part-of: --- src/gallium/auxiliary/nir/nir_to_tgsi_info.c | 4 +--- src/gallium/auxiliary/tgsi/tgsi_scan.c | 4 +--- src/gallium/auxiliary/tgsi/tgsi_scan.h | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/gallium/auxiliary/nir/nir_to_tgsi_info.c b/src/gallium/auxiliary/nir/nir_to_tgsi_info.c index 1b86322a732..8629ac8598d 100644 --- a/src/gallium/auxiliary/nir/nir_to_tgsi_info.c +++ b/src/gallium/auxiliary/nir/nir_to_tgsi_info.c @@ -203,9 +203,7 @@ static void scan_instruction(const struct nir_shader *nir, info->uses_primid = 1; break; case nir_intrinsic_bindless_image_load: - if (nir_intrinsic_image_dim(intr) == GLSL_SAMPLER_DIM_BUF) - info->uses_bindless_buffer_load = true; - else + if (nir_intrinsic_image_dim(intr) != GLSL_SAMPLER_DIM_BUF) info->uses_bindless_image_load = true; break; case nir_intrinsic_bindless_image_store: diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.c b/src/gallium/auxiliary/tgsi/tgsi_scan.c index 7b0a40f2ef7..96a693cb85d 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_scan.c +++ b/src/gallium/auxiliary/tgsi/tgsi_scan.c @@ -254,9 +254,7 @@ scan_instruction(struct tgsi_shader_info *info, break; case TGSI_OPCODE_LOAD: if (tgsi_is_bindless_image_file(fullinst->Src[0].Register.File)) { - if (fullinst->Memory.Texture == TGSI_TEXTURE_BUFFER) - info->uses_bindless_buffer_load = true; - else + if (fullinst->Memory.Texture != TGSI_TEXTURE_BUFFER) info->uses_bindless_image_load = true; } break; diff --git a/src/gallium/auxiliary/tgsi/tgsi_scan.h b/src/gallium/auxiliary/tgsi/tgsi_scan.h index b01a92add59..44595e177fe 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_scan.h +++ b/src/gallium/auxiliary/tgsi/tgsi_scan.h @@ -119,7 +119,6 @@ struct tgsi_shader_info unsigned shader_buffers_load; /**< bitmask of shader buffers using loads */ unsigned shader_buffers_store; /**< bitmask of shader buffers using stores */ unsigned shader_buffers_atomic; /**< bitmask of shader buffers using atomics */ - bool uses_bindless_buffer_load; bool uses_bindless_buffer_store; bool uses_bindless_buffer_atomic; bool uses_bindless_image_load;