Merge 4d2f205f36 into cf87f24587

rpcs3/Emu/CMakeLists.txt

@@ -481,6 +481,7 @@ target_sources(rpcs3_emu PRIVATE
     RSX/NV47/HW/nv308a.cpp
     RSX/NV47/HW/nv406e.cpp
     RSX/NV47/HW/nv4097.cpp
+    RSX/Overlays/Debug/overlay_ps_move_debug.cpp
     RSX/Overlays/FriendsList/overlay_friends_list_dialog.cpp
     RSX/Overlays/HomeMenu/overlay_home_menu.cpp
     RSX/Overlays/HomeMenu/overlay_home_menu_components.cpp

rpcs3/Emu/Cell/Modules/cellGem.cpp

@@ -14,6 +14,8 @@
 #include "Emu/System.h"
 #include "Emu/IdManager.h"
 #include "Emu/RSX/Overlays/overlay_cursor.h"
+#include "Emu/RSX/Overlays/overlay_manager.h"
+#include "Emu/RSX/Overlays/Debug/overlay_ps_move_debug.h"
 #include "Input/pad_thread.h"
 #include "Input/ps_move_config.h"
 #include "Input/ps_move_tracker.h"
@@ -626,9 +628,9 @@ public:
 			cellGem.notice("Could not load mouse gem config. Using defaults.");
 		}
 
-		cellGem.notice("Real gem config=\n", g_cfg_gem_real.to_string());
+		cellGem.notice("Real gem config=%s", g_cfg_gem_real.to_string());
-		cellGem.notice("Fake gem config=\n", g_cfg_gem_fake.to_string());
+		cellGem.notice("Fake gem config=%s", g_cfg_gem_fake.to_string());
-		cellGem.notice("Mouse gem config=\n", g_cfg_gem_mouse.to_string());
+		cellGem.notice("Mouse gem config=%s", g_cfg_gem_mouse.to_string());
 	}
 };
 
@@ -719,43 +721,120 @@ namespace gem
 		constexpr u32 in_pitch = 640;
 		constexpr u32 out_pitch = 640 * 4;
 
-		for (u32 y = 0; y < 480 - 1; y += 2)
+		// Hamilton–Adams demosaicing
+		for (s32 y = 0; y < 480; y++)
 		{
-			const u8* src0 = src + y * in_pitch;
+			const bool is_even_y = (y % 2) == 0;
-			const u8* src1 = src0 + in_pitch;
+			const u8* srcc = src + y * in_pitch;
+			const u8* srcu = src + std::max(0, y - 1) * in_pitch;
+			const u8* srcd = src + std::min(480 - 1, y + 1) * in_pitch;
 
 			u8* dst0 = dst + y * out_pitch;
-			u8* dst1 = dst0 + out_pitch;
 
-			for (u32 x = 0; x < 640 - 1; x += 2, src0 += 2, src1 += 2, dst0 += 8, dst1 += 8)
+			// Split loops (roughly twice the performance by removing one condition)
+			if (is_even_y)
 			{
-				u8 b  = src0[0];
+				for (s32 x = 0; x < 640; x++, dst0 += 4)
-				u8 g0 = src0[1];
-				u8 g1 = src1[0];
-				u8 r  = src1[1];
-
-				if constexpr (use_gain)
 				{
-					b  = static_cast<u8>(std::clamp(b  * gain_b, 0.0f, 255.0f));
+					const bool is_even_x = (x % 2) == 0;
-					g0 = static_cast<u8>(std::clamp(g0 * gain_g, 0.0f, 255.0f));
+					const int xl = std::max(0, x - 1);
-					g1 = static_cast<u8>(std::clamp(g1 * gain_g, 0.0f, 255.0f));
+					const int xr = std::min(640 - 1, x + 1);
-					r  = static_cast<u8>(std::clamp(r  * gain_r, 0.0f, 255.0f));
+
+					u8 r, b, g;
+
+					if (is_even_x)
+					{
+						// Blue pixel
+						const u8 up = srcu[x];
+						const u8 down = srcd[x];
+						const u8 left = srcc[xl];
+						const u8 right = srcc[xr];
+						const int dh = std::abs(int(left) - int(right));
+						const int dv = std::abs(int(up)   - int(down));
+
+						r = (srcu[xl] + srcu[xr] + srcd[xl] + srcd[xr]) / 4;
+						if (dh < dv)
+							g = (left + right) / 2;
+						else if (dv < dh)
+							g = (up + down) / 2;
+						else
+							g = (up + down + left + right) / 4;
+						b = srcc[x];
+					}
+					else
+					{
+						// Green (on blue row)
+						r = (srcu[x] + srcd[x]) / 2;
+						g = srcc[x];
+						b = (srcc[xl] + srcc[xr]) / 2;
+					}
+
+					if constexpr (use_gain)
+					{
+						dst0[0] = static_cast<u8>(std::clamp(r * gain_r, 0.0f, 255.0f));
+						dst0[1] = static_cast<u8>(std::clamp(b * gain_b, 0.0f, 255.0f));
+						dst0[2] = static_cast<u8>(std::clamp(g * gain_g, 0.0f, 255.0f));
+					}
+					else
+					{
+						dst0[0] = r;
+						dst0[1] = g;
+						dst0[2] = b;
+					}
+					dst0[3] = alpha;
 				}
+			}
+			else
+			{
+				for (s32 x = 0; x < 640; x++, dst0 += 4)
+				{
+					const bool is_even_x = (x % 2) == 0;
+					const int xl = std::max(0, x - 1);
+					const int xr = std::min(640 - 1, x + 1);
 
-				const u8 top[4] = { r, g0, b, alpha };
+					u8 r, b, g;
-				const u8 bottom[4] = { r, g1, b, alpha };
 
-				// Top-Left
+					if (is_even_x)
-				std::memcpy(dst0, top, 4);
+					{
+						// Green (on red row)
+						r = (srcc[xl] + srcc[xr]) / 2;
+						g = srcc[x];
+						b = (srcu[x] + srcd[x]) / 2;
+					}
+					else
+					{
+						// Red pixel
+						const u8 up = srcu[x];
+						const u8 down = srcd[x];
+						const u8 left = srcc[xl];
+						const u8 right = srcc[xr];
+						const int dh = std::abs(int(left) - int(right));
+						const int dv = std::abs(int(up)   - int(down));
 
-				// Top-Right Pixel
+						r = srcc[x];
-				std::memcpy(dst0 + 4, top, 4);
+						if (dh < dv)
+							g = (left + right) / 2;
+						else if (dv < dh)
+							g = (up + down) / 2;
+						else
+							g = (up + down + left + right) / 4;
+						b = (srcu[xl] + srcu[xr] + srcd[xl] + srcd[xr]) / 4;
+					}
 
-				// Bottom-Left Pixel
+					if constexpr (use_gain)
-				std::memcpy(dst1, bottom, 4);
+					{
-
+						dst0[0] = static_cast<u8>(std::clamp(r * gain_r, 0.0f, 255.0f));
-				// Bottom-Right Pixel
+						dst0[1] = static_cast<u8>(std::clamp(b * gain_b, 0.0f, 255.0f));
-				std::memcpy(dst1 + 4, bottom, 4);
+						dst0[2] = static_cast<u8>(std::clamp(g * gain_g, 0.0f, 255.0f));
+					}
+					else
+					{
+						dst0[0] = r;
+						dst0[1] = g;
+						dst0[2] = b;
+					}
+					dst0[3] = alpha;
+				}
 			}
 		}
 	}
