diff --git a/src/gallium/drivers/r600/r600_query.c b/src/gallium/drivers/r600/r600_query.c index a0eab60a292..13e9b5699df 100644 --- a/src/gallium/drivers/r600/r600_query.c +++ b/src/gallium/drivers/r600/r600_query.c @@ -1112,7 +1112,7 @@ static void r600_get_hw_query_params(struct r600_common_context *rctx, params->start_offset = 0; params->end_offset = 16; - /* We can re-use the high dword of the last 64-bit value as a + /* We can reuse the high dword of the last 64-bit value as a * fence: it is initialized as 0, and the high bit is set by * the write of the streamout stats event. */ diff --git a/src/gallium/drivers/r600/radeon_uvd.h b/src/gallium/drivers/r600/radeon_uvd.h index ea541140d49..9262f637611 100644 --- a/src/gallium/drivers/r600/radeon_uvd.h +++ b/src/gallium/drivers/r600/radeon_uvd.h @@ -376,7 +376,7 @@ struct ruvd_msg { uint32_t dt_chroma_bottom_offset; uint32_t dt_surf_tile_config; uint32_t dt_uv_surf_tile_config; - // re-use dt_wa_chroma_top_offset as dt_ext_info for UV pitch in stoney + // reuse dt_wa_chroma_top_offset as dt_ext_info for UV pitch in stoney uint32_t dt_wa_chroma_top_offset; uint32_t dt_wa_chroma_bottom_offset; diff --git a/src/gallium/drivers/r600/sfn/sfn_instr.h b/src/gallium/drivers/r600/sfn/sfn_instr.h index 63f8a4c8ef3..25f75edbed6 100644 --- a/src/gallium/drivers/r600/sfn/sfn_instr.h +++ b/src/gallium/drivers/r600/sfn/sfn_instr.h @@ -121,7 +121,7 @@ public: virtual void update_indirect_addr(PRegister old_reg, PRegister addr) { (void)old_reg; (void)addr; - unreachable("Instruction type has no indirect addess"); + unreachable("Instruction type has no indirect address"); }; const InstrList& required_instr() const { return m_required_instr; } diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_controlflow.cpp b/src/gallium/drivers/r600/sfn/sfn_instr_controlflow.cpp index a7b97c65b40..a98338cb964 100644 --- a/src/gallium/drivers/r600/sfn/sfn_instr_controlflow.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_instr_controlflow.cpp @@ -134,7 +134,7 @@ IfInstr::is_equal_to(const IfInstr& rhs) const uint32_t IfInstr::slots() const { - /* If we hava a literal value in the predicate evaluation, then + /* If we have a literal value in the predicate evaluation, then * we need at most two alu slots, otherwise it's just one. */ for (auto s : m_predicate->sources()) if (s->as_literal()) diff --git a/src/gallium/drivers/r600/sfn/sfn_liverangeevaluator_helpers.h b/src/gallium/drivers/r600/sfn/sfn_liverangeevaluator_helpers.h index 8c382f4c6d6..9d9f0c0151c 100644 --- a/src/gallium/drivers/r600/sfn/sfn_liverangeevaluator_helpers.h +++ b/src/gallium/drivers/r600/sfn/sfn_liverangeevaluator_helpers.h @@ -135,7 +135,7 @@ private: static const int block_id_not_unique = -1; static const int block_id_uninitalized = 0; - /* A bit field tracking the nexting levels of if-else clauses where the + /* A bit field tracking the nesting levels of if-else clauses where the * temporary has (so far) been written to in the if branch, but not in the * else branch. */ diff --git a/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c b/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c index f9698e901ba..d9328c7f52c 100644 --- a/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c +++ b/src/gallium/drivers/r600/sfn/sfn_nir_vectorize_vs_inputs.c @@ -48,7 +48,7 @@ r600_variable_can_rewrite(nir_variable *var) if (glsl_get_bit_size(glsl_without_array(var->type)) != 32) return false; - /* We only check VSand attribute imputs */ + /* We only check VSand attribute inputs */ return (var->data.location >= VERT_ATTRIB_GENERIC0 && var->data.location <= VERT_ATTRIB_GENERIC15); } diff --git a/src/gallium/drivers/r600/sfn/sfn_shader_fs.cpp b/src/gallium/drivers/r600/sfn/sfn_shader_fs.cpp index 5ea33355a81..c3da36cb1a3 100644 --- a/src/gallium/drivers/r600/sfn/sfn_shader_fs.cpp +++ b/src/gallium/drivers/r600/sfn/sfn_shader_fs.cpp @@ -634,7 +634,7 @@ FragmentShaderR600::allocate_interpolators_or_inputs() pin_fully); inp.set_gpr(pos++); - sfn_log << SfnLog::io << "Reseve input register at pos " << index << " as " + sfn_log << SfnLog::io << "Reserve input register at pos " << index << " as " << input << " with register " << inp.gpr() << "\n"; m_interpolated_inputs[index] = input;