GS: Add Pre-Round Sprite hack

This attempts to preproduce hardware behaviour, but falls down in a bunch of cases, hence the hack.

.github/workflows/scripts/windows/build-dependencies.bat

@@ -201,10 +201,6 @@ echo Building Qt base...
 rmdir /S /Q "qtbase-everywhere-src-%QT%"
 %SEVENZIP% x "qtbase-everywhere-src-%QT%.zip" || goto error
 cd "qtbase-everywhere-src-%QT%" || goto error
-
-rem Disable the PCRE2 JIT, it doesn't properly verify AVX2 support.
-%PATCH% -p1 < "%SCRIPTDIR%\qtbase-disable-pcre2-jit.patch" || goto error
-
 cmake -B build -DFEATURE_sql=OFF -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" %FORCEPDB% -DINPUT_gui=yes -DINPUT_widgets=yes -DINPUT_ssl=yes -DINPUT_openssl=no -DINPUT_schannel=yes -DFEATURE_system_png=ON -DFEATURE_system_jpeg=ON -DFEATURE_system_zlib=ON -DFEATURE_system_freetype=ON -DFEATURE_system_harfbuzz=ON %QTBUILDSPEC% || goto error
 cmake --build build --parallel || goto error
 ninja -C build install || goto error

.github/workflows/scripts/windows/qtbase-disable-pcre2-jit.patch

@@ -1,35 +0,0 @@
---- qtbase/src/3rdparty/pcre2/CMakeLists.txt	2024-03-19 08:46:43.000000000 -0700
-+++ qtbase/src/3rdparty/pcre2/CMakeLists.txt	2024-06-06 21:52:20.539619500 -0700
-@@ -41,6 +41,7 @@
-         src/pcre2_xclass.c
-     DEFINES
-         HAVE_CONFIG_H
-+        PCRE2_DISABLE_JIT
-     PUBLIC_DEFINES
-         PCRE2_CODE_UNIT_WIDTH=16
-     PUBLIC_INCLUDE_DIRECTORIES
-@@ -52,23 +53,8 @@
- ## Scopes:
- #####################################################################
- 
--qt_internal_extend_target(BundledPcre2 CONDITION QNX OR UIKIT
--    DEFINES
--        PCRE2_DISABLE_JIT
--)
--
--qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32
--    DEFINES
--        PCRE2_DISABLE_JIT
--)
--
--qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32
--    DEFINES
--        PCRE2_DISABLE_JIT
--)
--
- if (APPLE)
--    target_compile_options(BundledPcre2 PRIVATE "SHELL:-Xarch_arm64 -DPCRE2_DISABLE_JIT")
-+    target_compile_options(BundledPcre2 PRIVATE "SHELL:-Xarch_arm64")
- endif()
- 
- qt_internal_extend_target(BundledPcre2 CONDITION WIN32

bin/resources/GameIndex.yaml

@@ -2239,6 +2239,8 @@ SCAJ-20152:
   gsHWFixes:
     alignSprite: 1 # Fixes vertical lines.
     textureInsideRT: 1 # Fixes corruption.
+    halfPixelOffset: 4 # Aligns post bloom.
+    nativeScaling: 2 # Fixes post effects.
     getSkipCount: "GSC_UrbanReign"
 SCAJ-20153:
   name: "コード・エイジ コマンダーズ"
@@ -6229,6 +6231,8 @@ SCES-53688:
   gsHWFixes:
     alignSprite: 1 # Fixes vertical lines.
     textureInsideRT: 1 # Fixes corruption.
+    halfPixelOffset: 4 # Aligns post bloom.
+    nativeScaling: 2 # Fixes post effects.
     getSkipCount: "GSC_UrbanReign"
 SCES-53795:
   name: "SingStar - '80s"
@@ -7698,6 +7702,8 @@ SCKA-20065:
   gsHWFixes:
     alignSprite: 1 # Fixes vertical lines.
     textureInsideRT: 1 # Fixes corruption.
+    halfPixelOffset: 4 # Aligns post bloom.
+    nativeScaling: 2 # Fixes post effects.
     getSkipCount: "GSC_UrbanReign"
 SCKA-20066:
   name: "아이토이 - 플레이 3"
@@ -35952,6 +35958,8 @@ SLPM-60272:
   gsHWFixes:
     alignSprite: 1 # Fixes vertical lines.
     textureInsideRT: 1 # Fixes corruption.
+    halfPixelOffset: 4 # Aligns post bloom.
+    nativeScaling: 2 # Fixes post effects.
     getSkipCount: "GSC_UrbanReign"
 SLPM-60273:
   name: "絶体絶命都市2 -凍てついた記憶たち- [体験版 Type-B]"
@@ -60340,6 +60348,8 @@ SLPS-25557:
   gsHWFixes:
     alignSprite: 1 # Fixes vertical lines.
     textureInsideRT: 1 # Fixes corruption.
+    halfPixelOffset: 4 # Aligns post bloom.
+    nativeScaling: 2 # Fixes post effects.
     getSkipCount: "GSC_UrbanReign"
 SLPS-25558:
   name: "ネオジオ バトルコロシアム"
@@ -70360,6 +70370,8 @@ SLUS-21209:
   gsHWFixes:
     alignSprite: 1 # Fixes vertical lines.
     textureInsideRT: 1 # Fixes corruption.
+    halfPixelOffset: 4 # Aligns post bloom.
+    nativeScaling: 2 # Fixes post effects.
     getSkipCount: "GSC_UrbanReign"
 SLUS-21212:
   name: "Spartan - Total Warrior"

pcsx2-qt/LogWindow.cpp

@@ -5,10 +5,14 @@
 #include "MainWindow.h"
 #include "QtHost.h"
 #include "SettingWidgetBinder.h"
+#include "VMManager.h"
 
 #include <QtCore/QLatin1StringView>
 #include <QtCore/QUtf8StringView>
 #include <QtGui/QIcon>
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLineEdit>
 #include <QtWidgets/QMenuBar>
 #include <QtWidgets/QScrollBar>
 
@@ -46,6 +50,12 @@ void LogWindow::updateSettings()
 	const bool new_enabled = Host::GetBaseBoolSettingValue("Logging", "EnableLogWindow", false) && !Host::InNoGUIMode();
 	const bool attach_to_main = Host::GetBaseBoolSettingValue("Logging", "AttachLogWindowToMainWindow", true);
 	const bool curr_enabled = Log::IsHostOutputEnabled();
+	const bool input_enabled = Host::GetBaseBoolSettingValue("Logging", "ShowEESIOInput");
+
+	if(g_log_window && g_log_window->m_line_input)
+	{
+		g_log_window->m_input_widget->setVisible(input_enabled);
+	}
 
 	if (new_enabled == curr_enabled)
 	{
@@ -171,6 +181,10 @@ void LogWindow::createUi()
 	action->setCheckable(true);
 	SettingWidgetBinder::BindWidgetToBoolSetting(nullptr, action, "Logging", "EnableTimestamps", true);
 
+	action = settings_menu->addAction(tr("Show EE SIO &Input"));
+	action->setCheckable(true);
+	SettingWidgetBinder::BindWidgetToBoolSetting(nullptr, action, "Logging", "ShowEESIOInput", false);
+
 	settings_menu->addSeparator();
 
 	// TODO: Log Level
@@ -181,6 +195,30 @@ void LogWindow::createUi()
 	m_text->setTextInteractionFlags(Qt::TextSelectableByKeyboard | Qt::TextSelectableByMouse);
 	m_text->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
 	m_text->setWordWrapMode(QTextOption::WrapAnywhere);
+	m_text->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
+	m_line_input = new QLineEdit(this);
+	connect(m_line_input, &QLineEdit::returnPressed, this, &LogWindow::onInputEntered);
+	
+	m_local_echo_checkbox = new QCheckBox(tr("Local Echo"), this);
+	m_local_echo_checkbox->setChecked(m_local_echo);
+	connect(m_local_echo_checkbox, &QCheckBox::checkStateChanged, this, [&](Qt::CheckState state)
+	{
+		m_local_echo = state == Qt::CheckState::Checked;
+	});
+	
+	m_newline_on_enter_checkbox = new QCheckBox(tr("Newline on send"), this);
+	m_newline_on_enter_checkbox->setChecked(m_newline_on_enter);
+	connect(m_newline_on_enter_checkbox, &QCheckBox::checkStateChanged, this, [&](Qt::CheckState state)
+	{
+		m_newline_on_enter = state == Qt::CheckState::Checked;
+	});
+
+	m_input_hbox = new QHBoxLayout(this);
+	m_input_hbox->addWidget(m_line_input, 1);
+	m_input_hbox->addWidget(m_local_echo_checkbox);
+	m_input_hbox->addWidget(m_newline_on_enter_checkbox);
+	m_input_hbox->setSpacing(8);
 
 #if defined(_WIN32)
 	QFont font("Consolas");
@@ -194,7 +232,19 @@ void LogWindow::createUi()
 #endif
 	m_text->setFont(font);
 
-	setCentralWidget(m_text);
+	QWidget* central_widget = new QWidget(this);
+	m_input_widget = new QWidget(this);
+	m_input_widget->setVisible(Host::GetBaseBoolSettingValue("Logging", "ShowEESIOInput"));
+	m_input_widget->setLayout(m_input_hbox);
+
+	QVBoxLayout* vlayout = new QVBoxLayout(central_widget);
+	vlayout->setContentsMargins(0, 0, 0, 0);
+	vlayout->setSpacing(0);
+	vlayout->addWidget(m_text);
+	vlayout->addWidget(m_input_widget);
+
+	central_widget->setLayout(vlayout);
+	setCentralWidget(central_widget);
 }
 
 void LogWindow::onClearTriggered()
@@ -361,6 +411,31 @@ void LogWindow::appendMessage(quint32 level, quint32 color, const QString& messa
 	}
 }
 