@@ -1699,6 +1778,23 @@ static inline void draw_overlay_cursor(u32 gem_num, const gem_config::gem_contro
 	rsx::overlays::set_cursor(rsx::overlays::cursor_offset::cell_gem + gem_num, x, y, color, 2'000'000, false);
 }
 
+static void show_ps_move_debug_overlay(u32 gem_num, const ps_move_data& md, const CellGemState& state)
+{
+	if (gem_num != 0 || !g_cfg.misc.use_native_interface)
+		return;
+
+	if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
+	{
+		if (auto overlay = manager->get<rsx::overlays::ps_move_debug_overlay>())
+		{
+			const gem_config_data::gem_color& rgb = gem_config_data::gem_color::get_default_color(gem_num);
+
+			// Use quaternion from state instead of ps_move_data so that we can also check the fake/mouse move
+			overlay->show(md, rgb.r, rgb.g, rgb.b, state.quat[0], state.quat[1], state.quat[2], state.quat[3]);
+		}
+	}
+}
+
 static inline void pos_to_gem_image_state(u32 gem_num, gem_config::gem_controller& controller, vm::ptr<CellGemImageState>& gem_image_state, s32 x_pos, s32 y_pos, s32 x_max, s32 y_max)
 {
 	const auto& shared_data = g_fxo->get<gem_camera_shared>();
@@ -1846,6 +1942,11 @@ static inline void pos_to_gem_state(u32 gem_num, gem_config::gem_controller& con
 		controller.radius_valid = x_pos > 0 && x_pos < x_max && y_pos > 0 && y_pos < y_max;
 	}
 
+	if (g_cfg.io.ps_move_debug_overlay)
+	{
+		show_ps_move_debug_overlay(gem_num, move_data, *gem_state);
+	}
+
 	if (g_cfg.io.show_move_cursor)
 	{
 		draw_overlay_cursor(gem_num, controller, x_pos, y_pos, x_max, y_max);

rpcs3/Emu/RSX/Overlays/Debug/overlay_ps_move_debug.cpp

@@ -0,0 +1,123 @@
+#include "stdafx.h"
+#include "overlay_ps_move_debug.h"
+
+namespace rsx
+{
+	namespace overlays
+	{
+		ps_move_debug_overlay::ps_move_debug_overlay()
+		{
+			m_frame.set_pos(0, 0);
+			m_frame.set_size(300, 300);
+			m_frame.back_color.r = 0.0f;
+			m_frame.back_color.g = 0.0f;
+			m_frame.back_color.b = 0.0f;
+			m_frame.back_color.a = 1.0f;
+
+			m_text_view.set_pos(10, 10);
+			m_text_view.set_padding(0, 0, 0, 0);
+			m_text_view.set_font("n023055ms.ttf", 6);
+			m_text_view.align_text(overlay_element::text_align::left);
+			m_text_view.fore_color = { 0.3f, 1.f, 0.3f, 1.f };
+			m_text_view.back_color.a = 0.f;
+		}
+
+		compiled_resource ps_move_debug_overlay::get_compiled()
+		{
+			if (!visible)
+			{
+				return {};
+			}
+
+			auto result = m_frame.get_compiled();
+			result.add(m_text_view.get_compiled());
+
+			// Move cylinder so its center is at origin
+			//glTranslatef(0, 0, 0.5f);
+
+			// Apply quaternion rotation
+			//QMatrix4x4 model;
+			//model.rotate(QQuaternion(m_quaternion[3], m_quaternion[0], m_quaternion[1], m_quaternion[2]));
+			//glMultMatrixf(model.constData());
+
+			// Move back to original position
+			//glTranslatef(0, 0, -0.5f);
+
+			// Draw controller body
+			//glColor3ub(200, 200, 200);
+			//drawCylinder(0.2f, 0.8f, 32);
+
+			// Draw front sphere
+			//glColor3f(m_rgb[0], m_rgb[1], m_rgb[2]);
+			//glPushMatrix();
+			//glTranslatef(0, 0, 0.8f); // move to front
+			//drawSphere(0.3f, 32, 32);
+			//glPopMatrix();
+
+			// Draw button
+			//glColor3ub(0, 0, 200);
+			//glPushMatrix();
+			//glTranslatef(0, 0.2f, 0.4f); // slightly in front of the sphere
+			//drawButton(0.08f, 0.05f, 16);
+			//glPopMatrix();
+
+			return result;
+		}
+
+		void ps_move_debug_overlay::show(const ps_move_data& md, f32 r, f32 g, f32 b, f32 q0, f32 q1, f32 q2, f32 q3)
+		{
+			visible = true;
+
+			if (m_rgb[0] == r && m_rgb[1] == g && m_rgb[2] == b &&
+				m_quaternion[0] == q0 && m_quaternion[1] == q1 && m_quaternion[2] == q2 && m_quaternion[3] == q3 &&
+				std::memcmp(static_cast<const void*>(&md), static_cast<const void*>(&m_move_data), sizeof(ps_move_data)) == 0)
+			{
+				return;
+			}
+
+			m_move_data = md;
+			m_rgb = { r, g, b };
+			m_quaternion = { q0, q1, q2, q3 };
+
+			m_text_view.set_text(fmt::format(
+				"> Quat X: %6.2f  Gyro X: %6.2f  Accel X: %6.2f  Mag X: %6.2f\n"
+				"> Quat Y: %6.2f  Gyro Y: %6.2f  Accel Y: %6.2f  Mag Y: %6.2f\n"
+				"> Quat Z: %6.2f  Gyro Z: %6.2f  Accel Z: %6.2f  Mag Z: %6.2f\n"
+				"> Quat W: %6.2f\n\n"
+				"> World\n"
+				">    Vel X: %9.2f\n"
+				">    Vel Y: %9.2f\n"
+				">    Vel Z: %9.2f\n"
+				">    Acc X: %9.2f\n"
+				">    Acc Y: %9.2f\n"
+				">    Acc Z: %9.2f\n"
+				"> AngVel X: %9.2f\n"
+				"> AngVel Y: %9.2f\n"
+				"> AngVel Z: %9.2f\n"
+				"> AngAcc X: %9.2f\n"
+				"> AngAcc Y: %9.2f\n"
+				"> AngAcc Z: %9.2f"
+				,
+				m_quaternion[0], md.gyro[0], md.accelerometer[0], md.magnetometer[0],
+				m_quaternion[1], md.gyro[1], md.accelerometer[1], md.magnetometer[1],
+				m_quaternion[2], md.gyro[2], md.accelerometer[2], md.magnetometer[2],
+				m_quaternion[3],
+				md.vel_world[0],
+				md.vel_world[1],
+				md.vel_world[2],
+				md.accel_world[0],
+				md.accel_world[1],
+				md.accel_world[2],
+				md.angvel_world[0],
+				md.angvel_world[1],
+				md.angvel_world[2],
+				md.angaccel_world[0],
+				md.angaccel_world[1],
+				md.angaccel_world[2]
+			));
+			m_text_view.auto_resize();
+
+			refresh();
+		}
+	} // namespace overlays
+} // namespace rsx

rpcs3/Emu/RSX/Overlays/Debug/overlay_ps_move_debug.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include "../overlays.h"
+#include "Emu/Io/pad_types.h"
+
+namespace rsx
+{
+	namespace overlays
+	{
+		struct ps_move_debug_overlay : public user_interface
+		{
+		public:
+			ps_move_debug_overlay();
+
+			compiled_resource get_compiled() override;
+
+			void show(const ps_move_data& md, f32 r, f32 g, f32 b, f32 q0, f32 q1, f32 q2, f32 q3);
+
+		private:
+			overlay_element m_frame;
+			label m_text_view;
+
+			ps_move_data m_move_data {};
+			std::array<f32, 3> m_rgb {};
+			std::array<f32, 4> m_quaternion {};
+		};
+	}
+}

rpcs3/Emu/RSX/Overlays/HomeMenu/overlay_home_menu_settings.cpp

@@ -141,6 +141,7 @@ namespace rsx
 			add_checkbox(&g_cfg.video.debug_overlay, localized_string_id::HOME_MENU_SETTINGS_DEBUG_OVERLAY);
 			add_checkbox(&g_cfg.io.pad_debug_overlay, localized_string_id::HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY);
 			add_checkbox(&g_cfg.io.mouse_debug_overlay, localized_string_id::HOME_MENU_SETTINGS_MOUSE_DEBUG_INPUT_OVERLAY);
+			add_checkbox(&g_cfg.io.ps_move_debug_overlay, localized_string_id::HOME_MENU_SETTINGS_PS_MOVE_DEBUG_INPUT_OVERLAY);
 			add_checkbox(&g_cfg.video.disable_video_output, localized_string_id::HOME_MENU_SETTINGS_DEBUG_DISABLE_VIDEO_OUTPUT);
 			add_float_slider(&g_cfg.video.texture_lod_bias, localized_string_id::HOME_MENU_SETTINGS_DEBUG_TEXTURE_LOD_BIAS, "", 0.25f);
 

rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.cpp

@@ -1,6 +1,7 @@
 #include "stdafx.h"
 #include "overlay_manager.h"
 #include "overlay_debug_overlay.h"
+#include "Debug/overlay_ps_move_debug.h"
 #include "Emu/system_config.h"
 
 namespace rsx
@@ -41,7 +42,7 @@ namespace rsx
 			visible = true;
 		}
 
-		extern void reset_debug_overlay()
+		extern void reset_debug_overlays()
 		{
 			if (!g_cfg.misc.use_native_interface)
 				return;
@@ -49,6 +50,7 @@ namespace rsx
 			if (auto manager = g_fxo->try_get<rsx::overlays::display_manager>())
 			{
 				auto overlay = manager->get<rsx::overlays::debug_overlay>();
+				auto ps_move_overlay = manager->get<rsx::overlays::ps_move_debug_overlay>();
 
 				if (g_cfg.video.debug_overlay || g_cfg.io.pad_debug_overlay || g_cfg.io.mouse_debug_overlay)
 				{
@@ -61,6 +63,18 @@ namespace rsx
 				{
 					manager->remove<rsx::overlays::debug_overlay>();
 				}
+
+				if (g_cfg.io.ps_move_debug_overlay)
+				{
+					if (!ps_move_overlay)
+					{
+						ps_move_overlay = manager->create<rsx::overlays::ps_move_debug_overlay>();
+					}
+				}
+				else if (ps_move_overlay)
+				{
+					manager->remove<rsx::overlays::ps_move_debug_overlay>();
+				}
 			}
 		}
 

rpcs3/Emu/RSX/Overlays/overlay_debug_overlay.h

@@ -19,7 +19,7 @@ namespace rsx
 			void set_text(std::string&& text);
 		};
 
-		void reset_debug_overlay();
+		void reset_debug_overlays();
 		void set_debug_overlay_text(std::string&& text);
 	}
 }

