From eba08245a8f70e78b3e4b67b10e709979af7ac25 Mon Sep 17 00:00:00 2001 From: Mel Henning Date: Mon, 8 Sep 2025 15:37:28 -0400 Subject: [PATCH] treewide: Spell indices correctly LOLed-by: Alyssa Rosenzweig Part-of: --- src/compiler/glsl/gl_nir_lower_images.c | 2 +- src/compiler/nir/nir_dominance.c | 6 +++--- src/compiler/nir/nir_intrinsics.py | 2 +- src/gallium/drivers/i915/i915_debug.c | 2 +- src/panfrost/lib/pan_encoder.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/compiler/glsl/gl_nir_lower_images.c b/src/compiler/glsl/gl_nir_lower_images.c index 3770e911593..7d8496aed67 100644 --- a/src/compiler/glsl/gl_nir_lower_images.c +++ b/src/compiler/glsl/gl_nir_lower_images.c @@ -26,7 +26,7 @@ * * Lower image operations by turning the image_deref_* into a image_* on an * index number or bindless_image_* intrinsic on a load_deref of the previous - * deref source. All applicable indicies are also set so that fetching the + * deref source. All applicable indices are also set so that fetching the * variable in the backend wouldn't be needed anymore. */ diff --git a/src/compiler/nir/nir_dominance.c b/src/compiler/nir/nir_dominance.c index fef893b3f84..dfbcca08ca4 100644 --- a/src/compiler/nir/nir_dominance.c +++ b/src/compiler/nir/nir_dominance.c @@ -157,7 +157,7 @@ calc_dom_children(nir_function_impl *impl) } static void -calc_dfs_indicies(nir_block *block, uint32_t *index) +calc_dfs_indices(nir_block *block, uint32_t *index) { /* UINT32_MAX has special meaning. See nir_block_dominates. */ assert(*index < UINT32_MAX - 2); @@ -165,7 +165,7 @@ calc_dfs_indicies(nir_block *block, uint32_t *index) block->dom_pre_index = (*index)++; for (unsigned i = 0; i < block->num_dom_children; i++) - calc_dfs_indicies(block->dom_children[i], index); + calc_dfs_indices(block->dom_children[i], index); block->dom_post_index = (*index)++; } @@ -201,7 +201,7 @@ nir_calc_dominance_impl(nir_function_impl *impl) calc_dom_children(impl); uint32_t dfs_index = 1; - calc_dfs_indicies(start_block, &dfs_index); + calc_dfs_indices(start_block, &dfs_index); } void diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py index f84413acafb..50759dc4275 100644 --- a/src/compiler/nir/nir_intrinsics.py +++ b/src/compiler/nir/nir_intrinsics.py @@ -53,7 +53,7 @@ class Intrinsic(object): - dest_components: number of destination components, -1 means no dest, 0 means number of components given in num_components field in nir_intrinsic_instr. - - indices: list of constant indicies + - indices: list of constant indices - flags: list of semantic flags - sysval: is this a system-value intrinsic - bit_sizes: allowed dest bit_sizes or the source it must match diff --git a/src/gallium/drivers/i915/i915_debug.c b/src/gallium/drivers/i915/i915_debug.c index 36ebb2bd200..97018b1fbba 100644 --- a/src/gallium/drivers/i915/i915_debug.c +++ b/src/gallium/drivers/i915/i915_debug.c @@ -216,7 +216,7 @@ debug_variable_length_prim(struct debug_stream *stream) len = 1 + (i + 2) / 2; - mesa_logi("3DPRIM, %s variable length %d indicies (%d dwords):", prim, i, + mesa_logi("3DPRIM, %s variable length %d indices (%d dwords):", prim, i, len); for (i = 0; i < len; i++) mesa_logi("\t0x%08x", ptr[i]); diff --git a/src/panfrost/lib/pan_encoder.h b/src/panfrost/lib/pan_encoder.h index fc1d9c822b0..fb62cda3059 100644 --- a/src/panfrost/lib/pan_encoder.h +++ b/src/panfrost/lib/pan_encoder.h @@ -208,7 +208,7 @@ pan_pack_work_groups_compute(struct mali_invocation_packed *out, unsigned num_x, bool quirk_graphics, bool indirect_dispatch) { /* The values needing packing, in order, and the corresponding shifts. - * Indicies into shift are off-by-one to make the logic easier */ + * Indices into shift are off-by-one to make the logic easier */ unsigned values[6] = {size_x, size_y, size_z, num_x, num_y, num_z}; unsigned shifts[7] = {0};