diff --git a/rpcs3/Emu/Cell/Modules/cellMouse.cpp b/rpcs3/Emu/Cell/Modules/cellMouse.cpp index 4aaa269035..33cd10ee8c 100644 --- a/rpcs3/Emu/Cell/Modules/cellMouse.cpp +++ b/rpcs3/Emu/Cell/Modules/cellMouse.cpp @@ -134,7 +134,7 @@ s32 cellMouseGetData(u32 port_no, vm::ptr data) s32 cellMouseGetDataList(u32 port_no, vm::ptr data) { - sys_io.todo("cellMouseGetDataList(port_no=%d, data=0x%x", port_no, data); + sys_io.todo("cellMouseGetDataList(port_no=%d, data=0x%x)", port_no, data); if (g_cfg.io.mouse == mouse_handler::null) return CELL_MOUSE_ERROR_NO_DEVICE; else diff --git a/rpcs3/Emu/Cell/Modules/cellRtc.cpp b/rpcs3/Emu/Cell/Modules/cellRtc.cpp index 6bb89a56c5..7e3225436e 100644 --- a/rpcs3/Emu/Cell/Modules/cellRtc.cpp +++ b/rpcs3/Emu/Cell/Modules/cellRtc.cpp @@ -87,7 +87,6 @@ s32 cellRtcGetTick(vm::ptr pTime, vm::ptr pTick) { cellRtc.todo("cellRtcGetTick(pTime=*0x%x, pTick=*0x%x)", pTime, pTick); - return CELL_OK; } diff --git a/rpcs3/Emu/Io/PadHandler.cpp b/rpcs3/Emu/Io/PadHandler.cpp index 1bf572e744..0718fd91f2 100644 --- a/rpcs3/Emu/Io/PadHandler.cpp +++ b/rpcs3/Emu/Io/PadHandler.cpp @@ -242,7 +242,7 @@ std::tuple PadHandlerBase::ConvertToSquirclePoint(u16 inX, u16 inY, in // https://thatsmaths.com/2016/07/14/squircles/ const f32 newLen = (1 + std::pow(std::sin(2 * angle), 2.f) / (float(squircle_factor) / 1000.f)) * r; - // we now have len and angle, convert to cartisian + // we now have len and angle, convert to cartesian const int newX = Clamp0To255(((newLen * std::cos(angle)) + 1) * 127.5f); const int newY = Clamp0To255(((newLen * std::sin(angle)) + 1) * 127.5f); return std::tuple(newX, newY); diff --git a/rpcs3/Emu/Memory/MemoryBlock.h b/rpcs3/Emu/Memory/MemoryBlock.h index c07db09af4..87d9830b51 100644 --- a/rpcs3/Emu/Memory/MemoryBlock.h +++ b/rpcs3/Emu/Memory/MemoryBlock.h @@ -62,10 +62,10 @@ public: // Unmap address (please specify only starting point, no midway memory will be unmapped), returns the size of the unmapped area bool UnmapAddress(u32 addr, u32& size); - // Reserve a certain amount so no one can use it, returns true on succces, false on failure + // Reserve a certain amount so no one can use it, returns true on success, false on failure bool Reserve(u32 size); - // Unreserve a certain amount of bytes, returns true on succcess, false if size is bigger than the reserved amount + // Unreserve a certain amount of bytes, returns true on success, false if size is bigger than the reserved amount bool Unreserve(u32 size); // Return the total amount of reserved memory diff --git a/rpcs3/Emu/RSX/Capture/rsx_capture.cpp b/rpcs3/Emu/RSX/Capture/rsx_capture.cpp index 1856e19003..4d9b037690 100644 --- a/rpcs3/Emu/RSX/Capture/rsx_capture.cpp +++ b/rpcs3/Emu/RSX/Capture/rsx_capture.cpp @@ -363,7 +363,7 @@ namespace rsx u32 dst_dma = 0; rsx::blit_engine::transfer_destination_format dst_color_format; u32 out_pitch = 0; - u32 out_aligment = 64; + u32 out_alignment = 64; switch (method_registers.blit_engine_context_surface()) { @@ -372,7 +372,7 @@ namespace rsx dst_offset = method_registers.blit_engine_output_offset_nv3062(); dst_color_format = method_registers.blit_engine_nv3062_color_format(); out_pitch = method_registers.blit_engine_output_pitch_nv3062(); - out_aligment = method_registers.blit_engine_output_alignment_nv3062(); + out_alignment = method_registers.blit_engine_output_alignment_nv3062(); break; case blit_engine::context_surface::swizzle2d: diff --git a/rpcs3/Emu/RSX/Capture/rsx_replay.cpp b/rpcs3/Emu/RSX/Capture/rsx_replay.cpp index fd10bd1959..b3029e311b 100644 --- a/rpcs3/Emu/RSX/Capture/rsx_replay.cpp +++ b/rpcs3/Emu/RSX/Capture/rsx_replay.cpp @@ -123,7 +123,7 @@ namespace rsx { if (count != 0) { - // todo: support memory state in the middle of incrememented command + // todo: support memory state in the middle of incremented command // This shouldn't ever happen as long as captures stay in 'strict' aka non-multidraw mode fmt::throw_exception("capture replay: state change not supported between increment commands"); } diff --git a/rpcs3/Emu/RSX/Capture/rsx_replay.h b/rpcs3/Emu/RSX/Capture/rsx_replay.h index eb0977ebf0..f5aef06da8 100644 --- a/rpcs3/Emu/RSX/Capture/rsx_replay.h +++ b/rpcs3/Emu/RSX/Capture/rsx_replay.h @@ -124,7 +124,7 @@ namespace rsx } }; - // bleh, may need to break these out, might be unneccessary to do both always + // bleh, may need to break these out, might be unnecessary to do both always struct tile_state { tile_info tiles[15]; diff --git a/rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp b/rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp index 92ebdf4fc0..2e9857c2ee 100644 --- a/rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/CgBinaryFragmentProgram.cpp @@ -469,7 +469,7 @@ void CgBinaryDisasm::TaskFP() if (dst.end) { m_arb_shader.pop_back(); - m_arb_shader += " # last inctruction\nEND\n"; + m_arb_shader += " # last instruction\nEND\n"; break; } diff --git a/rpcs3/Emu/RSX/CgBinaryProgram.h b/rpcs3/Emu/RSX/CgBinaryProgram.h index 4d79c1d23b..62ebe81837 100644 --- a/rpcs3/Emu/RSX/CgBinaryProgram.h +++ b/rpcs3/Emu/RSX/CgBinaryProgram.h @@ -26,7 +26,7 @@ typedef struct CgBinaryProgram CgBinaryProgram; // fragment programs have their constants embedded in the microcode struct CgBinaryEmbeddedConstant { - be_t ucodeCount; // occurances + be_t ucodeCount; // occurrences be_t ucodeOffset[1]; // offsets that need to be patched follow }; @@ -76,7 +76,7 @@ struct CgBinaryFragmentProgram be_t texCoordsCentroid; // tex coords that are centroid (tex is bit n) u8 registerCount; // R registers count u8 outputFromH0; // final color from R0 or H0 - u8 depthReplace; // fp generated z epth value + u8 depthReplace; // fp generated z depth value u8 pixelKill; // fp uses kill operations }; diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.cpp b/rpcs3/Emu/RSX/Common/BufferUtils.cpp index 36854d6dbb..f5c03a5fb6 100644 --- a/rpcs3/Emu/RSX/Common/BufferUtils.cpp +++ b/rpcs3/Emu/RSX/Common/BufferUtils.cpp @@ -274,7 +274,7 @@ namespace } } - inline void stream_data_to_memory_u8_non_continous(void *dst, const void *src, u32 vertex_count, u8 attribute_size, u8 dst_stride, u8 src_stride) + inline void stream_data_to_memory_u8_non_continuous(void *dst, const void *src, u32 vertex_count, u8 attribute_size, u8 dst_stride, u8 src_stride) { char *src_ptr = (char *)src; char *dst_ptr = (char *)dst; @@ -472,7 +472,7 @@ void write_vertex_array_data_to_buffer(gsl::span raw_dst_span, gsl::s if (use_stream_no_stride) memcpy(raw_dst_span.data(), src_ptr.data(), count * dst_stride); else if (use_stream_with_stride) - stream_data_to_memory_u8_non_continous(raw_dst_span.data(), src_ptr.data(), count, vector_element_count, dst_stride, attribute_src_stride); + stream_data_to_memory_u8_non_continuous(raw_dst_span.data(), src_ptr.data(), count, vector_element_count, dst_stride, attribute_src_stride); else copy_whole_attribute_array((void *)raw_dst_span.data(), (void *)src_ptr.data(), vector_element_count, dst_stride, attribute_src_stride, count, real_count); @@ -599,7 +599,7 @@ std::tuple expand_indexed_triangle_fan(gsl::span> sr if (last_index == invalid_index) { - //Need at least one anchor and one outer index to create a triange + //Need at least one anchor and one outer index to create a triangle last_index = index; continue; } diff --git a/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp b/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp index e0158ff3d0..6df1b3fbde 100644 --- a/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.cpp @@ -225,7 +225,7 @@ std::string FragmentProgramDecompiler::AddX2d() } //Both of these were tested with a trace SoulCalibur IV title screen -//Failure to catch causes infinite values since theres alot of rcp(0) +//Failure to catch causes infinite values since there is a lot of rcp(0) std::string FragmentProgramDecompiler::NotZero(const std::string& code) { return "(max(abs(" + code + "), 0.0000000001) * sign(" + code + "))"; @@ -238,8 +238,8 @@ std::string FragmentProgramDecompiler::NotZeroPositive(const std::string& code) std::string FragmentProgramDecompiler::ClampValue(const std::string& code, u32 precision) { - //FP16 is expected to overflow alot easier at 0+-65504 - //FP32 can still work upto 0+-3.4E38 + //FP16 is expected to overflow a lot easier at 0+-65504 + //FP32 can still work up to 0+-3.4E38 //See http://http.download.nvidia.com/developer/Papers/2005/FP_Specials/FP_Specials.pdf switch (precision) @@ -374,7 +374,7 @@ void FragmentProgramDecompiler::AddCodeCond(const std::string& dst, const std::s std::string cond = GetRawCond(); ShaderVariable dst_var(dst); - dst_var.symplify(); + dst_var.simplify(); //const char *c_mask = f; @@ -501,7 +501,7 @@ std::string FragmentProgramDecompiler::BuildCode() OS << "\n"; insertConstants(OS); OS << "\n"; - insertIntputs(OS); + insertInputs(OS); OS << "\n"; insertOutputs(OS); OS << "\n"; @@ -557,7 +557,7 @@ bool FragmentProgramDecompiler::handle_sct(u32 opcode) case RSX_FP_OPCODE_MIN: SetDst("min($0, $1)"); return true; case RSX_FP_OPCODE_MOV: SetDst("$0"); return true; case RSX_FP_OPCODE_MUL: SetDst("($0 * $1)"); return true; - // Note: It's higly likely that RCP is not IEEE compliant but a game that uses rcp(0) has to be found + // Note: It's highly likely that RCP is not IEEE compliant but a game that uses rcp(0) has to be found case RSX_FP_OPCODE_RCP: SetDst("(1. / " + NotZero("$0.x") + ").xxxx"); return true; // Note: RSQ is not IEEE compliant. rsq(0) is some big number (Silent Hill 3 HD) // It is not know what happens if 0 is negative. @@ -908,8 +908,8 @@ std::string FragmentProgramDecompiler::Decompile() if (handle_tex_srb(opcode)) break; //FENCT/FENCB do not actually reject instructions if they dont match the forced unit - //Tested with Dark Souls II where the repecting FENCX instruction will result in empty luminance averaging shaders - //TODO: More reasearch is needed to determine what real HW does + //Tested with Dark Souls II where the respecting FENCX instruction will result in empty luminance averaging shaders + //TODO: More research is needed to determine what real HW does if (handle_sct(opcode)) break; if (handle_scb(opcode)) break; forced_unit = FORCE_NONE; diff --git a/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h b/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h index 67d66598fb..023f7458fb 100644 --- a/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h +++ b/rpcs3/Emu/RSX/Common/FragmentProgramDecompiler.h @@ -11,7 +11,7 @@ * - virtual std::string saturate(const std::string &code) = 0; * - virtual std::string compareFunction(enum class COMPARE, const std::string &, const std::string &) = 0; * - virtual void insertHeader(std::stringstream &OS) = 0; - * - virtual void insertIntputs(std::stringstream &OS) = 0; + * - virtual void insertInputs(std::stringstream &OS) = 0; * - virtual void insertOutputs(std::stringstream &OS) = 0; * - virtual void insertConstants(std::stringstream &OS) = 0; * - virtual void insertMainStart(std::stringstream &OS) = 0; @@ -223,7 +223,7 @@ protected: virtual void insertHeader(std::stringstream &OS) = 0; /** Insert global declaration of fragments inputs. */ - virtual void insertIntputs(std::stringstream &OS) = 0; + virtual void insertInputs(std::stringstream &OS) = 0; /** insert global declaration of fragments outputs. */ virtual void insertOutputs(std::stringstream &OS) = 0; diff --git a/rpcs3/Emu/RSX/Common/ShaderParam.h b/rpcs3/Emu/RSX/Common/ShaderParam.h index a1fbd23614..8d92acf307 100644 --- a/rpcs3/Emu/RSX/Common/ShaderParam.h +++ b/rpcs3/Emu/RSX/Common/ShaderParam.h @@ -198,7 +198,7 @@ public: return swizzles[swizzles.size() - 1].length(); } - ShaderVariable& symplify() + ShaderVariable& simplify() { std::unordered_map swizzle; diff --git a/rpcs3/Emu/RSX/Common/TextureUtils.cpp b/rpcs3/Emu/RSX/Common/TextureUtils.cpp index eddfd8d29f..2b9acbb225 100644 --- a/rpcs3/Emu/RSX/Common/TextureUtils.cpp +++ b/rpcs3/Emu/RSX/Common/TextureUtils.cpp @@ -494,7 +494,7 @@ u8 get_format_block_size_in_bytes(rsx::surface_color_format format) } } -size_t get_placed_texture_storage_size(u16 width, u16 height, u32 depth, u8 format, u16 mipmap, bool cubemap, size_t row_pitch_alignement, size_t mipmap_alignment) +size_t get_placed_texture_storage_size(u16 width, u16 height, u32 depth, u8 format, u16 mipmap, bool cubemap, size_t row_pitch_alignment, size_t mipmap_alignment) { size_t w = width; size_t h = std::max(height, 1); @@ -510,7 +510,7 @@ size_t get_placed_texture_storage_size(u16 width, u16 height, u32 depth, u8 form size_t result = 0; for (u16 i = 0; i < mipmap; ++i) { - size_t rowPitch = align(block_size_in_byte * width_in_blocks, row_pitch_alignement); + size_t rowPitch = align(block_size_in_byte * width_in_blocks, row_pitch_alignment); result += align(rowPitch * height_in_blocks * d, mipmap_alignment); height_in_blocks = std::max(height_in_blocks / 2, 1); width_in_blocks = std::max(width_in_blocks / 2, 1); @@ -519,16 +519,16 @@ size_t get_placed_texture_storage_size(u16 width, u16 height, u32 depth, u8 form return result * (cubemap ? 6 : 1); } -size_t get_placed_texture_storage_size(const rsx::fragment_texture &texture, size_t row_pitch_alignement, size_t mipmap_alignment) +size_t get_placed_texture_storage_size(const rsx::fragment_texture &texture, size_t row_pitch_alignment, size_t mipmap_alignment) { return get_placed_texture_storage_size(texture.width(), texture.height(), texture.depth(), texture.format(), texture.mipmap(), texture.cubemap(), - row_pitch_alignement, mipmap_alignment); + row_pitch_alignment, mipmap_alignment); } -size_t get_placed_texture_storage_size(const rsx::vertex_texture &texture, size_t row_pitch_alignement, size_t mipmap_alignment) +size_t get_placed_texture_storage_size(const rsx::vertex_texture &texture, size_t row_pitch_alignment, size_t mipmap_alignment) { return get_placed_texture_storage_size(texture.width(), texture.height(), texture.depth(), texture.format(), texture.mipmap(), texture.cubemap(), - row_pitch_alignement, mipmap_alignment); + row_pitch_alignment, mipmap_alignment); } diff --git a/rpcs3/Emu/RSX/Common/TextureUtils.h b/rpcs3/Emu/RSX/Common/TextureUtils.h index 704f544473..0051d6b464 100644 --- a/rpcs3/Emu/RSX/Common/TextureUtils.h +++ b/rpcs3/Emu/RSX/Common/TextureUtils.h @@ -43,11 +43,11 @@ struct rsx_subresource_layout /** * Get size to store texture in a linear fashion. -* Storage is assumed to use a rowPitchAlignement boundary for every row of texture. +* Storage is assumed to use a rowPitchAlignment boundary for every row of texture. */ -size_t get_placed_texture_storage_size(u16 width, u16 height, u32 depth, u8 format, u16 mipmap, bool cubemap, size_t row_pitch_alignement, size_t mipmap_alignment); -size_t get_placed_texture_storage_size(const rsx::fragment_texture &texture, size_t row_pitch_alignement, size_t mipmap_alignment = 0x200); -size_t get_placed_texture_storage_size(const rsx::vertex_texture &texture, size_t row_pitch_alignement, size_t mipmap_alignment = 0x200); +size_t get_placed_texture_storage_size(u16 width, u16 height, u32 depth, u8 format, u16 mipmap, bool cubemap, size_t row_pitch_alignment, size_t mipmap_alignment); +size_t get_placed_texture_storage_size(const rsx::fragment_texture &texture, size_t row_pitch_alignment, size_t mipmap_alignment = 0x200); +size_t get_placed_texture_storage_size(const rsx::vertex_texture &texture, size_t row_pitch_alignment, size_t mipmap_alignment = 0x200); /** * get all rsx_subresource_layout for texture. diff --git a/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp b/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp index 9eb56ab462..1e4ec8806e 100644 --- a/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp @@ -296,7 +296,7 @@ void VertexProgramDecompiler::AddCodeCond(const std::string& dst, const std::str std::string cond = compareFunction(cond_string_table[d0.cond], AddCondReg() + swizzle, getFloatTypeName(4) + "(0., 0., 0., 0.)"); ShaderVariable dst_var(dst); - dst_var.symplify(); + dst_var.simplify(); //const char *c_mask = f; diff --git a/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.h b/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.h index 95afec7986..4399948158 100644 --- a/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.h +++ b/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.h @@ -13,7 +13,7 @@ * - virtual std::string getFunction(enum class FUNCTION) = 0; * - virtual std::string compareFunction(enum class COMPARE, const std::string &, const std::string &) = 0; * - virtual void insertHeader(std::stringstream &OS) = 0; -* - virtual void insertIntputs(std::stringstream &OS) = 0; +* - virtual void insertInputs(std::stringstream &OS) = 0; * - virtual void insertOutputs(std::stringstream &OS) = 0; * - virtual void insertConstants(std::stringstream &OS) = 0; * - virtual void insertMainStart(std::stringstream &OS) = 0; diff --git a/rpcs3/Emu/RSX/Common/ring_buffer_helper.h b/rpcs3/Emu/RSX/Common/ring_buffer_helper.h index baf1fdf7b2..6fb8438d30 100644 --- a/rpcs3/Emu/RSX/Common/ring_buffer_helper.h +++ b/rpcs3/Emu/RSX/Common/ring_buffer_helper.h @@ -13,11 +13,11 @@ struct data_heap /** * Does alloc cross get position ? */ - template + template bool can_alloc(size_t size) const { - size_t alloc_size = align(size, Alignement); - size_t aligned_put_pos = align(m_put_pos, Alignement); + size_t alloc_size = align(size, Alignment); + size_t aligned_put_pos = align(m_put_pos, Alignment); if (aligned_put_pos + alloc_size < m_size) { // range before get @@ -70,17 +70,17 @@ public: m_largest_allocated_pool = 0; } - template + template size_t alloc(size_t size) { - if (!can_alloc(size)) + if (!can_alloc(size)) { fmt::throw_exception("[%s] Working buffer not big enough, buffer_length=%d allocated=%d requested=%d guard=%d largest_pool=%d" HERE, m_name, m_size, m_current_allocated_size, size, m_min_guard_size, m_largest_allocated_pool); } - size_t alloc_size = align(size, Alignement); - size_t aligned_put_pos = align(m_put_pos, Alignement); + size_t alloc_size = align(size, Alignment); + size_t aligned_put_pos = align(m_put_pos, Alignment); const size_t block_length = (aligned_put_pos - m_put_pos) + alloc_size; m_current_allocated_size += block_length; diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h index aa1165ceeb..f74ce65e38 100644 --- a/rpcs3/Emu/RSX/Common/surface_store.h +++ b/rpcs3/Emu/RSX/Common/surface_store.h @@ -624,10 +624,10 @@ namespace rsx } /** - * Clipping and fitting lookup funcrions + * Clipping and fitting lookup functions * surface_overlaps - returns true if surface overlaps a given surface address and returns the relative x and y position of the surface address within the surface * address_is_bound - returns true if the surface at a given address is actively bound - * get_surface_subresource_if_available - returns a sectiion descriptor that allows to crop surfaces stored in memory + * get_surface_subresource_if_available - returns a section descriptor that allows to crop surfaces stored in memory */ bool surface_overlaps_address(surface_type surface, u32 surface_address, u32 texaddr, u16 *x, u16 *y) { diff --git a/rpcs3/Emu/RSX/Common/texture_cache.h b/rpcs3/Emu/RSX/Common/texture_cache.h index bb5298d703..5c9181fd8d 100644 --- a/rpcs3/Emu/RSX/Common/texture_cache.h +++ b/rpcs3/Emu/RSX/Common/texture_cache.h @@ -272,7 +272,7 @@ namespace rsx bool violation_handled = false; std::vector sections_to_flush; //Sections to be flushed std::vector sections_to_reprotect; //Sections to be protected after flushing - std::vector sections_to_unprotect; //These sections are to be unpotected and discarded by caller + std::vector sections_to_unprotect; //These sections are to be unprotected and discarded by caller int num_flushable = 0; u64 cache_tag = 0; u32 address_base = 0; diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Formats.h b/rpcs3/Emu/RSX/D3D12/D3D12Formats.h index 57baea3c40..39ecff689f 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Formats.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12Formats.h @@ -94,12 +94,12 @@ DXGI_FORMAT get_depth_samplable_surface_format(rsx::surface_depth_format format) UCHAR get_dxgi_texel_size(DXGI_FORMAT format); /** - * Convert front face value to bool value telling wheter front face is counterclockwise or not + * Convert front face value to bool value telling whether front face is counterclockwise or not */ BOOL get_front_face_ccw(rsx::front_face set_front_face_value); /** -* Convert cull face value to a D3D12_CULL_MODE telling wheter cull face is front or back +* Convert cull face value to a D3D12_CULL_MODE telling whether cull face is front or back */ D3D12_CULL_MODE get_cull_face(rsx::cull_face set_cull_face_value); diff --git a/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp index a7e85bdd99..7784a2a655 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp @@ -55,7 +55,7 @@ void D3D12FragmentDecompiler::insertHeader(std::stringstream & OS) OS << "};\n"; } -void D3D12FragmentDecompiler::insertIntputs(std::stringstream & OS) +void D3D12FragmentDecompiler::insertInputs(std::stringstream & OS) { OS << "struct PixelInput\n"; OS << "{\n"; diff --git a/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.h b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.h index d17d1ad3eb..1377f8ec06 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.h @@ -14,7 +14,7 @@ protected: virtual std::string compareFunction(enum class COMPARE, const std::string &, const std::string &) override; virtual void insertHeader(std::stringstream &OS) override; - virtual void insertIntputs(std::stringstream &OS) override; + virtual void insertInputs(std::stringstream &OS) override; virtual void insertOutputs(std::stringstream &OS) override; virtual void insertConstants(std::stringstream &OS) override; virtual void insertGlobalFunctions(std::stringstream &OS) override; diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Utils.h b/rpcs3/Emu/RSX/D3D12/D3D12Utils.h index 77346b0acb..1b335e4309 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Utils.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12Utils.h @@ -33,7 +33,7 @@ inline std::string get_hresult_message(HRESULT hr) /** * Send data to dst pointer without polluting cache. - * Usefull to write to mapped memory from upload heap. + * Useful to write to mapped memory from upload heap. */ inline void streamToBuffer(void* dst, void* src, size_t sizeInBytes) @@ -47,7 +47,7 @@ void streamToBuffer(void* dst, void* src, size_t sizeInBytes) /** * copy src to dst pointer without polluting cache. -* Usefull to write to mapped memory from upload heap. +* Useful to write to mapped memory from upload heap. */ inline void streamBuffer(void* dst, void* src, size_t sizeInBytes) diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp index 3ba715446b..9e140fa100 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp @@ -33,7 +33,7 @@ void GLFragmentDecompilerThread::insertHeader(std::stringstream & OS) OS << "#version 430\n"; } -void GLFragmentDecompilerThread::insertIntputs(std::stringstream & OS) +void GLFragmentDecompilerThread::insertInputs(std::stringstream & OS) { bool two_sided_enabled = m_prog.front_back_color_enabled && (m_prog.back_color_diffuse_output || m_prog.back_color_specular_output); std::vector inputs_to_declare; diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.h b/rpcs3/Emu/RSX/GL/GLFragmentProgram.h index dc991d8701..9e65e2370f 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.h +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.h @@ -25,7 +25,7 @@ protected: virtual std::string compareFunction(COMPARE, const std::string&, const std::string&) override; virtual void insertHeader(std::stringstream &OS) override; - virtual void insertIntputs(std::stringstream &OS) override; + virtual void insertInputs(std::stringstream &OS) override; virtual void insertOutputs(std::stringstream &OS) override; virtual void insertConstants(std::stringstream &OS) override; virtual void insertGlobalFunctions(std::stringstream &OS) override; diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.cpp b/rpcs3/Emu/RSX/GL/GLGSRender.cpp index 09e362f5c9..61fdd998fd 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.cpp +++ b/rpcs3/Emu/RSX/GL/GLGSRender.cpp @@ -193,7 +193,7 @@ void GLGSRender::end() if (manually_flush_ring_buffers) { - //Use approximations to reseve space. This path is mostly for debug purposes anyway + //Use approximations to reserve space. This path is mostly for debug purposes anyway u32 approx_vertex_count = rsx::method_registers.current_draw_clause.get_elements_count(); u32 approx_working_buffer_size = approx_vertex_count * 256; @@ -212,7 +212,7 @@ void GLGSRender::end() if (surface->get_internal_format() == surface->old_contents->get_internal_format()) { //Copy data from old contents onto this one - //1. Clip a rectangular region defning the data + //1. Clip a rectangular region defining the data //2. Perform a GPU blit u16 parent_w = surface->old_contents->width(); u16 parent_h = surface->old_contents->height(); @@ -272,7 +272,7 @@ void GLGSRender::end() if (buffers_to_clear.size() > 0 && !clear_all_color) { GLfloat colors[] = { 0.f, 0.f, 0.f, 0.f }; - //It is impossible for the render target to be typa A or B here (clear all would have been flagged) + //It is impossible for the render target to be type A or B here (clear all would have been flagged) for (auto &i : buffers_to_clear) glClearBufferfv(draw_fbo.id(), i, colors); } @@ -1308,7 +1308,7 @@ void GLGSRender::update_draw_state() gl_state.enable(rsx::method_registers.poly_offset_fill_enabled(), GL_POLYGON_OFFSET_FILL); //offset_bias is the constant factor, multiplied by the implementation factor R - //offst_scale is the slope factor, multiplied by the triangle slope factor M + //offset_scale is the slope factor, multiplied by the triangle slope factor M gl_state.polygon_offset(rsx::method_registers.poly_offset_scale(), rsx::method_registers.poly_offset_bias()); if (gl_state.enable(rsx::method_registers.cull_face_enabled(), GL_CULL_FACE)) @@ -1414,7 +1414,7 @@ void GLGSRender::flip(int buffer) if (!buffer_pitch) buffer_pitch = buffer_width * 4; gl::pixel_unpack_settings unpack_settings; - unpack_settings.aligment(1).row_length(buffer_pitch / 4); + unpack_settings.alignment(1).row_length(buffer_pitch / 4); if (!m_flip_tex_color || m_flip_tex_color->size2D() != sizei{ (int)buffer_width, (int)buffer_height }) { diff --git a/rpcs3/Emu/RSX/GL/GLHelpers.h b/rpcs3/Emu/RSX/GL/GLHelpers.h index bae8dea9ee..79d774d661 100644 --- a/rpcs3/Emu/RSX/GL/GLHelpers.h +++ b/rpcs3/Emu/RSX/GL/GLHelpers.h @@ -400,7 +400,7 @@ namespace gl int m_skip_rows = 0; int m_skip_pixels = 0; int m_skip_images = 0; - int m_aligment = 4; + int m_alignment = 4; public: void apply() const @@ -412,7 +412,7 @@ namespace gl glPixelStorei(GL_PACK_SKIP_ROWS, m_skip_rows); glPixelStorei(GL_PACK_SKIP_PIXELS, m_skip_pixels); glPixelStorei(GL_PACK_SKIP_IMAGES, m_skip_images); - glPixelStorei(GL_PACK_ALIGNMENT, m_aligment); + glPixelStorei(GL_PACK_ALIGNMENT, m_alignment); } pixel_pack_settings& swap_bytes(bool value = true) @@ -450,9 +450,9 @@ namespace gl m_skip_images = value; return *this; } - pixel_pack_settings& aligment(int value) + pixel_pack_settings& alignment(int value) { - m_aligment = value; + m_alignment = value; return *this; } }; @@ -466,7 +466,7 @@ namespace gl int m_skip_rows = 0; int m_skip_pixels = 0; int m_skip_images = 0; - int m_aligment = 4; + int m_alignment = 4; public: void apply() const @@ -478,7 +478,7 @@ namespace gl glPixelStorei(GL_UNPACK_SKIP_ROWS, m_skip_rows); glPixelStorei(GL_UNPACK_SKIP_PIXELS, m_skip_pixels); glPixelStorei(GL_UNPACK_SKIP_IMAGES, m_skip_images); - glPixelStorei(GL_UNPACK_ALIGNMENT, m_aligment); + glPixelStorei(GL_UNPACK_ALIGNMENT, m_alignment); } pixel_unpack_settings& swap_bytes(bool value = true) @@ -516,9 +516,9 @@ namespace gl m_skip_images = value; return *this; } - pixel_unpack_settings& aligment(int value) + pixel_unpack_settings& alignment(int value) { - m_aligment = value; + m_alignment = value; return *this; } }; diff --git a/rpcs3/Emu/RSX/GL/GLRenderTargets.h b/rpcs3/Emu/RSX/GL/GLRenderTargets.h index 4e7f98e706..0c5d9dcb7f 100644 --- a/rpcs3/Emu/RSX/GL/GLRenderTargets.h +++ b/rpcs3/Emu/RSX/GL/GLRenderTargets.h @@ -148,7 +148,7 @@ namespace gl bool matches_dimensions(u16 _width, u16 _height) const { - //Use foward scaling to account for rounding and clamping errors + //Use forward scaling to account for rounding and clamping errors return (rsx::apply_resolution_scale(_width, true) == internal_width) && (rsx::apply_resolution_scale(_height, true) == internal_height); } }; diff --git a/rpcs3/Emu/RSX/GL/GLTexture.cpp b/rpcs3/Emu/RSX/GL/GLTexture.cpp index ff34bc2156..0db427b00c 100644 --- a/rpcs3/Emu/RSX/GL/GLTexture.cpp +++ b/rpcs3/Emu/RSX/GL/GLTexture.cpp @@ -136,7 +136,7 @@ namespace gl case GL_RGBA8: return GL_SRGB8_ALPHA8; default: - //LOG_ERROR(RSX, "No gamma coversion for format 0x%X", in_format); + //LOG_ERROR(RSX, "No gamma conversion for format 0x%X", in_format); return in_format; } } @@ -189,7 +189,7 @@ namespace gl case rsx::texture_minify_filter::linear_linear: return GL_LINEAR_MIPMAP_LINEAR; case rsx::texture_minify_filter::convolution_min: return GL_LINEAR_MIPMAP_LINEAR; } - fmt::throw_exception("Unknow min filter" HERE); + fmt::throw_exception("Unknown min filter" HERE); } int tex_mag_filter(rsx::texture_magnify_filter mag_filter) @@ -200,7 +200,7 @@ namespace gl case rsx::texture_magnify_filter::linear: return GL_LINEAR; case rsx::texture_magnify_filter::convolution_mag: return GL_LINEAR; } - fmt::throw_exception("Unknow mag filter" HERE); + fmt::throw_exception("Unknown mag filter" HERE); } //Apply sampler state settings diff --git a/rpcs3/Emu/RSX/GL/GLTextureCache.h b/rpcs3/Emu/RSX/GL/GLTextureCache.h index 41a4871888..96a75e34f8 100644 --- a/rpcs3/Emu/RSX/GL/GLTextureCache.h +++ b/rpcs3/Emu/RSX/GL/GLTextureCache.h @@ -407,9 +407,9 @@ namespace gl glBindBuffer(GL_PIXEL_PACK_BUFFER, pbo_id); pixel_pack_settings pack_settings; - pack_settings.aligment(1); + pack_settings.alignment(1); - //NOTE: AMD properietary driver bug - disable swap bytes + //NOTE: AMD proprietary driver bug - disable swap bytes if (!::gl::get_driver_caps().vendor_AMD) pack_settings.swap_bytes(pack_unpack_swap_bytes); diff --git a/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp b/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp index 916ce3f108..b2dcd7c93d 100644 --- a/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp +++ b/rpcs3/Emu/RSX/GL/GLVertexBuffers.cpp @@ -140,7 +140,7 @@ namespace return{ 0, 0, 0, 0, std::make_tuple(get_index_type(type), offset_in_index_buffer) }; } - //check for vertex arrays with frquency modifiers + //check for vertex arrays with frequency modifiers for (auto &block : m_vertex_layout.interleaved_blocks) { if (block.min_divisor > 1) diff --git a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp index d8e4f28c04..a808fa0d18 100644 --- a/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLVertexProgram.cpp @@ -301,7 +301,7 @@ void GLVertexDecompilerThread::insertMainEnd(std::stringstream & OS) OS << " gl_Position = gl_Position * scale_offset_mat;\n"; OS << " gl_Position = apply_zclip_xform(gl_Position, z_near, z_far);\n"; - //Since our clip_space is symetrical [-1, 1] we map it to linear space using the eqn: + //Since our clip_space is symmetrical [-1, 1] we map it to linear space using the eqn: //ln = (clip * 2) - 1 to fully utilize the 0-1 range of the depth buffer //RSX matrices passed already map to the [0, 1] range but mapping to classic OGL requires that we undo this step //This can be made unnecessary using the call glClipControl(GL_LOWER_LEFT, GL_ZERO_TO_ONE). diff --git a/rpcs3/Emu/RSX/RSXThread.cpp b/rpcs3/Emu/RSX/RSXThread.cpp index 126d247d38..36c22575f0 100644 --- a/rpcs3/Emu/RSX/RSXThread.cpp +++ b/rpcs3/Emu/RSX/RSXThread.cpp @@ -747,7 +747,7 @@ namespace rsx { if (first_count[n].first != next) { - LOG_ERROR(RSX, "Non-continous first-count range passed as one draw; will be split."); + LOG_ERROR(RSX, "Non-continuous first-count range passed as one draw; will be split."); first_count[deferred_call_size - 1].second = count; deferred_call_size++; @@ -1057,7 +1057,7 @@ namespace rsx } } - // Generate wpos coeffecients + // Generate wpos coefficients // wpos equation is now as follows: // wpos.y = (frag_coord / resolution_scale) * ((window_origin!=top)?-1.: 1.) + ((window_origin!=top)? window_height : 0) // wpos.x = (frag_coord / resolution_scale) diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index 7ce35af9cf..511aae4247 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -85,7 +85,7 @@ namespace rsx { running = 0, empty = 1, //PUT == GET - spinning = 2, //Puller continously jumps to self addr (synchronization technique) + spinning = 2, //Puller continuously jumps to self addr (synchronization technique) nop = 3, //Puller is processing a NOP command }; diff --git a/rpcs3/Emu/RSX/RSXVertexProgram.h b/rpcs3/Emu/RSX/RSXVertexProgram.h index ff35209c4b..c170ce1b28 100644 --- a/rpcs3/Emu/RSX/RSXVertexProgram.h +++ b/rpcs3/Emu/RSX/RSXVertexProgram.h @@ -56,7 +56,7 @@ enum vec_opcode RSX_VEC_OPCODE_SLE = 0x13, // Set-If-LessEqual RSX_VEC_OPCODE_SNE = 0x14, // Set-If-NotEqual RSX_VEC_OPCODE_STR = 0x15, // Set-If-True - RSX_VEC_OPCODE_SSG = 0x16, // Convert postive values to 1 and negative values to -1 + RSX_VEC_OPCODE_SSG = 0x16, // Convert positive values to 1 and negative values to -1 RSX_VEC_OPCODE_TXL = 0x19, // Texture fetch }; diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp index 999cacbba5..675ee3a46a 100644 --- a/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/VK/VKFragmentProgram.cpp @@ -33,7 +33,7 @@ void VKFragmentDecompilerThread::insertHeader(std::stringstream & OS) OS << "#extension GL_ARB_separate_shader_objects: enable\n\n"; } -void VKFragmentDecompilerThread::insertIntputs(std::stringstream & OS) +void VKFragmentDecompilerThread::insertInputs(std::stringstream & OS) { //It is possible for the two_sided_enabled flag to be set without actual 2-sided outputs bool two_sided_enabled = m_prog.front_back_color_enabled && (m_prog.back_color_diffuse_output || m_prog.back_color_specular_output); diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.h b/rpcs3/Emu/RSX/VK/VKFragmentProgram.h index cde6d7291a..d427edf2f5 100644 --- a/rpcs3/Emu/RSX/VK/VKFragmentProgram.h +++ b/rpcs3/Emu/RSX/VK/VKFragmentProgram.h @@ -29,7 +29,7 @@ protected: virtual std::string compareFunction(COMPARE, const std::string&, const std::string&) override; virtual void insertHeader(std::stringstream &OS) override; - virtual void insertIntputs(std::stringstream &OS) override; + virtual void insertInputs(std::stringstream &OS) override; virtual void insertOutputs(std::stringstream &OS) override; virtual void insertConstants(std::stringstream &OS) override; virtual void insertGlobalFunctions(std::stringstream &OS) override; diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.cpp b/rpcs3/Emu/RSX/VK/VKGSRender.cpp index 65172d76c9..be2e54b4e1 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.cpp +++ b/rpcs3/Emu/RSX/VK/VKGSRender.cpp @@ -338,34 +338,34 @@ namespace std::vector attachments = {}; std::vector attachment_references; - VkAttachmentDescription color_attachement_description = {}; - color_attachement_description.format = color_format; - color_attachement_description.samples = VK_SAMPLE_COUNT_1_BIT; - color_attachement_description.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - color_attachement_description.storeOp = VK_ATTACHMENT_STORE_OP_STORE; - color_attachement_description.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; - color_attachement_description.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; - color_attachement_description.initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; - color_attachement_description.finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + VkAttachmentDescription color_attachment_description = {}; + color_attachment_description.format = color_format; + color_attachment_description.samples = VK_SAMPLE_COUNT_1_BIT; + color_attachment_description.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + color_attachment_description.storeOp = VK_ATTACHMENT_STORE_OP_STORE; + color_attachment_description.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE; + color_attachment_description.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE; + color_attachment_description.initialLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; + color_attachment_description.finalLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL; for (u32 i = 0; i < number_of_color_surface; ++i) { - attachments.push_back(color_attachement_description); + attachments.push_back(color_attachment_description); attachment_references.push_back({ i, VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL }); } if (depth_format != VK_FORMAT_UNDEFINED) { - VkAttachmentDescription depth_attachement_description = {}; - depth_attachement_description.format = depth_format; - depth_attachement_description.samples = VK_SAMPLE_COUNT_1_BIT; - depth_attachement_description.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - depth_attachement_description.storeOp = VK_ATTACHMENT_STORE_OP_STORE; - depth_attachement_description.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD; - depth_attachement_description.stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; - depth_attachement_description.initialLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; - depth_attachement_description.finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; - attachments.push_back(depth_attachement_description); + VkAttachmentDescription depth_attachment_description = {}; + depth_attachment_description.format = depth_format; + depth_attachment_description.samples = VK_SAMPLE_COUNT_1_BIT; + depth_attachment_description.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + depth_attachment_description.storeOp = VK_ATTACHMENT_STORE_OP_STORE; + depth_attachment_description.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_LOAD; + depth_attachment_description.stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE; + depth_attachment_description.initialLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + depth_attachment_description.finalLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; + attachments.push_back(depth_attachment_description); attachment_references.push_back({ number_of_color_surface, VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL }); } @@ -1764,7 +1764,7 @@ void VKGSRender::clear_surface(u32 mask) fmt::throw_exception("Unreachable" HERE); } - //Fush unconditinally - parameters might not persist + //Fush unconditionally - parameters might not persist //TODO: Better parameter management for overlay passes flush_command_queue(); } @@ -1857,7 +1857,7 @@ void VKGSRender::flush_command_queue(bool hard_sync) //swap handler checks the pending flag, so call it here process_swap_request(m_current_frame); - //wait for the latest intruction to execute + //wait for the latest instruction to execute m_current_command_buffer->pending = true; m_current_command_buffer->reset(); @@ -2472,7 +2472,7 @@ void VKGSRender::init_buffers(rsx::framebuffer_creation_context context, bool sk if (&ctx == m_current_frame && ctx.swap_command_buffer->pending) { - //Instead of stoppiing to wait, use the aux storage to ease pressure + //Instead of stopping to wait, use the aux storage to ease pressure m_aux_frame_context.grab_resources(*m_current_frame); m_current_frame = &m_aux_frame_context; } diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h index e0366f487b..364d891210 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -37,7 +37,7 @@ namespace vk } //Heap allocation sizes in MB -//NOTE: Texture uploads can be huge, upto 16MB for a single texture (4096x4096px) +//NOTE: Texture uploads can be huge, up to 16MB for a single texture (4096x4096px) #define VK_ATTRIB_RING_BUFFER_SIZE_M 384 #define VK_TEXTURE_UPLOAD_RING_BUFFER_SIZE_M 256 #define VK_UBO_RING_BUFFER_SIZE_M 64 diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.cpp b/rpcs3/Emu/RSX/VK/VKHelpers.cpp index d557484e01..a03c06986b 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.cpp +++ b/rpcs3/Emu/RSX/VK/VKHelpers.cpp @@ -211,7 +211,7 @@ namespace vk //Radeon fails to properly handle degenerate primitives if primitive restart is enabled //One has to choose between using degenerate primitives or primitive restart to break up lists but not both //Polaris and newer will crash with ERROR_DEVICE_LOST - //Older GCN will work okay most of the time but also occasionally draws garbage without reason (properietary driver only) + //Older GCN will work okay most of the time but also occasionally draws garbage without reason (proprietary driver only) if (gpu_name.find("Radeon") != std::string::npos || //Proprietary driver gpu_name.find("POLARIS") != std::string::npos || //RADV POLARIS gpu_name.find("VEGA") != std::string::npos) //RADV VEGA diff --git a/rpcs3/Emu/RSX/VK/VKHelpers.h b/rpcs3/Emu/RSX/VK/VKHelpers.h index 1281595df7..0243c17afc 100644 --- a/rpcs3/Emu/RSX/VK/VKHelpers.h +++ b/rpcs3/Emu/RSX/VK/VKHelpers.h @@ -853,7 +853,7 @@ namespace vk enum access_type_hint { flush_only, //Only to be submitted/opened/closed via command flush - all //Auxilliary, can be sumitted/opened/closed at any time + all //Auxiliary, can be submitted/opened/closed at any time } access_hint = flush_only; @@ -1644,7 +1644,7 @@ public: { m_instance = nullptr; - //Check that some critical entry-points have been loaded into memory indicating prescence of a loader + //Check that some critical entry-points have been loaded into memory indicating presence of a loader loader_exists = (vkCreateInstance != nullptr); } diff --git a/rpcs3/Emu/RSX/VK/VKRenderTargets.h b/rpcs3/Emu/RSX/VK/VKRenderTargets.h index 2d388e5386..ec49deec02 100644 --- a/rpcs3/Emu/RSX/VK/VKRenderTargets.h +++ b/rpcs3/Emu/RSX/VK/VKRenderTargets.h @@ -91,7 +91,7 @@ namespace vk bool matches_dimensions(u16 _width, u16 _height) const { - //Use foward scaling to account for rounding and clamping errors + //Use forward scaling to account for rounding and clamping errors return (rsx::apply_resolution_scale(_width, true) == width()) && (rsx::apply_resolution_scale(_height, true) == height()); } }; diff --git a/rpcs3/Emu/RSX/VK/VKTextureCache.h b/rpcs3/Emu/RSX/VK/VKTextureCache.h index e01d3756aa..8881057217 100644 --- a/rpcs3/Emu/RSX/VK/VKTextureCache.h +++ b/rpcs3/Emu/RSX/VK/VKTextureCache.h @@ -559,7 +559,7 @@ namespace vk { //This is a data cast operation //Use native mapping for the new type - //TODO: Also simlulate the readback+reupload step (very tricky) + //TODO: Also simulate the readback+reupload step (very tricky) const auto remap = get_component_mapping(gcm_format); view_swizzle = { remap[1], remap[2], remap[3], remap[0] }; } diff --git a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp b/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp index 651e98732d..403a333d01 100644 --- a/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp +++ b/rpcs3/Emu/RSX/VK/VKVertexBuffers.cpp @@ -192,7 +192,7 @@ namespace std::optional> index_info = std::make_tuple(offset_in_index_buffer, vk::get_index_type(index_type)); - //check for vertex arrays with frquency modifiers + //check for vertex arrays with frequency modifiers for (auto &block : m_vertex_layout.interleaved_blocks) { if (block.min_divisor > 1) diff --git a/rpcs3/Emu/RSX/rsx_cache.h b/rpcs3/Emu/RSX/rsx_cache.h index 5887014ed5..b120d1137f 100644 --- a/rpcs3/Emu/RSX/rsx_cache.h +++ b/rpcs3/Emu/RSX/rsx_cache.h @@ -11,7 +11,7 @@ namespace rsx { enum protection_policy { - protect_policy_one_page, //Only guard one page, preferrably one where this section 'wholly' fits + protect_policy_one_page, //Only guard one page, preferably one where this section 'wholly' fits protect_policy_conservative, //Guards as much memory as possible that is guaranteed to only be covered by the defined range without sharing protect_policy_full_range //Guard the full memory range. Shared pages may be invalidated by access outside the object we're guarding }; diff --git a/rpcs3/Emu/RSX/rsx_decode.h b/rpcs3/Emu/RSX/rsx_decode.h index d307522a27..b5bf90b632 100644 --- a/rpcs3/Emu/RSX/rsx_decode.h +++ b/rpcs3/Emu/RSX/rsx_decode.h @@ -2326,7 +2326,7 @@ struct registers_decoder static std::string dump(decoded_type &&decoded_values) { - return "NV0039: line lenght input = " + std::to_string(decoded_values.input_line_length()); + return "NV0039: line length input = " + std::to_string(decoded_values.input_line_length()); } }; diff --git a/rpcs3/Emu/RSX/rsx_methods.cpp b/rpcs3/Emu/RSX/rsx_methods.cpp index 25672b950c..72f112ccfc 100644 --- a/rpcs3/Emu/RSX/rsx_methods.cpp +++ b/rpcs3/Emu/RSX/rsx_methods.cpp @@ -664,7 +664,7 @@ namespace rsx u32 dst_dma = 0; rsx::blit_engine::transfer_destination_format dst_color_format; u32 out_pitch = 0; - u32 out_aligment = 64; + u32 out_alignment = 64; switch (method_registers.blit_engine_context_surface()) { @@ -673,7 +673,7 @@ namespace rsx dst_offset = method_registers.blit_engine_output_offset_nv3062(); dst_color_format = method_registers.blit_engine_nv3062_color_format(); out_pitch = method_registers.blit_engine_output_pitch_nv3062(); - out_aligment = method_registers.blit_engine_output_alignment_nv3062(); + out_alignment = method_registers.blit_engine_output_alignment_nv3062(); break; case blit_engine::context_surface::swizzle2d: @@ -1136,7 +1136,7 @@ namespace rsx namespace gcm { - // not entirely sure which one should actually do the flip, or if these should be handled seperately, + // not entirely sure which one should actually do the flip, or if these should be handled separately, // so for now lets flip in queue and just let the driver deal with it template struct driver_flip