rpcs3/Emu/RSX/RSXThread.cpp

@@ -912,7 +912,7 @@ namespace rsx
 		if (!serialized) method_registers.init();
 
 		rsx::overlays::reset_performance_overlay();
-		rsx::overlays::reset_debug_overlay();
+		rsx::overlays::reset_debug_overlays();
 
 		if (!is_initialized)
 		{

rpcs3/Emu/RSX/VK/vkutils/buffer_object.cpp

@@ -50,6 +50,7 @@ namespace vk
 		: m_device(dev)
 	{
 		const bool nullable = !!(flags & VK_BUFFER_CREATE_ALLOW_NULL_RPCS3);
+		const bool no_vmem_recovery = !!(flags & VK_BUFFER_CREATE_IGNORE_VMEM_PRESSURE_RPCS3);
 
 		info.sType = VK_STRUCTURE_TYPE_BUFFER_CREATE_INFO;
 		info.flags = flags & ~VK_BUFFER_CREATE_SPECIAL_FLAGS_RPCS3;
@@ -69,18 +70,27 @@ namespace vk
 			fmt::throw_exception("No compatible memory type was found!");
 		}
 
-		memory = std::make_unique<memory_block>(m_device, memory_reqs.size, memory_reqs.alignment, allocation_type_info, allocation_pool, nullable);
+		memory_allocation_request request
+		{
+			.size = memory_reqs.size,
+			.alignment = memory_reqs.alignment,
+			.memory_type = &allocation_type_info,
+			.pool = allocation_pool,
+			.throw_on_fail = !nullable,
+			.recover_vmem_on_fail = !no_vmem_recovery
+		};
+		memory = std::make_unique<memory_block>(m_device, request);
+
 		if (auto device_memory = memory->get_vk_device_memory();
 			device_memory != VK_NULL_HANDLE)
 		{
 			vkBindBufferMemory(dev, value, device_memory, memory->get_vk_device_memory_offset());
+			return;
 		}
-		else
+
-		{
+		ensure(nullable);
-			ensure(nullable);
+		vkDestroyBuffer(m_device, value, nullptr);
-			vkDestroyBuffer(m_device, value, nullptr);
+		value = VK_NULL_HANDLE;
-			value = VK_NULL_HANDLE;
-		}
 	}
 
 	buffer::buffer(const vk::render_device& dev, VkBufferUsageFlags usage, void* host_pointer, u64 size)

