diff options
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/nir/nir.h | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir_from_ssa.c | 6 | ||||
| -rw-r--r-- | src/compiler/nir/nir_lower_returns.c | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir_move_vec_src_uses_to_dest.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index c1294543dd0..1f918af725d 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -1908,7 +1908,7 @@ nir_register *nir_local_reg_create(nir_function_impl *impl); void nir_reg_remove(nir_register *reg); -/** Adds a variable to the appropreate list in nir_shader */ +/** Adds a variable to the appropriate list in nir_shader */ void nir_shader_add_variable(nir_shader *shader, nir_variable *var); static inline void diff --git a/src/compiler/nir/nir_from_ssa.c b/src/compiler/nir/nir_from_ssa.c index 27e94f823b0..fdfbf98e374 100644 --- a/src/compiler/nir/nir_from_ssa.c +++ b/src/compiler/nir/nir_from_ssa.c @@ -63,7 +63,7 @@ ssa_def_dominates(nir_ssa_def *a, nir_ssa_def *b) /* The following data structure, which I have named merge_set is a way of * representing a set registers of non-interfering registers. This is - * based on the concept of a "dominence forest" presented in "Fast Copy + * based on the concept of a "dominance forest" presented in "Fast Copy * Coalescing and Live-Range Identification" by Budimlic et. al. but the * implementation concept is taken from "Revisiting Out-of-SSA Translation * for Correctness, Code Quality, and Efficiency" by Boissinot et. al.. @@ -71,8 +71,8 @@ ssa_def_dominates(nir_ssa_def *a, nir_ssa_def *b) * Each SSA definition is associated with a merge_node and the association * is represented by a combination of a hash table and the "def" parameter * in the merge_node structure. The merge_set stores a linked list of - * merge_nodes in dominence order of the ssa definitions. (Since the - * liveness analysis pass indexes the SSA values in dominence order for us, + * merge_nodes in dominance order of the ssa definitions. (Since the + * liveness analysis pass indexes the SSA values in dominance order for us, * this is an easy thing to keep up.) It is assumed that no pair of the * nodes in a given set interfere. Merging two sets or checking for * interference can be done in a single linear-time merge-sort walk of the diff --git a/src/compiler/nir/nir_lower_returns.c b/src/compiler/nir/nir_lower_returns.c index 33490b223b4..423192adb8a 100644 --- a/src/compiler/nir/nir_lower_returns.c +++ b/src/compiler/nir/nir_lower_returns.c @@ -113,7 +113,7 @@ lower_returns_in_if(nir_if *if_stmt, struct lower_returns_state *state) * returns inside of the body of the if. If we're in a loop, then these * were lowered to breaks which automatically skip to the end of the * loop so we don't have to do anything. If we're not in a loop, then - * all we know is that the return flag is set appropreately and that the + * all we know is that the return flag is set appropriately and that the * recursive calls ensured that nothing gets executed *inside* the if * after a return. In order to ensure nothing outside gets executed * after a return, we need to predicate everything following on the diff --git a/src/compiler/nir/nir_move_vec_src_uses_to_dest.c b/src/compiler/nir/nir_move_vec_src_uses_to_dest.c index 5ad17b8507d..29ebf92138b 100644 --- a/src/compiler/nir/nir_move_vec_src_uses_to_dest.c +++ b/src/compiler/nir/nir_move_vec_src_uses_to_dest.c @@ -114,10 +114,10 @@ move_vec_src_uses_to_dest_block(nir_block *block) if (vec->src[j].src.ssa != vec->src[i].src.ssa) continue; - /* Mark the given chanle as having been handled */ + /* Mark the given channel as having been handled */ srcs_remaining &= ~(1 << j); - /* Mark the appropreate channel as coming from src j */ + /* Mark the appropriate channel as coming from src j */ swizzle[vec->src[j].swizzle[0]] = j; } |