Merge f8f8049fd3 into 0a0f99dd1b

pcsx2-qt/QtKeyCodes.cpp

@@ -13,7 +13,7 @@
 
 #include <QtGui/QKeyEvent>
 
-u8 map_text_to_keycode(const QString& text)
+uint8_t map_text_to_keycode(const QString& text)
 {
 	if (text == "!")
 		return Qt::Key_1;
@@ -567,7 +567,7 @@ 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
+	uint8_t keycode = map_text_to_keycode(text); // Map special text symbols to keycodes
 	int key = ev->key();
 
 	if (keycode != 0)

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,8 +4208,14 @@ 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 (blend_ad_alpha_masked && (((is_basic_blend || (COLCLAMP.CLAMP == 0)) && features.texture_barrier)
-		|| ((GSConfig.AccurateBlendingUnit >= AccBlendLevel::Medium) || m_conf.require_one_barrier)))
+	if ((is_basic_blend || (COLCLAMP.CLAMP == 0)) && features.texture_barrier && blend_ad_alpha_masked)
+	{
+		// 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;