Merge 6f7416425a into 5486eed151

change uint8_t to u8 for consistency
GS/HW: Merge blend ad a mask separate conditions in to one.
2024-09-19 02:27:10 +00:00 · 2024-09-18 19:27:07 -07:00 · 2024-09-19 00:19:05 +02:00 · 2024-09-18 16:57:20 -04:00
3 changed files with 5 additions and 11 deletions
--- a/pcsx2-qt/QtKeyCodes.cpp
+++ b/pcsx2-qt/QtKeyCodes.cpp
@ -13,7 +13,7 @@
 #include <QtGui/QKeyEvent>
-uint8_t map_text_to_keycode(const QString& text)
+u8 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();
-	uint8_t keycode = map_text_to_keycode(text); // Map special text symbols to keycodes
+	u8 keycode = map_text_to_keycode(text); // Map special text symbols to keycodes
 	int key = ev->key();
 	if (keycode != 0)
--- a/pcsx2/DebugTools/DebugInterface.cpp
+++ b/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:
--- a/pcsx2/GS/Renderers/HW/GSRendererHW.cpp
+++ b/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;
Author	SHA1	Message	Date
Joe Wagner	0157b7fae9	Merge `6f7416425a` into `5486eed151`	2024-09-19 02:27:10 +00:00
Joe Wagner	6f7416425a	change uint8_t to u8 for consistency	2024-09-18 19:27:07 -07:00
lightningterror	5486eed151	GS/HW: Merge blend ad a mask separate conditions in to one. Duplicate code.	2024-09-19 00:19:05 +02:00
Ty Lamontagne	d1721360ff	DebugInterface: Fix formatting	2024-09-18 16:57:20 -04:00