+void LogWindow::onInputEntered()
+{
+	QString text = m_line_input->text();
+	if (text.isEmpty() && !m_newline_on_enter)
+		return;
+
+	if(m_newline_on_enter)
+		text.append('\n');
+
+	std::string str = text.toUtf8().toStdString();
+
+	if(VMManager::WriteBytesToEESIORXFIFO({reinterpret_cast<const u8*>(str.data()), str.size()}))
+	{
+		m_line_input->clear();
+
+		if(m_local_echo)
+			// appendMessage expects a newline to be at the end of the string
+			appendMessage(0, 0, m_newline_on_enter ? text : (text + '\n') );
+
+		QTextCursor cursor(m_text->textCursor());
+		cursor.movePosition(QTextCursor::End);
+		m_text->setTextCursor(cursor);
+	}
+}
+
 void LogWindow::saveSize()
 {
 	const int current_width = Host::GetBaseIntSettingValue("UI", "LogWindowWidth", DEFAULT_WIDTH);

pcsx2-qt/LogWindow.h

@@ -5,6 +5,9 @@
 
 #include "common/Console.h"
 
+#include <QtWidgets/QCheckBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLineEdit>
 #include <QtWidgets/QMainWindow>
 #include <QtWidgets/QPlainTextEdit>
 
@@ -36,6 +39,7 @@ private Q_SLOTS:
 	void onClearTriggered();
 	void onSaveTriggered();
 	void appendMessage(quint32 level, quint32 color, const QString& message);
+	void onInputEntered();
 
 private:
 	static constexpr int DEFAULT_WIDTH = 750;
@@ -45,8 +49,15 @@ private:
 	void restoreSize();
 
 	QPlainTextEdit* m_text;
+	QLineEdit* m_line_input;
 	QMenu* m_level_menu;
+	QWidget* m_input_widget;
+	QHBoxLayout* m_input_hbox;
+	QCheckBox* m_local_echo_checkbox;
+	QCheckBox* m_newline_on_enter_checkbox;
 
+	bool m_local_echo = false;
+	bool m_newline_on_enter = true;
 	bool m_attached_to_main_window = true;
 	bool m_destroying = false;
 };

pcsx2-qt/QtKeyCodes.cpp

@@ -67,6 +67,17 @@ struct KeyCodeName
 	const char* icon_name;
 };
 
+// Extended keys for left/right versions, Non conflicting with Qt::Key enum
+enum ExtendedKeys
+{
+	Key_RightShift = 0x01100022,
+	Key_LeftShift = 0x01100023,
+	Key_RightControl = 0x01100024,
+	Key_LeftControl = 0x01100025,
+	Key_RightAlt = 0x01100026,
+	Key_LeftAlt = 0x01100027,
+};
+
 static constexpr const KeyCodeName s_qt_key_names[] = {
 	{Qt::Key_Escape, "Escape", ICON_PF_ESC},
 	{Qt::Key_Tab, "Tab", ICON_PF_TAB},
@@ -92,6 +103,13 @@ static constexpr const KeyCodeName s_qt_key_names[] = {
 	{Qt::Key_Control, "Control", ICON_PF_CTRL},
 	{Qt::Key_Meta, "Meta", ICON_PF_SUPER},
 	{Qt::Key_Alt, "Alt", ICON_PF_ALT},
+	// patch for left and right versions of the keys
+	{ExtendedKeys::Key_LeftShift, "LShift", ICON_PF_SHIFT},
+	{ExtendedKeys::Key_RightShift, "RShift", ICON_PF_SHIFT},
+	{ExtendedKeys::Key_LeftControl, "LCtrl", ICON_PF_CTRL},
+	{ExtendedKeys::Key_RightControl, "RCtrl", ICON_PF_CTRL},
+	{ExtendedKeys::Key_LeftAlt, "LAlt", ICON_PF_ALT},
+	{ExtendedKeys::Key_RightAlt, "RAlt", ICON_PF_ALT},
 	{Qt::Key_CapsLock, "CapsLock", ICON_PF_CAPS},
 	{Qt::Key_NumLock, "NumLock", ICON_PF_NUMLOCK},
 	{Qt::Key_ScrollLock, "ScrollLock", ICON_PF_SCRLK},
@@ -575,6 +593,41 @@ u32 QtUtils::KeyEventToCode(const QKeyEvent* ev)
 	const u8 keycode = set_keycode ? map_text_to_keycode(text) : 0;
 	int key = ev->key();
 
+	if (key == Qt::Key_Shift || key == Qt::Key_Alt || key == Qt::Key_Control)
+	{
+#if defined(Q_OS_WIN) or defined(Q_OS_LINUX)
+		// Scan codes (Tested it)
+		// 0x2A : Left shift
+		// 0x36 : Right shift
+		// 0x1D : Left ctrl
+		// 0xE01D : Right ctrl 
+		// 0x38 : Left alt
+		// right alt can become ctrl + right alt in some keyboard layouts (windows) 
+		// but thats fine for our use case
+		switch (ev->nativeScanCode())
+		{
+			case 0x2A:
+				key = ExtendedKeys::Key_LeftShift;
+				break;
+			case 0x36:
+				key = ExtendedKeys::Key_RightShift;
+				break;
+			case 0x1D:
+				key = ExtendedKeys::Key_LeftControl;
+				break;
+			case 0xE01D:
+				key = ExtendedKeys::Key_RightControl;
+				break;
+			case 0x38:
+				key = ExtendedKeys::Key_LeftAlt;
+				break;
+			default: 
+				break;
+		}
+		
+#endif
+	}
+
 	if (keycode != 0)
 		key = keycode; // Override key if mapped
 

pcsx2-qt/Settings/GraphicsDisplaySettingsTab.ui

@@ -87,6 +87,16 @@
        </property>
       </widget>
      </item>
+	 <item row="3" column="1">
+	  <widget class="QCheckBox" name="PreRoundSprites">
+	   <property name="toolTip">
+		<string>Attempts to pre-round sprite texel coordinates to resolve rounding issues. Helpful for games such as Beyond Good and Evil, and Manhunt</string>
+	   </property>
+	   <property name="text">
+		<string>Pre-Round Sprites</string>
+	   </property>
+	  </widget>
+	 </item>
     </layout>
    </item>
    <item row="2" column="0">

pcsx2-qt/Settings/GraphicsHardwareFixesSettingsTab.ui

@@ -14,8 +14,31 @@
    <string/>
   </property>
   <layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
-   <item row="3" column="1">
-    <widget class="QComboBox" name="hwAutoFlush">
+   <item row="8" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Orientation::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="skipDrawLabel">
+     <property name="text">
+      <string>Skip Draw Range:</string>
+     </property>
+     <property name="buddy">
+      <cstring>skipDrawStart</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QComboBox" name="textureInsideRt">
      <item>
       <property name="text">
        <string>Disabled (Default)</string>
@@ -23,12 +46,12 @@
      </item>
      <item>
       <property name="text">
-       <string>Enabled (Sprites Only)</string>
+       <string>Inside Target</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>Enabled (All Primitives)</string>
+       <string>Merge Targets</string>
       </property>
      </item>
     </widget>
@@ -43,41 +66,6 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="0">
-    <widget class="QLabel" name="skipDrawLabel">
-     <property name="text">
-      <string>Skip Draw Range:</string>
-     </property>
-     <property name="buddy">
-      <cstring>skipDrawStart</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QComboBox" name="cpuCLUTRender">
-     <property name="currentText">
-      <string extracomment="0 (Disabled)">0 (Disabled)</string>
-     </property>
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <item>
-      <property name="text">
-       <string>0 (Disabled)</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>1 (Normal)</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>2 (Aggressive)</string>
-      </property>
-     </item>
-    </widget>
-   </item>
    <item row="0" column="1">
     <layout class="QHBoxLayout" name="cpuCLUTRenderLayout" stretch="0,0">
      <item>
@@ -160,8 +148,36 @@
      </item>
     </layout>
    </item>
-   <item row="4" column="1">
-    <widget class="QComboBox" name="textureInsideRt">
+   <item row="3" column="0">
+    <widget class="QLabel" name="hwAutoFlushLabel">
+     <property name="text">
+      <string>Auto Flush:</string>
+     </property>
+     <property name="buddy">
+      <cstring>hwAutoFlush</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1">
+    <layout class="QHBoxLayout" name="skipDrawLayout">
+     <item>
+      <widget class="QSpinBox" name="skipDrawStart">
+       <property name="maximum">
+        <number>10000</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="skipDrawEnd">
+       <property name="maximum">
+        <number>10000</number>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="2" column="1">
+    <widget class="QComboBox" name="gpuTargetCLUTMode">
      <item>
       <property name="text">
        <string>Disabled (Default)</string>
@@ -169,12 +185,57 @@
      </item>
      <item>
       <property name="text">
-       <string>Inside Target</string>
+       <string>Enabled (Exact Match)</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>Merge Targets</string>
+       <string>Enabled (Check Inside Target)</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="cpuCLUTRenderLabel">
+     <property name="text">
+      <string>CPU Sprite Render Size:</string>
+     </property>
+     <property name="buddy">
+      <cstring>cpuSpriteRenderBW</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="gpuTargetCLUTLabel">
+     <property name="text">
+      <string extracomment="CLUT: Color Look Up Table, often referred to as a palette in non-PS2 things.  GPU Target CLUT: GPU handling of when a game uses data from a render target as a CLUT.">GPU Target CLUT:</string>
+     </property>
+     <property name="buddy">
+      <cstring>gpuTargetCLUTMode</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="cpuCLUTRender">
+     <property name="currentText">
+      <string extracomment="0 (Disabled)">0 (Disabled)</string>
+     </property>
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <item>
+      <property name="text">
+       <string>0 (Disabled)</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>1 (Normal)</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>2 (Aggressive)</string>
       </property>
      </item>
     </widget>
@@ -189,7 +250,26 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="2">
+   <item row="3" column="1">
+    <widget class="QComboBox" name="hwAutoFlush">
+     <item>
+      <property name="text">
+       <string>Disabled (Default)</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Enabled (Sprites Only)</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>Enabled (All Primitives)</string>
+      </property>
+     </item>
+    </widget>
+   </item>
+   <item row="7" column="0" colspan="2">
     <layout class="QGridLayout" name="hwFixesLayout">
      <item row="4" column="0">
       <widget class="QCheckBox" name="estimateTextureRegion">
@@ -256,28 +336,8 @@
      </item>
     </layout>
    </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="hwAutoFlushLabel">
-     <property name="text">
-      <string>Auto Flush:</string>
-     </property>
-     <property name="buddy">
-      <cstring>hwAutoFlush</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="gpuTargetCLUTLabel">
-     <property name="text">
-      <string extracomment="CLUT: Color Look Up Table, often referred to as a palette in non-PS2 things.  GPU Target CLUT: GPU handling of when a game uses data from a render target as a CLUT.">GPU Target CLUT:</string>
-     </property>
-     <property name="buddy">
-      <cstring>gpuTargetCLUTMode</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QComboBox" name="gpuTargetCLUTMode">
+   <item row="5" column="1">
+    <widget class="QComboBox" name="limit24BitDepth">
      <item>
       <property name="text">
        <string>Disabled (Default)</string>
@@ -285,57 +345,23 @@
      </item>
      <item>
       <property name="text">
-       <string>Enabled (Exact Match)</string>
+       <string>Prioritize Upper</string>
       </property>
      </item>
      <item>
       <property name="text">
-       <string>Enabled (Check Inside Target)</string>
+       <string>Prioritize Lower</string>
       </property>
      </item>
     </widget>
    </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="cpuCLUTRenderLabel">
+   <item row="5" column="0">
+    <widget class="QLabel" name="limitDepthLabel">
      <property name="text">
-      <string>CPU Sprite Render Size:</string>
-     </property>
-     <property name="buddy">
-      <cstring>cpuSpriteRenderBW</cstring>
+      <string>Limit 24 Bit Depth</string>
      </property>
     </widget>
    </item>
-   <item row="5" column="1">
-    <layout class="QHBoxLayout" name="skipDrawLayout">
-     <item>
-      <widget class="QSpinBox" name="skipDrawStart">
-       <property name="maximum">
-        <number>10000</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="skipDrawEnd">
-       <property name="maximum">
-        <number>10000</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="7" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Orientation::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>0</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <tabstops>

pcsx2-qt/Settings/GraphicsSettingsWidget.cpp

@@ -86,12 +86,14 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* settings_dialog,
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_display.integerScaling, "EmuCore/GS", "IntegerScaling", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_display.PCRTCOffsets, "EmuCore/GS", "pcrtc_offsets", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_display.PCRTCOverscan, "EmuCore/GS", "pcrtc_overscan", false);
+	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_display.PreRoundSprites, "EmuCore/GS", "preround_sprites", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_display.PCRTCAntiBlur, "EmuCore/GS", "pcrtc_antiblur", true);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_display.disableInterlaceOffset, "EmuCore/GS", "disable_interlace_offset", false);
 	SettingWidgetBinder::BindWidgetToIntSetting(
 		sif, m_capture.screenshotSize, "EmuCore/GS", "ScreenshotSize", static_cast<int>(GSScreenshotSize::WindowResolution));
 	SettingWidgetBinder::BindWidgetToIntSetting(
 		sif, m_capture.screenshotFormat, "EmuCore/GS", "ScreenshotFormat", static_cast<int>(GSScreenshotFormat::PNG));