rpcs3/Emu/RSX/VK/vkutils/buffer_object.h

@@ -9,9 +9,10 @@ namespace vk
 {
 	enum : u32
 	{
-		VK_BUFFER_CREATE_ALLOW_NULL_RPCS3 = 0x80000000,
+		VK_BUFFER_CREATE_ALLOW_NULL_RPCS3           = 0x10000000,   // If we cannot allocate memory for the buffer, just return an empty but valid object with a null handle.
+		VK_BUFFER_CREATE_IGNORE_VMEM_PRESSURE_RPCS3 = 0x20000000,   // If we cannot allocate memory for the buffer, do not run recovery routine to recover VRAM. Crash or return empty handle immediately instead.
 
-		VK_BUFFER_CREATE_SPECIAL_FLAGS_RPCS3 = (VK_BUFFER_CREATE_ALLOW_NULL_RPCS3)
+		VK_BUFFER_CREATE_SPECIAL_FLAGS_RPCS3 = (VK_BUFFER_CREATE_ALLOW_NULL_RPCS3 | VK_BUFFER_CREATE_IGNORE_VMEM_PRESSURE_RPCS3)
 	};
 
 	struct buffer_view : public unique_resource

rpcs3/Emu/RSX/VK/vkutils/data_heap.cpp

@@ -53,7 +53,7 @@ namespace vk
 		VkFlags create_flags = 0;
 		if (m_prefer_writethrough)
 		{
-			create_flags |= VK_BUFFER_CREATE_ALLOW_NULL_RPCS3;
+			create_flags |= (VK_BUFFER_CREATE_ALLOW_NULL_RPCS3 | VK_BUFFER_CREATE_IGNORE_VMEM_PRESSURE_RPCS3);
 		}
 
 		heap = std::make_unique<buffer>(*g_render_device, size, memory_index, memory_flags, usage, create_flags, VMM_ALLOCATION_POOL_SYSTEM);
@@ -146,7 +146,7 @@ namespace vk
 		VkFlags create_flags = 0;
 		if (m_prefer_writethrough)
 		{
-			create_flags |= VK_BUFFER_CREATE_ALLOW_NULL_RPCS3;
+			create_flags |= (VK_BUFFER_CREATE_ALLOW_NULL_RPCS3 | VK_BUFFER_CREATE_IGNORE_VMEM_PRESSURE_RPCS3);
 		}
 
 		heap = std::make_unique<buffer>(*g_render_device, aligned_new_size, memory_index, memory_flags, usage, create_flags, VMM_ALLOCATION_POOL_SYSTEM);

rpcs3/Emu/RSX/VK/vkutils/image.cpp

@@ -128,7 +128,16 @@ namespace vk
 			fmt::throw_exception("No compatible memory type was found!");
 		}
 
-		memory = std::make_shared<vk::memory_block>(m_device, memory_req.size, memory_req.alignment, allocation_type_info, allocation_pool, nullable);
+		memory_allocation_request alloc_request
+		{
+			.size = memory_req.size,
+			.alignment = memory_req.alignment,
+			.memory_type = &allocation_type_info,
+			.pool = allocation_pool,
+			.throw_on_fail = !nullable
+		};
+		memory = std::make_shared<vk::memory_block>(m_device, alloc_request);
+
 		if (auto device_mem = memory->get_vk_device_memory();
 			device_mem != VK_NULL_HANDLE) [[likely]]
 		{

rpcs3/Emu/RSX/VK/vkutils/memory.cpp

@@ -224,7 +224,7 @@ namespace vk
 		vmaDestroyAllocator(m_allocator);
 	}
 
