diff --git a/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp b/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp index 468bd02eff..069ada918f 100644 --- a/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp +++ b/rpcs3/Emu/RSX/CgBinaryVertexProgram.cpp @@ -48,15 +48,15 @@ std::string CgBinaryDisasm::GetScaMaskDisasm() return GetMaskDisasm(true); } -std::string CgBinaryDisasm::GetDSTDisasm(bool isSca) +std::string CgBinaryDisasm::GetDSTDisasm(bool is_sca) { std::string ret; - std::string mask = GetMaskDisasm(isSca); + std::string mask = GetMaskDisasm(is_sca); - switch ((isSca && d3.sca_dst_tmp != 0x3f) ? 0x1f : d3.dst) + switch ((is_sca && d3.sca_dst_tmp != 0x3f) ? 0x1f : d3.dst) { case 0x1f: - ret += (isSca ? fmt::format("R%d", d3.sca_dst_tmp) : fmt::format("R%d", d0.dst_tmp)) + mask; + ret += (is_sca ? fmt::format("R%d", d3.sca_dst_tmp) : fmt::format("R%d", d0.dst_tmp)) + mask; break; default: diff --git a/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp b/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp index 3752ecb0c6..620d5c02dd 100644 --- a/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp +++ b/rpcs3/Emu/RSX/Common/VertexProgramDecompiler.cpp @@ -37,15 +37,15 @@ std::string VertexProgramDecompiler::GetScaMask() return GetMask(true); } -std::string VertexProgramDecompiler::GetDST(bool isSca) +std::string VertexProgramDecompiler::GetDST(bool is_sca) { std::string ret; - const std::string mask = GetMask(isSca); + const std::string mask = GetMask(is_sca); // ARL writes to special integer registers - const bool is_address_reg = !isSca && (d1.vec_opcode == RSX_VEC_OPCODE_ARL); - const auto tmp_index = isSca ? d3.sca_dst_tmp : d0.dst_tmp; - const bool is_result = isSca ? (tmp_index == 0x3f) : d0.vec_result; + const bool is_address_reg = !is_sca && (d1.vec_opcode == RSX_VEC_OPCODE_ARL); + const auto tmp_index = is_sca ? d3.sca_dst_tmp : d0.dst_tmp; + const bool is_result = is_sca ? (tmp_index == 0x3f) : d0.vec_result; if (is_result) { @@ -76,7 +76,7 @@ std::string VertexProgramDecompiler::GetDST(bool isSca) if (!ret.empty()) { // Double assignment. Only possible for vector ops - verify(HERE), !isSca; + verify(HERE), !is_sca; ret += " = "; } diff --git a/rpcs3/Emu/RSX/GL/GLGSRender.h b/rpcs3/Emu/RSX/GL/GLGSRender.h index dfca56e1d3..a27d080cbd 100644 --- a/rpcs3/Emu/RSX/GL/GLGSRender.h +++ b/rpcs3/Emu/RSX/GL/GLGSRender.h @@ -392,7 +392,7 @@ protected: void on_init_thread() override; void on_exit() override; - bool do_method(u32 id, u32 arg) override; + bool do_method(u32 cmd, u32 arg) override; void flip(int buffer, bool emu_flip = false) override; void do_local_task(rsx::FIFO_state state) override; diff --git a/rpcs3/Emu/RSX/GL/GLTexture.h b/rpcs3/Emu/RSX/GL/GLTexture.h index 461753cd78..2d1b828046 100644 --- a/rpcs3/Emu/RSX/GL/GLTexture.h +++ b/rpcs3/Emu/RSX/GL/GLTexture.h @@ -14,7 +14,7 @@ namespace rsx namespace gl { GLenum get_target(rsx::texture_dimension_extended type); - GLenum get_sized_internal_format(u32 gcm_format); + GLenum get_sized_internal_format(u32 texture_format); std::tuple get_format_type(u32 texture_format); std::tuple get_format_type(texture::internal_format format); GLenum wrap_mode(rsx::texture_wrap_mode wrap); diff --git a/rpcs3/Emu/RSX/Overlays/overlays.h b/rpcs3/Emu/RSX/Overlays/overlays.h index c23386d64e..6bac8c259e 100644 --- a/rpcs3/Emu/RSX/Overlays/overlays.h +++ b/rpcs3/Emu/RSX/Overlays/overlays.h @@ -19,7 +19,7 @@ // Utils std::string utf8_to_ascii8(const std::string& utf8_string); std::string utf16_to_ascii8(const std::u16string& utf16_string); -std::u16string ascii8_to_utf16(const std::string& utf8_string); +std::u16string ascii8_to_utf16(const std::string& ascii_string); extern u64 get_system_time(); // Definition of user interface implementations @@ -367,7 +367,7 @@ namespace rsx void init(); void set_detail_level(detail_level level); - void set_position(screen_quadrant pos); + void set_position(screen_quadrant quadrant); void set_update_interval(u32 update_interval); void set_font(std::string font); void set_font_size(u32 font_size); @@ -464,7 +464,7 @@ namespace rsx virtual ~osk_dialog() {} void Create(const std::string& title, const std::u16string& message, char16_t* init_text, u32 charlimit, u32 options) override = 0; - void Close(bool accepted) override; + void Close(bool ok) override; void initialize_layout(const std::vector& layout, const std::string& title, const std::string& initial_text); diff --git a/rpcs3/Emu/RSX/RSXThread.h b/rpcs3/Emu/RSX/RSXThread.h index c430df5ee2..19a7c26b10 100644 --- a/rpcs3/Emu/RSX/RSXThread.h +++ b/rpcs3/Emu/RSX/RSXThread.h @@ -397,8 +397,8 @@ namespace rsx ZCULL_control() {} ~ZCULL_control() {} - void set_enabled(class ::rsx::thread* ptimer, bool enabled); - void set_active(class ::rsx::thread* ptimer, bool active); + void set_enabled(class ::rsx::thread* ptimer, bool state); + void set_active(class ::rsx::thread* ptimer, bool state); void write(vm::addr_t sink, u32 timestamp, u32 type, u32 value); diff --git a/rpcs3/Emu/RSX/VK/VKFragmentProgram.h b/rpcs3/Emu/RSX/VK/VKFragmentProgram.h index 1e4aecb33f..d63d74fb3e 100644 --- a/rpcs3/Emu/RSX/VK/VKFragmentProgram.h +++ b/rpcs3/Emu/RSX/VK/VKFragmentProgram.h @@ -55,7 +55,7 @@ public: std::array output_color_masks{ {} }; std::vector uniforms; - void SetInputs(std::vector& uniforms); + void SetInputs(std::vector& inputs); /** * Decompile a fragment shader located in the PS3's Memory. This function operates synchronously. * @param prog RSXShaderProgram specifying the location and size of the shader in memory diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h index 57bcff425a..5bdc205937 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -512,7 +512,7 @@ private: bool load_program(); void load_program_env(); - void update_vertex_env(const vk::vertex_upload_info& upload_info); + void update_vertex_env(const vk::vertex_upload_info& vertex_info); public: void init_buffers(rsx::framebuffer_creation_context context, bool skip_reading = false); @@ -537,7 +537,7 @@ protected: void on_init_thread() override; void on_exit() override; - bool do_method(u32 id, u32 arg) override; + bool do_method(u32 cmd, u32 arg) override; void flip(int buffer, bool emu_flip = false) override; void do_local_task(rsx::FIFO_state state) override; diff --git a/rpcs3/Emu/RSX/rsx_utils.h b/rpcs3/Emu/RSX/rsx_utils.h index 7508e14538..eb7f9733cf 100644 --- a/rpcs3/Emu/RSX/rsx_utils.h +++ b/rpcs3/Emu/RSX/rsx_utils.h @@ -395,7 +395,7 @@ namespace rsx } } - void scale_image_nearest(void* dst, const void* src, u16 src_width, u16 src_height, u16 dst_pitch, u16 src_pitch, u8 pixel_size, u8 samples_u, u8 samples_v, bool swap_bytes = false); + void scale_image_nearest(void* dst, const void* src, u16 src_width, u16 src_height, u16 dst_pitch, u16 src_pitch, u8 element_size, u8 samples_u, u8 samples_v, bool swap_bytes = false); void convert_scale_image(u8 *dst, AVPixelFormat dst_format, int dst_width, int dst_height, int dst_pitch, const u8 *src, AVPixelFormat src_format, int src_width, int src_height, int src_pitch, int src_slice_h, bool bilinear);