From 1abdee242abf39bc216d10169147c567c3a5066e Mon Sep 17 00:00:00 2001 From: Maksim Derbasov Date: Wed, 22 Jan 2020 15:28:48 +0300 Subject: [PATCH] small improvement (#7288) * small improvement * comments addressed Co-authored-by: kd-11 <15904127+kd-11@users.noreply.github.com> --- rpcs3/Emu/Cell/Modules/cellCamera.cpp | 1 - rpcs3/Emu/Cell/Modules/cellSsl.cpp | 2 +- rpcs3/Emu/GDB.cpp | 1 - rpcs3/Emu/RSX/Common/surface_store.h | 3 ++- rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp | 2 -- rpcs3/Emu/RSX/VK/VKDMA.cpp | 4 ++-- rpcs3/Input/evdev_joystick_handler.cpp | 1 - 7 files changed, 5 insertions(+), 9 deletions(-) diff --git a/rpcs3/Emu/Cell/Modules/cellCamera.cpp b/rpcs3/Emu/Cell/Modules/cellCamera.cpp index 1524975d71..7c1fa0be0a 100644 --- a/rpcs3/Emu/Cell/Modules/cellCamera.cpp +++ b/rpcs3/Emu/Cell/Modules/cellCamera.cpp @@ -273,7 +273,6 @@ static error_code check_camera_info(const CellCameraInfoEx& info) std::pair get_video_resolution(const CellCameraInfoEx& info) { - std::pair res; switch (info.resolution) { case CELL_CAMERA_VGA: return{ 640, 480 }; diff --git a/rpcs3/Emu/Cell/Modules/cellSsl.cpp b/rpcs3/Emu/Cell/Modules/cellSsl.cpp index 081e8d22f1..007c7e9555 100644 --- a/rpcs3/Emu/Cell/Modules/cellSsl.cpp +++ b/rpcs3/Emu/Cell/Modules/cellSsl.cpp @@ -75,7 +75,7 @@ s32 cellSslGetMemoryInfo() return CELL_OK; } -std::string getCert(const std::string certPath, const int certID, const bool isNormalCert) +std::string getCert(const std::string& certPath, const int certID, const bool isNormalCert) { int newID = certID; diff --git a/rpcs3/Emu/GDB.cpp b/rpcs3/Emu/GDB.cpp index 22fb7d4a38..6ac00187dd 100644 --- a/rpcs3/Emu/GDB.cpp +++ b/rpcs3/Emu/GDB.cpp @@ -423,7 +423,6 @@ bool gdb_thread::select_thread(u64 id) std::string gdb_thread::get_reg(ppu_thread* thread, u32 rid) { - std::string result; //ids from gdb/features/rs6000/powerpc-64.c //pc switch (rid) { diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h index 6e212ecd57..fca6d5aa63 100644 --- a/rpcs3/Emu/RSX/Common/surface_store.h +++ b/rpcs3/Emu/RSX/Common/surface_store.h @@ -271,8 +271,9 @@ namespace rsx } else { + const auto reserve = list1.size() + list2.size(); surface_info = std::move(list1); - surface_info.reserve(list1.size() + list2.size()); + surface_info.reserve(reserve); for (const auto& e : list2) surface_info.push_back(e); } diff --git a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp index 620ae9b00b..bab67c096d 100644 --- a/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp +++ b/rpcs3/Emu/RSX/GL/GLFragmentProgram.cpp @@ -50,8 +50,6 @@ void GLFragmentDecompilerThread::insertHeader(std::stringstream & OS) void GLFragmentDecompilerThread::insertInputs(std::stringstream & OS) { - std::vector inputs_to_declare; - for (const ParamType& PT : m_parr.params[PF_PARAM_IN]) { for (const ParamItem& PI : PT.items) diff --git a/rpcs3/Emu/RSX/VK/VKDMA.cpp b/rpcs3/Emu/RSX/VK/VKDMA.cpp index 717eb154fb..aaad5f3235 100644 --- a/rpcs3/Emu/RSX/VK/VKDMA.cpp +++ b/rpcs3/Emu/RSX/VK/VKDMA.cpp @@ -49,7 +49,7 @@ namespace vk allocated_memory = std::make_unique(dev, size, dev.get_memory_mapping().host_visible_coherent, VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, - VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, 0); + VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, 0); page_info.resize(size / s_bytes_per_entry, ~0ull); } @@ -210,7 +210,7 @@ namespace vk auto new_allocation = std::make_unique(dev, new_size, dev.get_memory_mapping().host_visible_coherent, VK_MEMORY_PROPERTY_HOST_COHERENT_BIT, - VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, 0); + VK_BUFFER_USAGE_TRANSFER_SRC_BIT | VK_BUFFER_USAGE_TRANSFER_DST_BIT, 0); VkBufferCopy copy{}; copy.size = allocated_memory->size(); diff --git a/rpcs3/Input/evdev_joystick_handler.cpp b/rpcs3/Input/evdev_joystick_handler.cpp index 2e8a0b1e9d..f83893325a 100644 --- a/rpcs3/Input/evdev_joystick_handler.cpp +++ b/rpcs3/Input/evdev_joystick_handler.cpp @@ -697,7 +697,6 @@ PadHandlerBase::connection evdev_joystick_handler::update_connection(const std:: void evdev_joystick_handler::get_mapping(const std::shared_ptr& device, const std::shared_ptr& pad) { - std::unordered_map values; m_dev = std::static_pointer_cast(device); if (!m_dev || !pad) return;