-	mem_allocator_vk::mem_handle_t mem_allocator_vma::alloc(u64 block_sz, u64 alignment, const memory_type_info& memory_type, vmm_allocation_pool pool, bool throw_on_fail)
+	mem_allocator_vk::mem_handle_t mem_allocator_vma::alloc(const memory_allocation_request& request)
 	{
 		VmaAllocation vma_alloc;
 		VkMemoryRequirements mem_req = {};
@@ -233,11 +233,11 @@ namespace vk
 
 		auto do_vma_alloc = [&]() -> std::tuple<VkResult, u32>
 		{
-			for (const auto& memory_type_index : memory_type)
+			for (const auto& memory_type_index : *request.memory_type)
 			{
 				mem_req.memoryTypeBits = 1u << memory_type_index;
-				mem_req.size = ::align2(block_sz, alignment);
+				mem_req.size = ::align2(request.size, request.alignment);
-				mem_req.alignment = alignment;
+				mem_req.alignment = request.alignment;
 				create_info.memoryTypeBits = 1u << memory_type_index;
 				create_info.flags = m_allocation_flags;
 
@@ -256,26 +256,29 @@ namespace vk
 			const auto [status, type] = do_vma_alloc();
 			if (status == VK_SUCCESS)
 			{
-				vmm_notify_memory_allocated(vma_alloc, type, block_sz, pool);
+				vmm_notify_memory_allocated(vma_alloc, type, request.size, request.pool);
 				return vma_alloc;
 			}
 		}
 
-		const auto severity = (throw_on_fail) ? rsx::problem_severity::fatal : rsx::problem_severity::severe;
+		if (request.recover_vmem_on_fail)
-		if (error_code == VK_ERROR_OUT_OF_DEVICE_MEMORY &&
-			vmm_handle_memory_pressure(severity))
 		{
-			// Out of memory. Try again.
+			const auto severity = (request.throw_on_fail) ? rsx::problem_severity::fatal : rsx::problem_severity::severe;
-			const auto [status, type] = do_vma_alloc();
+			if (error_code == VK_ERROR_OUT_OF_DEVICE_MEMORY &&
-			if (status == VK_SUCCESS)
+				vmm_handle_memory_pressure(severity))
 			{
-				rsx_log.warning("Renderer ran out of video memory but successfully recovered.");
+				// Out of memory. Try again.
-				vmm_notify_memory_allocated(vma_alloc, type, block_sz, pool);
+				const auto [status, type] = do_vma_alloc();
-				return vma_alloc;
+				if (status == VK_SUCCESS)
+				{
+					rsx_log.warning("Renderer ran out of video memory but successfully recovered.");
+					vmm_notify_memory_allocated(vma_alloc, type, request.size, request.pool);
+					return vma_alloc;
+				}
 			}
 		}
 
-		if (!throw_on_fail)
+		if (!request.throw_on_fail)
 		{
 			return VK_NULL_HANDLE;
 		}
@@ -361,18 +364,18 @@ namespace vk
 		m_allocation_flags = VMA_ALLOCATION_CREATE_STRATEGY_MIN_TIME_BIT;
 	}
 
-	mem_allocator_vk::mem_handle_t mem_allocator_vk::alloc(u64 block_sz, u64 /*alignment*/, const memory_type_info& memory_type, vmm_allocation_pool pool, bool throw_on_fail)
+	mem_allocator_vk::mem_handle_t mem_allocator_vk::alloc(const memory_allocation_request& request)
 	{
 		VkResult error_code = VK_ERROR_UNKNOWN;
 		VkDeviceMemory memory;
 
 		VkMemoryAllocateInfo info = {};
 		info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO;
-		info.allocationSize = block_sz;
+		info.allocationSize = request.size;
 
 		auto do_vk_alloc = [&]() -> std::tuple<VkResult, u32>
 		{
-			for (const auto& memory_type_index : memory_type)
+			for (const auto& memory_type_index : *request.memory_type)
 			{
 				info.memoryTypeIndex = memory_type_index;
 				error_code = vkAllocateMemory(m_device, &info, nullptr, &memory);
@@ -389,26 +392,29 @@ namespace vk
 			const auto [status, type] = do_vk_alloc();
 			if (status == VK_SUCCESS)
 			{
-				vmm_notify_memory_allocated(memory, type, block_sz, pool);
+				vmm_notify_memory_allocated(memory, type, request.size, request.pool);
 				return memory;
 			}
 		}
 
-		const auto severity = (throw_on_fail) ? rsx::problem_severity::fatal : rsx::problem_severity::severe;
+		if (request.recover_vmem_on_fail)
-		if (error_code == VK_ERROR_OUT_OF_DEVICE_MEMORY &&
-			vmm_handle_memory_pressure(severity))
 		{
-			// Out of memory. Try again.
+			const auto severity = (request.throw_on_fail) ? rsx::problem_severity::fatal : rsx::problem_severity::severe;
-			const auto [status, type] = do_vk_alloc();
+			if (error_code == VK_ERROR_OUT_OF_DEVICE_MEMORY &&
-			if (status == VK_SUCCESS)
+				vmm_handle_memory_pressure(severity))
 			{
-				rsx_log.warning("Renderer ran out of video memory but successfully recovered.");
+				// Out of memory. Try again.
-				vmm_notify_memory_allocated(memory, type, block_sz, pool);
+				const auto [status, type] = do_vk_alloc();
-				return memory;
+				if (status == VK_SUCCESS)
+				{
+					rsx_log.warning("Renderer ran out of video memory but successfully recovered.");
+					vmm_notify_memory_allocated(memory, type, request.size, request.pool);
+					return memory;
+				}
 			}
 		}
 
-		if (!throw_on_fail)
+		if (!request.throw_on_fail)
 		{
 			return VK_NULL_HANDLE;
 		}
@@ -455,11 +461,11 @@ namespace vk
 		return g_render_device->get_allocator();
 	}
 
-	memory_block::memory_block(VkDevice dev, u64 block_sz, u64 alignment, const memory_type_info& memory_type, vmm_allocation_pool pool, bool nullable)
+	memory_block::memory_block(VkDevice dev, const memory_allocation_request& alloc_request)
-		: m_device(dev), m_size(block_sz)
+		: m_device(dev), m_size(alloc_request.size)
 	{
 		m_mem_allocator = get_current_mem_allocator();
-		m_mem_handle    = m_mem_allocator->alloc(block_sz, alignment, memory_type, pool, !nullable);
+		m_mem_handle    = m_mem_allocator->alloc(alloc_request);
 	}
 
 	memory_block::~memory_block()

rpcs3/Emu/RSX/VK/vkutils/memory.h

@@ -66,6 +66,16 @@ namespace vk
 		u64 size;
 	};
 
+	struct memory_allocation_request
+	{
+		u64 size = 0;
+		u64 alignment = 1;
+		const memory_type_info* memory_type = nullptr;
+		vmm_allocation_pool pool = VMM_ALLOCATION_POOL_UNDEFINED;
+		bool throw_on_fail = true;
+		bool recover_vmem_on_fail = true;
+	};
+
 	class mem_allocator_base
 	{
 	public:
@@ -76,7 +86,7 @@ namespace vk
 
 		virtual void destroy() = 0;
 
-		virtual mem_handle_t alloc(u64 block_sz, u64 alignment, const memory_type_info& memory_type, vmm_allocation_pool pool, bool throw_on_fail) = 0;
+		virtual mem_handle_t alloc(const memory_allocation_request& request) = 0;
 		virtual void free(mem_handle_t mem_handle) = 0;
 		virtual void* map(mem_handle_t mem_handle, u64 offset, u64 size) = 0;
 		virtual void unmap(mem_handle_t mem_handle) = 0;
@@ -104,7 +114,7 @@ namespace vk
 
 		void destroy() override;
 
-		mem_handle_t alloc(u64 block_sz, u64 alignment, const memory_type_info& memory_type, vmm_allocation_pool pool, bool throw_on_fail) override;
+		mem_handle_t alloc(const memory_allocation_request& request) override;
 
 		void free(mem_handle_t mem_handle) override;
 		void* map(mem_handle_t mem_handle, u64 offset, u64 /*size*/) override;
@@ -134,7 +144,7 @@ namespace vk
 
 		void destroy() override {}
 
-		mem_handle_t alloc(u64 block_sz, u64 /*alignment*/, const memory_type_info& memory_type, vmm_allocation_pool pool, bool throw_on_fail) override;
+		mem_handle_t alloc(const memory_allocation_request& request) override;
 
 		void free(mem_handle_t mem_handle) override;
 		void* map(mem_handle_t mem_handle, u64 offset, u64 size) override;
@@ -147,7 +157,7 @@ namespace vk
 
 	struct memory_block
 	{
-		memory_block(VkDevice dev, u64 block_sz, u64 alignment, const memory_type_info& memory_type, vmm_allocation_pool pool, bool nullable = false);
+		memory_block(VkDevice dev, const memory_allocation_request& alloc_request);
 		virtual ~memory_block();
 
 		virtual VkDeviceMemory get_vk_device_memory();

rpcs3/Emu/localized_string_id.h

@@ -267,6 +267,7 @@ enum class localized_string_id
 	HOME_MENU_SETTINGS_DEBUG_OVERLAY,
 	HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY,
 	HOME_MENU_SETTINGS_MOUSE_DEBUG_INPUT_OVERLAY,
+	HOME_MENU_SETTINGS_PS_MOVE_DEBUG_INPUT_OVERLAY,
 	HOME_MENU_SETTINGS_DEBUG_DISABLE_VIDEO_OUTPUT,
 	HOME_MENU_SETTINGS_DEBUG_TEXTURE_LOD_BIAS,
 	HOME_MENU_SCREENSHOT,

rpcs3/Emu/system_config.h

@@ -283,6 +283,7 @@ struct cfg_root : cfg::node
 		cfg::_bool load_sdl_mappings{ this, "Load SDL GameController Mappings", true };
 		cfg::_bool pad_debug_overlay{ this, "IO Debug overlay", false, true };
 		cfg::_bool mouse_debug_overlay{ this, "Mouse Debug overlay", false, true };
+		cfg::_bool ps_move_debug_overlay{ this, "PS Move Debug overlay", false, true };
 		cfg::uint<1, 180> fake_move_rotation_cone_h{ this, "Fake Move Rotation Cone", 10, true };
 		cfg::uint<1, 180> fake_move_rotation_cone_v{ this, "Fake Move Rotation Cone (Vertical)", 10, true };
 

rpcs3/emucore.vcxproj

@@ -133,6 +133,7 @@
     <ClCompile Include="Emu\RSX\NV47\HW\nv308a.cpp" />
     <ClCompile Include="Emu\RSX\NV47\HW\nv406e.cpp" />
     <ClCompile Include="Emu\RSX\NV47\HW\nv4097.cpp" />
+    <ClCompile Include="Emu\RSX\Overlays\Debug\overlay_ps_move_debug.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\FriendsList\overlay_friends_list_dialog.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu.cpp" />
     <ClCompile Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_components.cpp" />
@@ -684,6 +685,7 @@
     <ClInclude Include="Emu\RSX\NV47\HW\nv47.h" />
     <ClInclude Include="Emu\RSX\NV47\HW\common.h" />
     <ClInclude Include="Emu\RSX\NV47\HW\nv47_sync.hpp" />
+    <ClInclude Include="Emu\RSX\Overlays\Debug\overlay_ps_move_debug.h" />
     <ClInclude Include="Emu\RSX\Overlays\FriendsList\overlay_friends_list_dialog.h" />
     <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu.h" />
     <ClInclude Include="Emu\RSX\Overlays\HomeMenu\overlay_home_menu_components.h" />

rpcs3/emucore.vcxproj.filters

@@ -142,6 +142,9 @@
     <Filter Include="Emu\GPU\RSX\Program\Assembler\Passes\FP">
       <UniqueIdentifier>{7fb59544-9761-4b4a-bb04-07deb43cf3c2}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Emu\GPU\RSX\Overlays\Debug">
+      <UniqueIdentifier>{0421cba0-f378-4c28-bd91-c82557a0d5b7}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Crypto\aes.cpp">
@@ -903,9 +906,6 @@
     <ClCompile Include="Emu\RSX\Overlays\overlay_message_dialog.cpp">
       <Filter>Emu\GPU\RSX\Overlays</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\overlay_trophy_notification.cpp">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\RSX\Overlays\overlay_list_view.cpp">
       <Filter>Emu\GPU\RSX\Overlays</Filter>
     </ClCompile>
@@ -1252,9 +1252,6 @@
     <ClCompile Include="Crypto\unzip.cpp">
       <Filter>Crypto</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\Overlays\overlay_debug_overlay.cpp">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClCompile>
     <ClCompile Include="Emu\RSX\Overlays\Network\overlay_recvmessage_dialog.cpp">
       <Filter>Emu\GPU\RSX\Overlays\Network</Filter>
     </ClCompile>
@@ -1396,6 +1393,15 @@
     <ClCompile Include="Emu\Io\ps_move_data.cpp">
       <Filter>Emu\Io</Filter>
     </ClCompile>
+    <ClCompile Include="Emu\RSX\Overlays\Debug\overlay_ps_move_debug.cpp">
+      <Filter>Emu\GPU\RSX\Overlays\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\Overlays\overlay_trophy_notification.cpp">
+      <Filter>Emu\GPU\RSX\Overlays\Trophies</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\Overlays\overlay_debug_overlay.cpp">
+      <Filter>Emu\GPU\RSX\Overlays\Debug</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Crypto\aes.h">
@@ -2181,9 +2187,6 @@
     <ClInclude Include="Emu\RSX\Overlays\overlay_message_dialog.h">
       <Filter>Emu\GPU\RSX\Overlays</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\overlay_trophy_notification.h">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\RSX\Overlays\overlay_compile_notification.h">
       <Filter>Emu\GPU\RSX\Overlays</Filter>
     </ClInclude>
@@ -2602,9 +2605,6 @@
     <ClInclude Include="util\serialization_ext.hpp">
       <Filter>Emu</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\Overlays\overlay_debug_overlay.h">
-      <Filter>Emu\GPU\RSX\Overlays</Filter>
-    </ClInclude>
     <ClInclude Include="Emu\RSX\Overlays\Network\overlay_recvmessage_dialog.h">
       <Filter>Emu\GPU\RSX\Overlays\Network</Filter>
     </ClInclude>
@@ -2806,6 +2806,15 @@
     <ClInclude Include="Emu\Io\ps_move_data.h">
       <Filter>Emu\Io</Filter>
     </ClInclude>
+    <ClInclude Include="Emu\RSX\Overlays\Debug\overlay_ps_move_debug.h">
+      <Filter>Emu\GPU\RSX\Overlays\Debug</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\Overlays\overlay_trophy_notification.h">
+      <Filter>Emu\GPU\RSX\Overlays\Trophies</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\Overlays\overlay_debug_overlay.h">
+      <Filter>Emu\GPU\RSX\Overlays\Debug</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="Emu\RSX\Program\GLSLSnippets\GPUDeswizzle.glsl">

rpcs3/main_application.cpp

@@ -52,7 +52,7 @@ namespace audio
 namespace rsx::overlays
 {
 	extern void reset_performance_overlay();
-	extern void reset_debug_overlay();
+	extern void reset_debug_overlays();
 }
 
 extern void qt_events_aware_op(int repeat_duration_ms, std::function<bool()> wrapped_op);
@@ -89,7 +89,7 @@ void main_application::OnEmuSettingsChange()
 	audio::configure_audio();
 	audio::configure_rsxaudio();
 	rsx::overlays::reset_performance_overlay();
-	rsx::overlays::reset_debug_overlay();
+	rsx::overlays::reset_debug_overlays();
 }
 
 /** RPCS3 emulator has functions it desires to call from the GUI at times. Initialize them in here. */

rpcs3/rpcs3qt/emu_settings_type.h

@@ -171,6 +171,7 @@ enum class emu_settings_type
 	SDLMappings,
 	IoDebugOverlay,
 	MouseDebugOverlay,
+	MoveDebugOverlay,
 
 	// Misc
 	ExitRPCS3OnFinish,
@@ -381,6 +382,7 @@ inline static const std::map<emu_settings_type, cfg_location> settings_location
 	{ emu_settings_type::SDLMappings,       { "Input/Output", "Load SDL GameController Mappings" }},
 	{ emu_settings_type::IoDebugOverlay,    { "Input/Output", "IO Debug overlay" }},
 	{ emu_settings_type::MouseDebugOverlay, { "Input/Output", "Mouse Debug overlay" }},
+	{ emu_settings_type::MoveDebugOverlay,  { "Input/Output", "PS Move Debug overlay" }},
 
 	// Misc
 	{ emu_settings_type::ExitRPCS3OnFinish,               { "Miscellaneous", "Exit RPCS3 when process finishes" }},

rpcs3/rpcs3qt/localized_emu.h

@@ -288,6 +288,7 @@ private:
 		case localized_string_id::HOME_MENU_SETTINGS_DEBUG_OVERLAY: return tr("Debug Overlay", "Debug");
 		case localized_string_id::HOME_MENU_SETTINGS_DEBUG_INPUT_OVERLAY: return tr("Input Debug Overlay", "Debug");
 		case localized_string_id::HOME_MENU_SETTINGS_MOUSE_DEBUG_INPUT_OVERLAY: return tr("Mouse Debug Overlay", "Debug");
+		case localized_string_id::HOME_MENU_SETTINGS_PS_MOVE_DEBUG_INPUT_OVERLAY: return tr("PSMove Debug Overlay", "Debug");
 		case localized_string_id::HOME_MENU_SETTINGS_DEBUG_DISABLE_VIDEO_OUTPUT: return tr("Disable Video Output", "Debug");
 		case localized_string_id::HOME_MENU_SETTINGS_DEBUG_TEXTURE_LOD_BIAS: return tr("Texture LOD Bias Addend", "Debug");
 		case localized_string_id::HOME_MENU_SCREENSHOT: return tr("Take Screenshot");

rpcs3/rpcs3qt/qt_camera_video_sink.cpp

@@ -114,45 +114,60 @@ bool qt_camera_video_sink::present(const QVideoFrame& frame)
 		case CELL_CAMERA_RAW8: // The game seems to expect BGGR
 		{
 			// Let's use a very simple algorithm to convert the image to raw BGGR
-			const auto convert_to_bggr = [&image_buffer, &image, width, height](u32 y_begin, u32 y_end)
+			const auto convert_to_bggr = [this, &image_buffer, &image, width, height](u32 y_begin, u32 y_end)
 			{
 				u8* dst = &image_buffer.data[image_buffer.width * y_begin];
 
 				for (u32 y = y_begin; y < height && y < y_end; y++)
 				{
 					const u8* src = image.constScanLine(y);
+					const u8* srcu = image.constScanLine(std::max<s32>(0, y - 1));
+					const u8* srcd = image.constScanLine(std::min(height - 1, y + 1));
 					const bool is_top_pixel = (y % 2) == 0;
 
+					// We apply gaussian blur to get better demosaicing results later when debayering again
+					const auto blurred = [&](s32 x, s32 c)
+					{
+						const s32 i = x * 4 + c;
+						const s32 il = std::max(0, x - 1) * 4 + c;
+						const s32 ir = std::min<s32>(width - 1, x + 1) * 4 + c;
+						const s32 sum =
+							              srcu[i] +
+							src[il] + 4 * src[i]  + src[ir] +
+							              srcd[i];
+						return static_cast<u8>(std::clamp((sum + 4) / 8, 0, 255));
+					};
+
 					// Split loops (roughly twice the performance by removing one condition)
 					if (is_top_pixel)
 					{
-						for (u32 x = 0; x < width; x++, dst++, src += 4)
+						for (u32 x = 0; x < width; x++, dst++)
 						{
 							const bool is_left_pixel = (x % 2) == 0;
 
 							if (is_left_pixel)
 							{
-								*dst = src[2]; // Blue
+								*dst = blurred(x, 2); // Blue
 							}
 							else
 							{
-								*dst = src[1]; // Green
+								*dst = blurred(x, 1); // Green
 							}
 						}
 					}
 					else
 					{
-						for (u32 x = 0; x < width; x++, dst++, src += 4)
+						for (u32 x = 0; x < width; x++, dst++)
 						{
 							const bool is_left_pixel = (x % 2) == 0;
 
 							if (is_left_pixel)
 							{
-								*dst = src[1]; // Green
+								*dst = blurred(x, 1); // Green
 							}
 							else
 							{
-								*dst = src[0]; // Red
+								*dst = blurred(x, 0); // Red
 							}
 						}
 					}
@@ -182,13 +197,13 @@ bool qt_camera_video_sink::present(const QVideoFrame& frame)
 			// Simple RGB to Y0_U_Y1_V conversion from stackoverflow.
 			const auto convert_to_yuv422 = [&image_buffer, &image, width, height, format = m_format](u32 y_begin, u32 y_end)
 			{
-				constexpr int yuv_bytes_per_pixel = 2;
+				constexpr s32 yuv_bytes_per_pixel = 2;
-				const int yuv_pitch = image_buffer.width * yuv_bytes_per_pixel;
+				const s32 yuv_pitch = image_buffer.width * yuv_bytes_per_pixel;
 
-				const int y0_offset = (format == CELL_CAMERA_Y0_U_Y1_V) ? 0 : 3;
+				const s32 y0_offset = (format == CELL_CAMERA_Y0_U_Y1_V) ? 0 : 3;
-				const int u_offset  = (format == CELL_CAMERA_Y0_U_Y1_V) ? 1 : 2;
+				const s32 u_offset  = (format == CELL_CAMERA_Y0_U_Y1_V) ? 1 : 2;
-				const int y1_offset = (format == CELL_CAMERA_Y0_U_Y1_V) ? 2 : 1;
+				const s32 y1_offset = (format == CELL_CAMERA_Y0_U_Y1_V) ? 2 : 1;
-				const int v_offset  = (format == CELL_CAMERA_Y0_U_Y1_V) ? 3 : 0;
+				const s32 v_offset  = (format == CELL_CAMERA_Y0_U_Y1_V) ? 3 : 0;
 
 				for (u32 y = y_begin; y < height && y < y_end; y++)
 				{
@@ -197,19 +212,19 @@ bool qt_camera_video_sink::present(const QVideoFrame& frame)
 
 					for (u32 x = 0; x < width - 1; x += 2, src += 8)
 					{
-						const float r1 = src[0];
+						const f32 r1 = src[0];
-						const float g1 = src[1];
+						const f32 g1 = src[1];
-						const float b1 = src[2];
+						const f32 b1 = src[2];
-						const float r2 = src[4];
+						const f32 r2 = src[4];
-						const float g2 = src[5];
+						const f32 g2 = src[5];
-						const float b2 = src[6];
+						const f32 b2 = src[6];
 
-						const int y0 =  (0.257f * r1) + (0.504f * g1) + (0.098f * b1) +  16.0f;
+						const s32 y0 =  (0.257f * r1) + (0.504f * g1) + (0.098f * b1) +  16.0f;
-						const int u  = -(0.148f * r1) - (0.291f * g1) + (0.439f * b1) + 128.0f;
+						const s32 u  = -(0.148f * r1) - (0.291f * g1) + (0.439f * b1) + 128.0f;
-						const int v  =  (0.439f * r1) - (0.368f * g1) - (0.071f * b1) + 128.0f;
+						const s32 v  =  (0.439f * r1) - (0.368f * g1) - (0.071f * b1) + 128.0f;
-						const int y1 =  (0.257f * r2) + (0.504f * g2) + (0.098f * b2) +  16.0f;
+						const s32 y1 =  (0.257f * r2) + (0.504f * g2) + (0.098f * b2) +  16.0f;
 
-						const int yuv_index = x * yuv_bytes_per_pixel;
+						const s32 yuv_index = x * yuv_bytes_per_pixel;
 						yuv_row_ptr[yuv_index + y0_offset] = static_cast<u8>(std::clamp(y0, 0, 255));
 						yuv_row_ptr[yuv_index + u_offset]  = static_cast<u8>(std::clamp( u, 0, 255));
 						yuv_row_ptr[yuv_index + y1_offset] = static_cast<u8>(std::clamp(y1, 0, 255));

rpcs3/rpcs3qt/settings_dialog.cpp

@@ -2475,6 +2475,9 @@ settings_dialog::settings_dialog(std::shared_ptr<gui_settings> gui_settings, std
 	m_emu_settings->EnhanceCheckBox(ui->debugOverlayMouse, emu_settings_type::MouseDebugOverlay);
 	SubscribeTooltip(ui->debugOverlayMouse, tooltips.settings.debug_overlay_mouse);
 
+	m_emu_settings->EnhanceCheckBox(ui->debugOverlayPsMove, emu_settings_type::MoveDebugOverlay);
+	SubscribeTooltip(ui->debugOverlayPsMove, tooltips.settings.debug_overlay_ps_move);
+
 	// Comboboxes
 
 	m_emu_settings->EnhanceComboBox(ui->combo_accurate_ppu_128, emu_settings_type::AccuratePPU128Loop, true);

rpcs3/rpcs3qt/settings_dialog.ui

@@ -265,7 +265,7 @@
            </layout>
           </item>
           <item>
-           <layout class="QVBoxLayout" name="coreTabRightLayout" stretch="0,0,0,0">
+           <layout class="QVBoxLayout" name="coreTabRightLayout" stretch="0,0,0">
             <item>
              <widget class="QGroupBox" name="gb_spu_threads">
               <property name="sizePolicy">
@@ -4551,6 +4551,13 @@
                   </property>
                  </widget>
                 </item>
+                <item>
+                 <widget class="QCheckBox" name="debugOverlayPsMove">
+                  <property name="text">
+                   <string>Debug Overlay For PSMove Input</string>
+                  </property>
+                 </widget>
+                </item>
                 <item>
                  <spacer name="verticalSpacer">
                   <property name="orientation">

rpcs3/rpcs3qt/tooltips.h

@@ -115,6 +115,7 @@ public:
 		const QString debug_overlay                = tr("Provides a graphical overlay of various debugging information.\nIf unsure, don't use this option.");
 		const QString debug_overlay_io             = tr("Provides a graphical overlay with pad input values for player 1.\nThis is only shown if the debug overlay is disabled.\nIf unsure, don't use this option.");
 		const QString debug_overlay_mouse          = tr("Provides a graphical overlay with mouse input values.\nThis is only shown if the other debug overlays are disabled.\nIf unsure, don't use this option.");
+		const QString debug_overlay_ps_move        = tr("Provides a graphical overlay with PSMove input values.\nIf unsure, don't use this option.");
 		const QString log_shader_programs          = tr("Dump game shaders to file. Only useful to developers.\nIf unsure, don't use this option.");
 		const QString disable_occlusion_queries    = tr("Disables running occlusion queries. Minor to moderate performance boost.\nMight introduce issues with broken occlusion e.g missing geometry and extreme pop-in.");
 		const QString disable_video_output         = tr("Disables all video output and PS3 graphical rendering.\nIts only use case is to evaluate performance on CELL for development.");