+
 	SettingWidgetBinder::BindWidgetToFloatSetting(sif, m_display.stretchY, "EmuCore/GS", "StretchY", 100.0f);
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_display.cropLeft, "EmuCore/GS", "CropLeft", 0);
 	SettingWidgetBinder::BindWidgetToIntSetting(sif, m_display.cropTop, "EmuCore/GS", "CropTop", 0);
@@ -147,6 +149,8 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* settings_dialog,
 		sif, m_fixes.disablePartialInvalidation, "EmuCore/GS", "UserHacks_DisablePartialInvalidation", false);
 	SettingWidgetBinder::BindWidgetToIntSetting(
 		sif, m_fixes.textureInsideRt, "EmuCore/GS", "UserHacks_TextureInsideRt", static_cast<int>(GSTextureInRtMode::Disabled));
+	SettingWidgetBinder::BindWidgetToIntSetting(
+		sif, m_fixes.limit24BitDepth, "EmuCore/GS", "UserHacks_Limit24BitDepth", static_cast<int>(GSLimit24BitDepth::Disabled));
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_fixes.readTCOnClose, "EmuCore/GS", "UserHacks_ReadTCOnClose", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_fixes.estimateTextureRegion, "EmuCore/GS", "UserHacks_EstimateTextureRegion", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_fixes.gpuPaletteConversion, "EmuCore/GS", "paltex", false);
@@ -624,6 +628,9 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* settings_dialog,
 		dialog()->registerWidgetHelp(m_fixes.textureInsideRt, tr("Texture Inside RT"), tr("Disabled"),
 			tr("Allows the texture cache to reuse as an input texture the inner portion of a previous framebuffer."));
 
+		dialog()->registerWidgetHelp(m_fixes.limit24BitDepth, tr("Limit 24 Bit Depth"), tr("Disabled"),
+			tr("Eats your cheese."));
+
 		dialog()->registerWidgetHelp(m_fixes.readTCOnClose, tr("Read Targets When Closing"), tr("Unchecked"),
 			tr("Flushes all targets in the texture cache back to local memory when shutting down. Can prevent lost visuals when saving "
 			   "state or switching graphics APIs, but can also cause graphical corruption."));

pcsx2-qt/Themes.cpp

@@ -437,26 +437,26 @@ void QtHost::SetStyleFromSettings()
 		// Alternative dark theme.
 		qApp->setStyle(QStyleFactory::create("Fusion"));
 
-		const QColor gray(150, 150, 150);
-		const QColor royalBlue(29, 41, 81);
-		const QColor darkishBlue(17, 30, 108);
+		const QColor abyssBlue(39, 58, 114);
+		const QColor darkishBlue(29, 41, 81);
 		const QColor lighterBlue(25, 32, 130);
-		const QColor highlight(36, 93, 218);
-		const QColor link(0, 202, 255);
+		const QColor blue(198, 238, 255);
+		const QColor gray(150, 150, 150);
 
 		QPalette cobaltSkyPalette;
-		cobaltSkyPalette.setColor(QPalette::Window, royalBlue);
+		cobaltSkyPalette.setColor(QPalette::Window, abyssBlue);
 		cobaltSkyPalette.setColor(QPalette::WindowText, Qt::white);
