Merge 6f7416425a into 5486eed151

Duplicate code.

pcsx2-qt/QtKeyCodes.cpp

@@ -13,6 +13,53 @@
 
 #include <QtGui/QKeyEvent>
 
+u8 map_text_to_keycode(const QString& text)
+{
+	if (text == "!")
+		return Qt::Key_1;
+	if (text == "@")
+		return Qt::Key_2;
+	if (text == "#")
+		return Qt::Key_3;
+	if (text == "$")
+		return Qt::Key_4;
+	if (text == "%")
+		return Qt::Key_5;
+	if (text == "^")
+		return Qt::Key_6;
+	if (text == "&")
+		return Qt::Key_7;
+	if (text == "*")
+		return Qt::Key_8;
+	if (text == "(")
+		return Qt::Key_9;
+	if (text == ")")
+		return Qt::Key_0;
+	if (text == "_")
+		return Qt::Key_Minus;
+	if (text == "+")
+		return Qt::Key_Equal;
+	if (text == "?")
+		return Qt::Key_Slash;
+	if (text == ":")
+		return Qt::Key_Semicolon;
+	if (text == "\"")
+		return Qt::Key_Apostrophe;
+	if (text == "~")
+		return Qt::Key_QuoteLeft;
+	if (text == "<")
+		return Qt::Key_Comma;
+	if (text == ">")
+		return Qt::Key_Period;
+	if (text == "|")
+		return Qt::Key_Backslash;
+	if (text == "{")
+		return Qt::Key_BracketLeft;
+	if (text == "}")
+		return Qt::Key_BracketRight;
+	return 0; // No remapping
+}
+
 struct KeyCodeName
 {
 	int code;
@@ -519,7 +566,15 @@ const char* InputManager::ConvertHostKeyboardCodeToIcon(u32 code)
 
 u32 QtUtils::KeyEventToCode(const QKeyEvent* ev)
 {
+	QString text = ev->text();
+	u8 keycode = map_text_to_keycode(text); // Map special text symbols to keycodes
 	int key = ev->key();
+
+	if (keycode != 0)
+	{
+		key = keycode; // Override key if mapped
+	}
+
 	Qt::KeyboardModifiers modifiers = ev->modifiers();
 
 #ifdef __APPLE__

pcsx2/DebugTools/DebugInterface.cpp

@@ -829,7 +829,7 @@ bool R5900DebugInterface::isValidAddress(u32 addr)
 			break;
 		case 8:
 		case 0xA:
-			if(lopart <= 0xFFFFF)
+			if (lopart <= 0xFFFFF)
 				return true;
 			break;
 		case 9:

pcsx2/GS/Renderers/HW/GSRendererHW.cpp

@@ -4208,14 +4208,8 @@ void GSRendererHW::EmulateBlending(int rt_alpha_min, int rt_alpha_max, const boo
 	const bool alpha_mask = (m_cached_ctx.FRAME.FBMSK & 0xFF000000) == 0xFF000000;
 	bool blend_ad_alpha_masked = blend_ad && alpha_mask;
 	const bool is_basic_blend = GSConfig.AccurateBlendingUnit >= AccBlendLevel::Basic;
-	if ((is_basic_blend || (COLCLAMP.CLAMP == 0)) && features.texture_barrier && blend_ad_alpha_masked)
+	if (blend_ad_alpha_masked && (((is_basic_blend || (COLCLAMP.CLAMP == 0)) && features.texture_barrier)
-	{
+		|| ((GSConfig.AccurateBlendingUnit >= AccBlendLevel::Medium) || m_conf.require_one_barrier)))
-		// Swap Ad with As for hw blend.
-		m_conf.ps.a_masked = 1;
-		m_conf.ps.blend_c = 0;
-		m_conf.require_one_barrier |= true;
-	}
-	else if (((GSConfig.AccurateBlendingUnit >= AccBlendLevel::Medium) || m_conf.require_one_barrier) && blend_ad_alpha_masked)
 	{
 		// Swap Ad with As for hw blend.
 		m_conf.ps.a_masked = 1;