-		cobaltSkyPalette.setColor(QPalette::Base, royalBlue.lighter());
-		cobaltSkyPalette.setColor(QPalette::AlternateBase, darkishBlue);
+		cobaltSkyPalette.setColor(QPalette::Base, darkishBlue);
+		cobaltSkyPalette.setColor(QPalette::AlternateBase, darkishBlue.darker());
 		cobaltSkyPalette.setColor(QPalette::ToolTipBase, darkishBlue);
 		cobaltSkyPalette.setColor(QPalette::ToolTipText, Qt::white);
 		cobaltSkyPalette.setColor(QPalette::Text, Qt::white);
 		cobaltSkyPalette.setColor(QPalette::Button, lighterBlue);
 		cobaltSkyPalette.setColor(QPalette::ButtonText, Qt::white);
-		cobaltSkyPalette.setColor(QPalette::Link, link);
-		cobaltSkyPalette.setColor(QPalette::Highlight, highlight);
+		cobaltSkyPalette.setColor(QPalette::Link, blue);
+		cobaltSkyPalette.setColor(QPalette::Highlight, abyssBlue.lighter());
 		cobaltSkyPalette.setColor(QPalette::HighlightedText, Qt::white);
+		cobaltSkyPalette.setColor(QPalette::PlaceholderText, gray);
 
 		cobaltSkyPalette.setColor(QPalette::Active, QPalette::Button, lighterBlue);
 		cobaltSkyPalette.setColor(QPalette::Disabled, QPalette::ButtonText, gray);
@@ -475,9 +475,9 @@ void QtHost::SetStyleFromSettings()
 		// OLED screens.
 		qApp->setStyle(QStyleFactory::create("Fusion"));
 
-		const QColor black(0, 0, 0);
-		const QColor gray(25, 25, 25);
-		const QColor lighterGray(75, 75, 75);
+		const QColor black(5, 5, 5);
+		const QColor gray(22, 22, 29);
+		const QColor lighterGray(65, 79, 98);
 		const QColor blue(198, 238, 255);
 
 		QPalette AMOLEDPalette;
@@ -519,7 +519,7 @@ void QtHost::SetStyleFromSettings()
 		rubyPalette.setColor(QPalette::Window, slate);
 		rubyPalette.setColor(QPalette::WindowText, Qt::white);
 		rubyPalette.setColor(QPalette::Base, slate.lighter());
-		rubyPalette.setColor(QPalette::AlternateBase, slate.lighter());
+		rubyPalette.setColor(QPalette::AlternateBase, slate.darker());
 		rubyPalette.setColor(QPalette::ToolTipBase, slate);
 		rubyPalette.setColor(QPalette::ToolTipText, Qt::white);
 		rubyPalette.setColor(QPalette::Text, Qt::white);
@@ -553,7 +553,7 @@ void QtHost::SetStyleFromSettings()
 		sapphirePalette.setColor(QPalette::Window, slate);
 		sapphirePalette.setColor(QPalette::WindowText, Qt::white);
 		sapphirePalette.setColor(QPalette::Base, slate.lighter());
-		sapphirePalette.setColor(QPalette::AlternateBase, slate.lighter());
+		sapphirePalette.setColor(QPalette::AlternateBase, slate.darker());
 		sapphirePalette.setColor(QPalette::ToolTipBase, slate);
 		sapphirePalette.setColor(QPalette::ToolTipText, Qt::white);
 		sapphirePalette.setColor(QPalette::Text, Qt::white);
@@ -587,7 +587,7 @@ void QtHost::SetStyleFromSettings()
 		emeraldPalette.setColor(QPalette::Window, slate);
 		emeraldPalette.setColor(QPalette::WindowText, Qt::white);
 		emeraldPalette.setColor(QPalette::Base, slate.lighter());
-		emeraldPalette.setColor(QPalette::AlternateBase, slate.lighter());
+		emeraldPalette.setColor(QPalette::AlternateBase, slate.darker());
 		emeraldPalette.setColor(QPalette::ToolTipBase, slate);
 		emeraldPalette.setColor(QPalette::ToolTipText, Qt::white);
 		emeraldPalette.setColor(QPalette::Text, Qt::white);

pcsx2/Achievements.cpp

@@ -1043,21 +1043,11 @@ void Achievements::ClientLoadGameCallback(int result, const char* error_message,
 	s_has_leaderboards = has_leaderboards;
 	s_has_rich_presence = rc_client_has_rich_presence(client);
 	s_game_icon = {};
-	s_game_icon_url = {};
+	s_game_icon_url = info->badge_url;
 
 	// ensure fullscreen UI is ready for notifications
 	MTGS::RunOnGSThread(&ImGuiManager::InitializeFullscreenUI);
 
-	char url_buffer[URL_BUFFER_SIZE];
-	if (int err = rc_client_game_get_image_url(info, url_buffer, std::size(url_buffer)); err == RC_OK)
-	{
-		s_game_icon_url = url_buffer;
-	}
-	else
-	{
-		ReportRCError(err, "rc_client_game_get_image_url() failed: ");
-	}
-
 	if (const std::string_view badge_name = info->badge_name; !badge_name.empty())
 	{
 		s_game_icon = Path::Combine(s_image_directory, fmt::format("game_{}.png", badge_name));

pcsx2/Config.h

@@ -432,6 +432,13 @@ enum class GSTextureInRtMode : u8
 	MergeTargets,
 };
 
+enum class GSLimit24BitDepth : u8
+{
+	Disabled,
+	PrioritizeUpper,
+	PrioritizeLower,
+};
+
 enum class GSBilinearDirtyMode : u8
 {
 	Automatic,
@@ -757,6 +764,7 @@ struct Pcsx2Config
 					PreloadFrameWithGSData : 1,
 					Mipmap : 1,
 					HWMipmap : 1,
+					PreRoundSprites : 1,
 					ManualUserHacks : 1,
 					UserHacks_AlignSpriteX : 1,
 					UserHacks_CPUFBConversion : 1,
@@ -844,6 +852,7 @@ struct Pcsx2Config
 		u8 UserHacks_CPUCLUTRender = 0;
 		GSGPUTargetCLUTMode UserHacks_GPUTargetCLUTMode = GSGPUTargetCLUTMode::Disabled;
 		GSTextureInRtMode UserHacks_TextureInsideRt = GSTextureInRtMode::Disabled;
+		GSLimit24BitDepth UserHacks_Limit24BitDepth = GSLimit24BitDepth::Disabled;
 		GSBilinearDirtyMode UserHacks_BilinearHack = GSBilinearDirtyMode::Automatic;
 		TriFiltering TriFilter = TriFiltering::Automatic;
 		s8 OverrideTextureBarriers = -1;

pcsx2/GS/GSState.cpp

@@ -806,12 +806,12 @@ void GSState::DumpTransferList(const std::string& filename)
 			(*file) << std::endl;
 
 		// clear, EE->GS, or GS->GS
-		(*file) << LIST_ITEM << "type: " << (transfer.zero_clear ? "clear" : (transfer.ee_to_gs ? "EE_to_GS" : "GS_to_GS")) << std::endl;
+		(*file) << LIST_ITEM << "type: " << (transfer.zero_clear ? "clear" : ((transfer.transfer_type == EEGS_TransferType::EE_to_GS) ? "EE_to_GS" : "GS_to_GS")) << std::endl;
 
 		// Dump BITBLTBUF
 		(*file) << INDENT << "BITBLTBUF: " << OPEN_MAP;
 
-		const bool gs_to_gs = !transfer.ee_to_gs && !transfer.zero_clear;
+		const bool gs_to_gs = (transfer.transfer_type == EEGS_TransferType::GS_to_GS) && !transfer.zero_clear;
 
 		if (gs_to_gs)
 		{
@@ -857,7 +857,7 @@ void GSState::DumpTransferImages()
 		const GSUploadQueue& transfer = m_draw_transfers[i];
 
 		std::string filename;
-		if (transfer.ee_to_gs || transfer.zero_clear)
+		if ((transfer.transfer_type == EEGS_TransferType::EE_to_GS) || transfer.zero_clear)
 		{
 			// clear or EE->GS: only the destination info is relevant.
 			filename = GetDrawDumpPath("%05d_transfer%02d_%s_%04x_%d_%s_%d_%d_%d_%d.png",
@@ -2063,7 +2063,96 @@ void GSState::FlushPrim()
 		// Sometimes hardware doesn't get affected, likely due to the difference in how GPU's handle textures (Persona minimap).
 		if (PRIM->TME && (GSUtil::GetPrimClass(PRIM->PRIM) == GS_PRIM_CLASS::GS_SPRITE_CLASS || m_vt.m_eq.z))
 		{
-			if (!PRIM->FST) // STQ's
+			if (PRIM->FST && GSConfig.PreRoundSprites) // UV's
+			{
+				// UV's on sprites only alter the final UV, I believe the problem is we're drawing too much (drawing stops earlier than we do)
+				// But this fixes Beyond Good adn Evil water and Dark Cloud 2's UI
+				if (GSUtil::GetPrimClass(PRIM->PRIM) == GS_PRIM_CLASS::GS_SPRITE_CLASS)
+				{
+					for (u32 i = 0; i < m_index.tail; i += 2)
+					{
+						GSVertex* v1 = &m_vertex.buff[m_index.buff[i]];
+						GSVertex* v2 = &m_vertex.buff[m_index.buff[i + 1]];
+
+						GSVertex* vu1;
+						GSVertex* vu2;
+						GSVertex* vv1;
+						GSVertex* vv2;
+						if (v1->U > v2->U)
+						{
+							vu2 = v1;
+							vu1 = v2;
+						}
+						else
+						{
+							vu2 = v2;
+							vu1 = v1;
+						}
+
+						if (v1->V > v2->V)
+						{
+							vv2 = v1;
+							vv1 = v2;
+						}
+						else
+						{
+							vv2 = v2;
+							vv1 = v1;
+						}
+
+						GSVector2 pos_range(vu2->XYZ.X - vu1->XYZ.X, vv2->XYZ.Y - vv1->XYZ.Y);
+						const GSVector2 uv_range(vu2->U - vu1->U, vv2->V - vv1->V);
+						if (pos_range.x == 0)
+							pos_range.x = 1;
+						if (pos_range.y == 0)
+							pos_range.y = 1;
+						const GSVector2 grad(uv_range / pos_range);
+						bool isclamp_w = m_context->CLAMP.WMS > 0 && m_context->CLAMP.WMS < 3;
+						bool isclamp_h = m_context->CLAMP.WMT > 0 && m_context->CLAMP.WMT < 3;
+						int max_w = (m_context->CLAMP.WMS == 2) ? m_context->CLAMP.MAXU : ((1 << m_context->TEX0.TW) - 1);
+						int max_h = (m_context->CLAMP.WMT == 2) ? m_context->CLAMP.MAXV : ((1 << m_context->TEX0.TH) - 1);
+						int width = vu2->U >> 4;
+						int height = vv2->V >> 4;
+
+						if (m_context->CLAMP.WMS == 3)
+							width = (width & m_context->CLAMP.MINU) | m_context->CLAMP.MAXU;
+
+						if (m_context->CLAMP.WMT == 3)
+							height = (height & m_context->CLAMP.MINV) | m_context->CLAMP.MAXV;
+
+						if ((isclamp_w && width <= max_w && grad.x != 1.0f) || !isclamp_w)
+						{
+							if (vu2->U >= 0x1 && (!(vu2->U & 0xf) || grad.x <= 1.0f))
+							{
+								vu2->U = (vu2->U - 1);
+								/*if (!isclamp_w && ((vu2->XYZ.X - m_context->XYOFFSET.OFX) >> 4) < m_context->scissor.in.z)
+									vu2->XYZ.X -= 1;*/
+							}
+						}
+						else
+							vu2->U &= ~0xf;
+
+						// Dark Cloud 2 tries to address wider than the TBW when in CLAMP mode (maybe some weird behaviour in HW?)
+						if ((vu2->U >> 4) > (int)(m_context->TEX0.TBW * 64) && isclamp_w && (vu2->U >> 4) - 8 <= (int)(m_context->TEX0.TBW * 64))
+						{
+							vu2->U = (m_context->TEX0.TBW * 64) << 4;
+						}
+
+						if ((isclamp_h && height <= max_h && grad.y != 1.0f) || !isclamp_h)
+						{
+							if (vv2->V >= 0x1 && (!(vv2->V & 0xf) || grad.y <= 1.0f))
+							{
+								vv2->V = (vv2->V - 1);
+								/*if (!isclamp_h && ((vv2->XYZ.Y - m_context->XYOFFSET.OFY) >> 4) < m_context->scissor.in.w)
+									vv2->XYZ.Y -= 1;*/
+							}
+						}
+						else
+							vv2->V &= ~0xf;
+					}
+				}
+			}
+			else if (!PRIM->FST) // STQ's
 			{
 				const bool is_sprite = GSUtil::GetPrimClass(PRIM->PRIM) == GS_PRIM_CLASS::GS_SPRITE_CLASS;
 				// ST's have the lowest 9 bits (or greater depending on exponent difference) rounding down (from hardware tests).
@@ -2144,7 +2233,6 @@ void GSState::FlushPrim()
 		if (unused > 0)
 		{
 			memcpy(m_vertex.buff, buff, sizeof(GSVertex) * unused);
-
 			m_vertex.tail = unused;
 			m_vertex.next = next > head ? next - head : 0;
 
@@ -2365,7 +2453,7 @@ void GSState::Write(const u8* mem, int len)
 
 		s_last_transfer_draw_n = s_n;
 		// Store the transfer for preloading new RT's.
-		if ((m_draw_transfers.size() > 0 && blit.DBP == m_draw_transfers.back().blit.DBP))
+		if ((m_draw_transfers.size() > 0 && blit.DBP == m_draw_transfers.back().blit.DBP && m_draw_transfers.back().transfer_type == EEGS_TransferType::EE_to_GS))
 		{
 			// Same BP, let's update the rect.
 			GSUploadQueue transfer = m_draw_transfers.back();
@@ -2377,7 +2465,7 @@ void GSState::Write(const u8* mem, int len)
 		}
 		else
 		{
-			const GSUploadQueue new_transfer = { blit, r, s_n, false, true };
+			const GSUploadQueue new_transfer = {blit, r, s_n, false, EEGS_TransferType::EE_to_GS};
 			m_draw_transfers.push_back(new_transfer);
 		}
 
@@ -2519,21 +2607,31 @@ void GSState::Move()
 
 	InvalidateLocalMem(m_env.BITBLTBUF, GSVector4i(sx, sy, sx + w, sy + h));
 	InvalidateVideoMem(m_env.BITBLTBUF, GSVector4i(dx, dy, dx + w, dy + h));
+	const bool overlaps = m_env.BITBLTBUF.SBP == m_env.BITBLTBUF.DBP;
+	const bool intersect = overlaps && !(GSVector4i(sx, sy, sx + w, sy + h).rintersect(GSVector4i(dx, dy, dx + w, dy + h)).rempty());
 
 	int xinc = 1;
 	int yinc = 1;
 
 	if (m_env.TRXPOS.DIRX)
 	{
-		sx += w - 1;
-		dx += w - 1;
-		xinc = -1;
+		// Only allow it to reverse if the destination is behind the source.
+		if (!intersect || (sx <= dx && (sx == dx || ((!m_env.TRXPOS.DIRY && sy >= dy) || (m_env.TRXPOS.DIRY && sy < dy)))))
+		{
+			sx += w - 1;
+			dx += w - 1;
+			xinc = -1;
+		}
 	}
 	if (m_env.TRXPOS.DIRY)
 	{
-		sy += h - 1;
-		dy += h - 1;
-		yinc = -1;
+		// Only allow it to reverse if the destination is behind the source.
+		if (!intersect || (sy <= dy && (sy == dy || ((!m_env.TRXPOS.DIRX && sx >= dx) || (m_env.TRXPOS.DIRX && sx < dx)))))
+		{
+			sy += h - 1;
+			dy += h - 1;
+			yinc = -1;
+		}
 	}
 
 	const GSLocalMemory::psm_t& spsm = GSLocalMemory::m_psm[m_env.BITBLTBUF.SPSM];
@@ -2556,7 +2654,7 @@ void GSState::Move()
 
 	s_last_transfer_draw_n = s_n;
 	// Store the transfer for preloading new RT's.
-	if ((m_draw_transfers.size() > 0 && m_env.BITBLTBUF.DBP == m_draw_transfers.back().blit.DBP))
+	if ((m_draw_transfers.size() > 0 && m_env.BITBLTBUF.DBP == m_draw_transfers.back().blit.DBP && m_draw_transfers.back().transfer_type == EEGS_TransferType::GS_to_GS))
 	{
 		// Same BP, let's update the rect.
 		GSUploadQueue transfer = m_draw_transfers.back();
@@ -2568,11 +2666,11 @@ void GSState::Move()
 	}
 	else
 	{
-		const GSUploadQueue new_transfer = { m_env.BITBLTBUF, r, s_n, false, false };
+		const GSUploadQueue new_transfer = {m_env.BITBLTBUF, r, s_n, false, EEGS_TransferType::GS_to_GS};
 		m_draw_transfers.push_back(new_transfer);
 	}
 
-	auto copy = [this, sbp, dbp, sx, sy, dx, dy, w, h, yinc, xinc](const GSOffset& dpo, const GSOffset& spo, auto&& pxCopyFn)
+	auto copy = [this, sbp, dbp, sx, sy, dx, dy, w, h, yinc, xinc, intersect](const GSOffset& dpo, const GSOffset& spo, auto&& pxCopyFn)
 	{
 		int _sy = sy, _dy = dy; // Faster with local copied variables, compiler optimizations are dumb
 		if (xinc > 0)
@@ -2584,8 +2682,6 @@ void GSState::Move()
 			// Copying from itself to itself (rotating textures) used in Gitaroo Man stage 8
 			// What probably happens is because the copy is buffered, the source stays just ahead of the destination.
 			// No need to do all this if the copy source/destination don't intersect, however.
-			const bool intersect = !(GSVector4i(sx, sy, sx + w, sy + h).rintersect(GSVector4i(dx, dy, dx + w, dy + h)).rempty());
-
 			if (intersect && sbp == dbp && (((_sy < _dy) && ((ypage + page_height) > _dy)) || ((sx < dx) && ((xpage + page_width) > dx))))
 			{
 				int starty = (yinc > 0) ? 0 : h-1;
@@ -4657,13 +4753,20 @@ __forceinline void GSState::VertexKick(u32 skip)
 	u32 next = m_vertex.next;
 	u32 xy_tail = m_vertex.xy_tail;
 
+	if (GSIsHardwareRenderer() && GSLocalMemory::m_psm[m_context->ZBUF.PSM].bpp == 32)
+	{
+		if (GSConfig.UserHacks_Limit24BitDepth == GSLimit24BitDepth::PrioritizeUpper)
+			m_v.XYZ.Z = ((m_v.XYZ.Z >> 8) & ~0xFF) | (m_v.XYZ.Z & 0xFF);
+		else if (GSConfig.UserHacks_Limit24BitDepth == GSLimit24BitDepth::PrioritizeLower)
+			m_v.XYZ.Z &= 0x00FFFFFF;
+	}
+
 	// callers should write XYZUVF to m_v.m[1] in one piece to have this load store-forwarded, either by the cpu or the compiler when this function is inlined
 
 	const GSVector4i new_v0(m_v.m[0]);
 	const GSVector4i new_v1(m_v.m[1]);
 
 	GSVector4i* RESTRICT tailptr = (GSVector4i*)&m_vertex.buff[tail];
-
 	tailptr[0] = new_v0;
 	tailptr[1] = new_v1;
 

pcsx2/GS/GSState.h

@@ -211,13 +211,20 @@ protected:
 	void CorrectATEAlphaMinMax(const u32 atst, const int aref);
 
 public:
+	enum EEGS_TransferType
+	{
+		EE_to_GS,
+		GS_to_GS,
+		GS_to_EE
+	};
+
 	struct GSUploadQueue
 	{
 		GIFRegBITBLTBUF blit;
 		GSVector4i rect;
 		int draw;
 		bool zero_clear;
-		bool ee_to_gs;
+		EEGS_TransferType transfer_type;
 	};
 
 	enum NoGapsType

pcsx2/GS/Renderers/DX12/GSDevice12.cpp

@@ -750,6 +750,8 @@ bool GSDevice12::Create(GSVSyncMode vsync_mode, bool allow_present_throttle)
 
 	InitializeState();
 	InitializeSamplers();
+	// Reference stencil isn't tied to pipeline, so we can set it once and leave it.
+	SetStencilRef(1);
 	return true;
 }
 
@@ -3740,7 +3742,7 @@ void GSDevice12::SetupDATE(GSTexture* rt, GSTexture* ds, SetDATM datm, const GSV
 	IASetVertexBuffer(vertices, sizeof(vertices[0]), 4);
 	SetPrimitiveTopology(D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
 	SetPipeline(m_convert[SetDATMShader(datm)].get());
-	SetStencilRef(1);
+	// Reference stencil value set on Create()
 	BeginRenderPass(D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE_NO_ACCESS, D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_NO_ACCESS,
 		D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE_PRESERVE, D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_PRESERVE,
 		D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE_CLEAR, D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_PRESERVE,
@@ -3828,26 +3830,6 @@ GSTexture12* GSDevice12::SetupPrimitiveTrackingDATE(GSHWDrawConfig& config, Pipe
 
 void GSDevice12::RenderHW(GSHWDrawConfig& config)
 {
-	// Destination Alpha Setup
-	const bool stencil_DATE_One = config.destination_alpha == GSHWDrawConfig::DestinationAlphaMode::StencilOne;
-	const bool stencil_DATE = (config.destination_alpha == GSHWDrawConfig::DestinationAlphaMode::Stencil || stencil_DATE_One);
-
-	// TODO: Backport from vk.
-	if (stencil_DATE_One)
-	{
-		config.ps.date = 0;
-		config.alpha_second_pass.ps.date = 0;
-		if (!config.ps.IsFeedbackLoop())
-		{
-			config.require_one_barrier = false;
-			config.require_full_barrier = false;
-		}
-		if (!config.alpha_second_pass.ps.IsFeedbackLoop())
-		{
-			config.alpha_second_pass.require_one_barrier = false;
-			config.alpha_second_pass.require_full_barrier = false;
-		}
-	}
 
 	GSTexture12* colclip_rt = static_cast<GSTexture12*>(g_gs_device->GetColorClipTexture());
 	GSTexture12* draw_rt = static_cast<GSTexture12*>(config.rt);
@@ -3910,8 +3892,29 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 		}
 	}
 
-	if (stencil_DATE)
-		SetupDATE(draw_rt, config.ds, config.datm, config.drawarea);
+	// Destination Alpha Setup
+	const bool need_barrier = m_features.texture_barrier && (config.require_one_barrier || config.require_full_barrier);
+	switch (config.destination_alpha)
+	{
+		case GSHWDrawConfig::DestinationAlphaMode::Off: // No setup
+		case GSHWDrawConfig::DestinationAlphaMode::Full: // No setup
+		case GSHWDrawConfig::DestinationAlphaMode::PrimIDTracking: // Setup is done below
+			break;
+		case GSHWDrawConfig::DestinationAlphaMode::StencilOne: // setup is done below
+		{
+			// we only need to do the setup here if we don't have barriers, in which case do full DATE.
+			if (!need_barrier)
+			{
+				SetupDATE(draw_rt, config.ds, config.datm, config.drawarea);
+				config.destination_alpha = GSHWDrawConfig::DestinationAlphaMode::Stencil;
+			}
+		}
+		break;
+
+		case GSHWDrawConfig::DestinationAlphaMode::Stencil:
+			SetupDATE(draw_rt, config.ds, config.datm, config.drawarea);
+			break;
+	}
 
 	// stream buffer in first, in case we need to exec
 	SetVSConstantBuffer(config.cb_vs);
@@ -4033,6 +4036,17 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 	// For depth testing and sampling, use a read only dsv, otherwise use a write dsv
 	OMSetRenderTargets(draw_rt, draw_ds, config.scissor, config.tex && config.tex == config.ds);
 
+	// DX12 equivalent of vkCmdClearAttachments for StencilOne
+	if (config.destination_alpha == GSHWDrawConfig::DestinationAlphaMode::StencilOne)
+	{
+		EndRenderPass();
+		// Make sure the DSV is in writeable state
+		draw_ds->TransitionToState(D3D12_RESOURCE_STATE_DEPTH_WRITE);
+
+		D3D12_RECT rect = {config.drawarea.left, config.drawarea.top, config.drawarea.left + config.drawarea.width(), config.drawarea.top + config.drawarea.height()};
+		GetCommandList()->ClearDepthStencilView(draw_ds->GetWriteDescriptor(), D3D12_CLEAR_FLAG_STENCIL, 0.0f, 1, 1, &rect);
+	}
+
 	// Begin render pass if new target or out of the area.
 	if (!m_in_render_pass)
 	{
@@ -4042,14 +4056,18 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 			// Denormalize clear color for hw colclip.
 			clear_color *= GSVector4::cxpr(255.0f / 65535.0f, 255.0f / 65535.0f, 255.0f / 65535.0f, 1.0f);
 		}
+
+		const bool stencil_DATE = config.destination_alpha == GSHWDrawConfig::DestinationAlphaMode::Stencil ||
+		                          config.destination_alpha == GSHWDrawConfig::DestinationAlphaMode::StencilOne;
+
 		BeginRenderPass(GetLoadOpForTexture(draw_rt),
 			draw_rt ? D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_PRESERVE : D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_NO_ACCESS,
 			GetLoadOpForTexture(draw_ds),
 			draw_ds ? D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_PRESERVE : D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_NO_ACCESS,
 			stencil_DATE ? D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE_PRESERVE :
 						   D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE_NO_ACCESS,
-			stencil_DATE ? (feedback ? D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_PRESERVE :
-									   D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_DISCARD) :
+			stencil_DATE ? (need_barrier ? D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_PRESERVE :
+										   D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_DISCARD) :
 						   D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_NO_ACCESS,
 			clear_color, draw_ds ? draw_ds->GetClearDepth() : 0.0f, 1);
 	}

pcsx2/GameDatabase.cpp

@@ -377,6 +377,7 @@ static const char* s_gs_hw_fix_names[] = {
 	"estimateTextureRegion",
 	"PCRTCOffsets",
 	"PCRTCOverscan",
+	"preRoundSprites",
 	"trilinearFiltering",
 	"skipDrawStart",
 	"skipDrawEnd",
@@ -423,6 +424,7 @@ bool GameDatabaseSchema::isUserHackHWFix(GSHWFixId id)
 		case GSHWFixId::Deinterlace:
 		case GSHWFixId::Mipmap:
 		case GSHWFixId::TexturePreloading:
+		case GSHWFixId::PreRoundSprites:
 		case GSHWFixId::TrilinearFiltering:
 		case GSHWFixId::MinimumBlendingLevel:
 		case GSHWFixId::MaximumBlendingLevel:
@@ -779,6 +781,10 @@ void GameDatabaseSchema::GameEntry::applyGSHardwareFixes(Pcsx2Config::GSOptions&
 				config.PCRTCOverscan = (value > 0);
 				break;
 
+			case GSHWFixId::PreRoundSprites:
+				config.PreRoundSprites = (value > 0);
+				break;
+
 			case GSHWFixId::Mipmap:
 				config.HWMipmap = (value > 0);
 				break;

pcsx2/GameDatabase.h

@@ -60,6 +60,7 @@ namespace GameDatabaseSchema
 		EstimateTextureRegion,
 		PCRTCOffsets,
 		PCRTCOverscan,
+		PreRoundSprites,
 
 		// integer settings
 		TrilinearFiltering,

pcsx2/Hw.cpp

@@ -11,15 +11,27 @@
 
 #include "fmt/format.h"
 
+#include <deque>
+
 using namespace R5900;
 
 const int rdram_devices = 2;	// put 8 for TOOL and 2 for PS2 and PSX
 int rdram_sdevid = 0;
 
+std::deque<u8> ee_sio_rx_fifo;
+std::deque<u8> ee_sio_tx_fifo;
+
 void hwReset()
 {
 	std::memset(eeHw, 0, sizeof(eeHw));
 
+	{
+		std::deque<u8> empty_rx;
+		std::swap(ee_sio_rx_fifo, empty_rx);
+		std::deque<u8> empty_tx;
+		std::swap(ee_sio_tx_fifo, empty_tx);
+	}
+
 	psHu32(SBUS_F260) = 0x1D000060;
 
 	// i guess this is kinda a version, it's used by some bioses

pcsx2/Hw.h

@@ -1,6 +1,8 @@
 // SPDX-FileCopyrightText: 2002-2025 PCSX2 Dev Team
 // SPDX-License-Identifier: GPL-3.0+
 
+#include <deque>
+
 #pragma once
 
 namespace EEMemoryMap
@@ -355,3 +357,6 @@ extern void hwReset();
 
 extern const int rdram_devices;
 extern int rdram_sdevid;
+
+extern std::deque<u8> ee_sio_rx_fifo;
+extern std::deque<u8> ee_sio_tx_fifo;

pcsx2/HwRead.cpp

@@ -125,7 +125,23 @@ mem32_t _hwRead32(u32 mem)
 			switch( mem )
 			{
 				case SIO_ISR:
+					
+					// Not (yet) hardware tested
+					// The PS2SDK behaviour is as follows:
 
+					// TX: Don't write to TX FIFO until until bit 15 is 0
+
+					// RX: RX FIFO has data when bits 8-11 are not 0 (maybe a byte count?)
+					// RX: When reading from the RX FIFO, set bits 0-2 to 1 (why??)
+					
+					// For TX, we don't do any LLE buffering, so we can keep bit 15 to 0
+					// For RX, just hack it so when the ee_rx_fifo.size() != 0, ISR = 0xf00
+
+					if(!ee_sio_rx_fifo.empty())
+						return 0xf00;
+
+					return 0x0;
+					break;
 				case 0x1000f410:
 				case MCH_RICM:
 					return 0;
@@ -211,6 +227,16 @@ mem32_t hwRead32_page_0F_INTC_HACK(u32 mem)
 template< uint page >
 mem8_t _hwRead8(u32 mem)
 {
+	if(mem == SIO_RXFIFO)
+	{
+		if(ee_sio_rx_fifo.empty())
+			return 0; // needs hardware test, what does it return with the FIFO is empty
+		
+		const char c = ee_sio_rx_fifo.front();
+		ee_sio_rx_fifo.pop_front();
+		return c;
+	}
+
 	u32 ret32 = _hwRead32<page, false>(mem & ~0x03);
 	return ((u8*)&ret32)[mem & 0x03];
 }

pcsx2/HwWrite.cpp

@@ -285,26 +285,35 @@ void _hwWrite8(u32 mem, u8 value)
 #endif
 	if (mem == SIO_TXFIFO)
 	{
-		static bool included_newline = false;
-		static char sio_buffer[1024];
-		static int sio_count;
-
-		if (value == '\r')
+		static bool last_char_was_cr = false;
+		
+		// skip the \n in \r\n
+		if(last_char_was_cr && (value == '\n'))
 		{
-			included_newline = true;
-			sio_buffer[sio_count++] = '\n';
+			last_char_was_cr = false;
+			return;
 		}
-		else if (!included_newline || (value != '\n'))
+		
+		last_char_was_cr = value == '\r';
+		bool should_flush_cause_newline = false;
+		if (last_char_was_cr)
 		{
-			included_newline = false;
-			sio_buffer[sio_count++] = value;
+			should_flush_cause_newline = true;
+			ee_sio_tx_fifo.push_back('\n');
+		}
+		else
+		{
+			should_flush_cause_newline = value == '\n';
+			ee_sio_tx_fifo.push_back(value);
 		}
 
-		if ((sio_count == std::size(sio_buffer)-1) || (sio_count != 0 && sio_buffer[sio_count-1] == '\n'))
+		// Check if the only thing in the buffer
+		if (ee_sio_tx_fifo.size() == 1024 || should_flush_cause_newline)
 		{
-			sio_buffer[sio_count] = 0;
-			eeConLog( ShiftJIS_ConvertString(sio_buffer) );
-			sio_count = 0;
+			std::string output_string(ee_sio_tx_fifo.begin(), ee_sio_tx_fifo.end());
+
+			eeConLog(ShiftJIS_ConvertString(output_string.c_str()));
+			ee_sio_tx_fifo.clear();
 		}
 		return;
 	}

pcsx2/ImGui/ImGuiFullscreen.cpp

@@ -708,16 +708,16 @@ void ImGuiFullscreen::EndLayout()
 	const float notification_margin = LayoutScale(10.0f);
 	const float spacing = LayoutScale(10.0f);
 	const float notification_vertical_pos = GetNotificationVerticalPosition();
-	
+
 	// Get the horizonal position based on alignment
 	float horizontal_pos;
 	if (s_notification_horizontal_position <= 0.0f)
 		horizontal_pos = notification_margin; // Left
-	else if (s_notification_horizontal_position >= 1.0f) 
+	else if (s_notification_horizontal_position >= 1.0f)
 		horizontal_pos = ImGui::GetIO().DisplaySize.x - notification_margin; // Right
 	else
 		horizontal_pos = ImGui::GetIO().DisplaySize.x * s_notification_horizontal_position; // Center
-	
+
 	ImVec2 position(horizontal_pos, notification_vertical_pos * ImGui::GetIO().DisplaySize.y +
 											 ((notification_vertical_pos >= 0.5f) ? -notification_margin : notification_margin));
 	DrawProgressDialogs(position, spacing);
@@ -2574,11 +2574,11 @@ void ImGuiFullscreen::DrawInputDialog()
 		ImGuiInputTextFlags flags = ImGuiInputTextFlags_None;
 		if (s_input_dialog_filter_type != InputFilterType::None)
 			flags |= ImGuiInputTextFlags_CallbackCharFilter;
-		
+
 		if (s_focus_reset_queued != FocusResetType::None)
 			ImGui::SetKeyboardFocusHere();
-		
-		ImGui::InputText("##input", &s_input_dialog_text, flags, 
+
+		ImGui::InputText("##input", &s_input_dialog_text, flags,
 			(s_input_dialog_filter_type != InputFilterType::None) ? input_callback : nullptr,
 			(s_input_dialog_filter_type != InputFilterType::None) ? static_cast<void*>(&s_input_dialog_filter_type) : nullptr);
 
@@ -3056,7 +3056,7 @@ void ImGuiFullscreen::DrawNotifications(ImVec2& position, float spacing)
 			final_x = position.x - box_width;
 		else if (s_notification_horizontal_position > 0.0f && s_notification_horizontal_position < 1.0f)
 			final_x = position.x - (box_width * 0.5f);
-		
+
 		const ImVec2 box_min(final_x, actual_y);
 		const ImVec2 box_max(box_min.x + box_width, box_min.y + box_height);
 		const u32 background_color = (toast_background_color & ~IM_COL32_A_MASK) | (opacity << IM_COL32_A_SHIFT);
@@ -3209,14 +3209,14 @@ void ImGuiFullscreen::SetTheme(std::string_view theme)
 	}
 	else if (theme == "AMOLED")
 	{
-		UIBackgroundColor = HEX_TO_IMVEC4(0x000000, 0xff);
+		UIBackgroundColor = HEX_TO_IMVEC4(0x0A0A0A, 0xff);
 		UIBackgroundTextColor = HEX_TO_IMVEC4(0xffffff, 0xff);
 		UIBackgroundLineColor = HEX_TO_IMVEC4(0xf0f0f0, 0xff);
 		UIBackgroundHighlightColor = HEX_TO_IMVEC4(0x0c0c0c, 0xff);
 		UIPopupBackgroundColor = HEX_TO_IMVEC4(0x212121, 0xf2);
 		UIPrimaryColor = HEX_TO_IMVEC4(0x0a0a0a, 0xff);
 		UIPrimaryLightColor = HEX_TO_IMVEC4(0xb5b5b5, 0xff);
-		UIPrimaryDarkColor = HEX_TO_IMVEC4(0x000000, 0xff);
+		UIPrimaryDarkColor = HEX_TO_IMVEC4(0x0A0A0A, 0xff);
 		UIPrimaryTextColor = HEX_TO_IMVEC4(0xffffff, 0xff);
 		UIDisabledColor = HEX_TO_IMVEC4(0x8d8d8d, 0xff);
 		UITextHighlightColor = HEX_TO_IMVEC4(0x676767, 0xff);

pcsx2/ImGui/ImGuiOverlays.cpp

@@ -619,6 +619,8 @@ __ri void ImGuiManager::DrawSettingsOverlay(float scale, float margin, float spa
 			APPEND("SD={}/{} ", GSConfig.SkipDrawStart, GSConfig.SkipDrawEnd);
 		if (GSConfig.UserHacks_TextureInsideRt != GSTextureInRtMode::Disabled)
 			APPEND("TexRT={} ", static_cast<unsigned>(GSConfig.UserHacks_TextureInsideRt));
+		if (GSConfig.UserHacks_Limit24BitDepth != GSLimit24BitDepth::Disabled)
+			APPEND("TDR={} ", static_cast<unsigned>(GSConfig.UserHacks_Limit24BitDepth));
 		if (GSConfig.UserHacks_BilinearHack != GSBilinearDirtyMode::Automatic)
 			APPEND("BLU={} ", static_cast<unsigned>(GSConfig.UserHacks_BilinearHack));
 		if (GSConfig.UserHacks_ForceEvenSpritePosition)

pcsx2/Pcsx2Config.cpp

@@ -751,10 +751,12 @@ Pcsx2Config::GSOptions::GSOptions()
 	PreloadFrameWithGSData = false;
 	Mipmap = true;
 	HWMipmap = true;
+	PreRoundSprites = false;
 
 	ManualUserHacks = false;
 	UserHacks_AlignSpriteX = false;
 	UserHacks_AutoFlush = GSHWAutoFlushLevel::Disabled;
+	UserHacks_Limit24BitDepth = GSLimit24BitDepth::Disabled;
 	UserHacks_CPUFBConversion = false;
 	UserHacks_ReadTCOnClose = false;
 	UserHacks_DisableDepthSupport = false;
@@ -847,6 +849,7 @@ bool Pcsx2Config::GSOptions::OptionsAreEqual(const GSOptions& right) const
 		OpEqu(UserHacks_CPUCLUTRender) &&
 		OpEqu(UserHacks_GPUTargetCLUTMode) &&
 		OpEqu(UserHacks_TextureInsideRt) &&
+		OpEqu(UserHacks_Limit24BitDepth) &&
 		OpEqu(UserHacks_BilinearHack) &&
 		OpEqu(OverrideTextureBarriers) &&
 
@@ -962,7 +965,7 @@ void Pcsx2Config::GSOptions::LoadSave(SettingsWrapper& wrap)
 	SettingsWrapBitBool(OsdShowVideoCapture);
 	SettingsWrapBitBool(OsdShowInputRec);
 	SettingsWrapBitBool(OsdShowTextureReplacements);
-
+	SettingsWrapBitBoolEx(PreRoundSprites, "preround_sprites");
 	SettingsWrapBitBool(HWSpinGPUForReadbacks);
 	SettingsWrapBitBool(HWSpinCPUForReadbacks);
 	SettingsWrapBitBoolEx(GPUPaletteConversion, "paltex");
@@ -983,6 +986,7 @@ void Pcsx2Config::GSOptions::LoadSave(SettingsWrapper& wrap)
 	SettingsWrapIntEnumEx(UserHacks_BilinearHack, "UserHacks_BilinearHack");
 	SettingsWrapBitBoolEx(UserHacks_NativePaletteDraw, "UserHacks_NativePaletteDraw");
 	SettingsWrapIntEnumEx(UserHacks_TextureInsideRt, "UserHacks_TextureInsideRt");
+	SettingsWrapIntEnumEx(UserHacks_Limit24BitDepth, "UserHacks_Limit24BitDepth");
 	SettingsWrapBitBoolEx(UserHacks_EstimateTextureRegion, "UserHacks_EstimateTextureRegion");
 	SettingsWrapBitBoolEx(FXAA, "fxaa");
 	SettingsWrapBitBool(ShadeBoost);
@@ -1111,6 +1115,7 @@ void Pcsx2Config::GSOptions::MaskUserHacks()
 	UserHacks_CPUFBConversion = false;
 	UserHacks_ReadTCOnClose = false;
 	UserHacks_TextureInsideRt = GSTextureInRtMode::Disabled;
+	UserHacks_Limit24BitDepth = GSLimit24BitDepth::Disabled;
 	UserHacks_EstimateTextureRegion = false;
 	UserHacks_TCOffsetX = 0;
 	UserHacks_TCOffsetY = 0;

pcsx2/VMManager.cpp

@@ -526,6 +526,7 @@ void VMManager::SetDefaultLoggingSettings(SettingsInterface& si)
 	si.SetBoolValue("Logging", "EnableSystemConsole", false);
 	si.SetBoolValue("Logging", "EnableFileLogging", true);
 	si.SetBoolValue("Logging", "EnableTimestamps", true);
+	si.SetBoolValue("Logging", "EnableEESIOInput", false);
 	si.SetBoolValue("Logging", "EnableVerbose", false);
 	si.SetBoolValue("Logging", "EnableEEConsole", false);
 	si.SetBoolValue("Logging", "EnableIOPConsole", false);
@@ -3725,15 +3726,16 @@ void VMManager::UpdateDiscordPresence(bool update_session_time)
 
 	auto lock = Achievements::GetLock();
 
-	if (Achievements::HasRichPresence())
+	if (Achievements::HasActiveGame() && Achievements::HasAchievementsOrLeaderboards())
 	{
-		rp.state = (state_string = StringUtil::Ellipsise(Achievements::GetRichPresenceString(), 128)).c_str();
-
 		if (const std::string& icon_url = Achievements::GetGameIconURL(); !icon_url.empty())
 		{
 			rp.largeImageKey = icon_url.c_str();
 			rp.largeImageText = s_title.c_str();
 		}
+
+		if (Achievements::HasRichPresence())
+			rp.state = (state_string = StringUtil::Ellipsise(Achievements::GetRichPresenceString(), 128)).c_str();
 	}
 
 	Discord_UpdatePresence(&rp);
@@ -3747,3 +3749,15 @@ void VMManager::PollDiscordPresence()
 
 	Discord_RunCallbacks();
 }
+
+bool VMManager::WriteBytesToEESIORXFIFO(const std::span<const u8> data)
+{
+	if(ee_sio_rx_fifo.size() + data.size() > 1024)
+	{
+		Console.Warning("EE RX FIFO is full, not appending more bytes.");
+		return false;
+	}
+
+	ee_sio_rx_fifo.insert(ee_sio_rx_fifo.end(), data.begin(), data.end());
+	return true;
+}

pcsx2/VMManager.h

@@ -6,6 +6,7 @@
 #include <functional>
 #include <mutex>
 #include <optional>
+#include <span>
 #include <string>
 #include <string_view>
 #include <vector>
@@ -264,6 +265,9 @@ namespace VMManager
 	/// Called when the rich presence string, provided by RetroAchievements, changes.
 	void UpdateDiscordPresence(bool update_session_time);
 
+	/// Append bytes to the EE SIO RX FIFO. If it returns false, the FIFO is full and data is not inserted.
+	bool WriteBytesToEESIORXFIFO(const std::span<const u8> data);
+
 	/// Internal callbacks, implemented in the emu core.
 	namespace Internal
 	{

pcsx2/x86/microVU.h

@@ -233,7 +233,13 @@ public:
 			const u64 quick64 = pState->quick64[0];
 			for (const microBlockLinkRef& ref : quickLookup)
 			{
-				if (ref.quick != quick64) continue;
+				// if we're using the flag hack, ignore the mac flags going in to the new block too if an exact match wasn't requested.
+				if (mVUsFlagHack)
+				{
+					if ((ref.quick & ~0x0C04) != (quick64 & ~0x0C04)) continue;
+				}
+				else if (ref.quick != quick64) continue;
+
 				if (doConstProp && (ref.pBlock->pState.vi15 != pState->vi15))  continue;
 				if (doConstProp && (ref.pBlock->pState.vi15v != pState->vi15v)) continue;
 				return ref.pBlock;