GS: Move new Draw Buffering to a UI option

Author: refractionpcsx2

pcsx2-qt/Settings/GraphicsHardwareFixesSettingsTab.ui

@@ -270,7 +270,14 @@
     </widget>
    </item>
    <item row="7" column="0" colspan="2">
-    <layout class="QGridLayout" name="hwFixesLayout">
+   <layout class="QGridLayout" name="hwFixesLayout">
+     <item row="4" column="1">
+      <widget class="QCheckBox" name="drawBuffering">
+       <property name="text">
+        <string>Draw Buffering</string>
+       </property>
+      </widget>
+     </item>
      <item row="4" column="0">
       <widget class="QCheckBox" name="estimateTextureRegion">
        <property name="text">

pcsx2-qt/Settings/GraphicsSettingsWidget.cpp

@@ -152,6 +152,7 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* settings_dialog,
 		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.drawBuffering, "EmuCore/GS", "UserHacks_DrawBuffering", false);
 	SettingWidgetBinder::BindWidgetToBoolSetting(sif, m_fixes.gpuPaletteConversion, "EmuCore/GS", "paltex", false);
 	connect(m_fixes.cpuSpriteRenderBW, &QComboBox::currentIndexChanged, this,
 		&GraphicsSettingsWidget::onCPUSpriteRenderBWChanged);
@@ -610,6 +611,9 @@ GraphicsSettingsWidget::GraphicsSettingsWidget(SettingsWindow* settings_dialog,
 
 		dialog()->registerWidgetHelp(m_fixes.estimateTextureRegion, tr("Estimate Texture Region"), tr("Unchecked"),
 			tr("Attempts to reduce the texture size when games do not set it themselves (e.g. Snowblind games)."));
+
+		dialog()->registerWidgetHelp(m_fixes.drawBuffering, tr("Draw Buffering"), tr("Unchecked"),
+			tr("Attempts to reduce draw calls in games which do heavy context switching for blending purposes."));
 	}
 
 	// Upscaling Fixes tab

pcsx2/Config.h

@@ -804,6 +804,7 @@ struct Pcsx2Config
 					UserHacks_ForceEvenSpritePosition : 1,
 					UserHacks_NativePaletteDraw : 1,
 					UserHacks_EstimateTextureRegion : 1,
+					UserHacks_DrawBuffering : 1,
 					FXAA : 1,
 					ShadeBoost : 1,
 					DumpGSData : 1,

pcsx2/Docs/GameIndex.md

@@ -174,6 +174,7 @@ The clamp modes are also numerically based.
 * cpuSpriteRenderBW           [Value between `0` to `10`]   {Disabled, 1 (64), 2 (128), 3 (192), 4 (256), 5 (320), 6 (384), 7 (448), 8 (512), 9 (576), 10 (640)} Default: Off (`0`)
 * cpuSpriteRenderLevel        [`0` or `1` or `2`]    {Sprites only, Sprites/Triangles, Blended Sprites/Triangles}  Default: Off unless cpuSpriteRenderBW has value other than Off then it is 'Sprites only' (`0`)
 * estimateTextureRegion       [`0` or `1`]          {Off, On}                               Default: Off (`0`)
+* drawBuffering			      [`0` or `1`]          {Off, On}                               Default: Off (`0`)
 * getSkipCount                {`GSC` with suffix }  {None unless specific game GSC}         Default: Disabled (`0`) unless valid variable name (ex. GSC_PolyphonyDigitalGames, GSC_UrbanReign, ...)
 * gpuPaletteConversion        [`0` or `1`]          {Off, On}                               Default: Off (`0`)
 * gpuTargetCLUT               [`0` or `1` or `2`]   {Disabled, Enabled (Exact Match), Enabled (Check Inside Target)}                     Default: Disabled (`0`)

pcsx2/Docs/gamedb-schema.json

@@ -203,6 +203,11 @@
               "type": "integer",
               "minimum": 0,
               "maximum": 1
+            },
+			"drawBuffering": {
+              "type": "integer",
+              "minimum": 0,
+              "maximum": 1
             },
             "PCRTCOffsets": {
               "type": "integer",

pcsx2/GS/GSState.cpp

@@ -512,6 +512,9 @@ void GSState::PushBuffer()
 
 bool GSState::CanBufferNewDraw()
 {
+	if (!GSConfig.UserHacks_DrawBuffering)
+		return false;
+
 	GSDrawingContext& cur_context = m_env.CTXT[m_env.PRIM.CTXT];
 	GSDrawingContext& base_context = m_env_buffers[0].m_env.CTXT[m_env_buffers[0].m_env.PRIM.CTXT];
 
@@ -5712,6 +5715,9 @@ __forceinline void GSState::HandleAutoFlush()
 
 bool GSState::CheckOverlapVerts(u32 n)
 {
+	if (!GSConfig.UserHacks_DrawBuffering)
+		return false;
+
 	if (m_recent_buffer_switch && ((m_vertex->tail + 1) - m_vertex->head) == n)
 	{
 		m_recent_buffer_switch = false;

pcsx2/GameDatabase.cpp

@@ -375,6 +375,7 @@ static const char* s_gs_hw_fix_names[] = {
 	"bilinearUpscale",
 	"nativePaletteDraw",
 	"estimateTextureRegion",
+	"drawBuffering",
 	"PCRTCOffsets",
 	"PCRTCOverscan",
 	"trilinearFiltering",
@@ -617,6 +618,9 @@ bool GameDatabaseSchema::GameEntry::configMatchesHWFix(const Pcsx2Config::GSOpti
 		case GSHWFixId::EstimateTextureRegion:
 			return (static_cast<int>(config.UserHacks_EstimateTextureRegion) == value);
 
+		case GSHWFixId::DrawBuffering:
+			return (static_cast<int>(config.UserHacks_DrawBuffering) == value);
+
 		case GSHWFixId::PCRTCOffsets:
 			return (static_cast<int>(config.PCRTCOffsets) == value);
 
@@ -783,6 +787,10 @@ void GameDatabaseSchema::GameEntry::applyGSHardwareFixes(Pcsx2Config::GSOptions&
 				config.UserHacks_EstimateTextureRegion = (value > 0);
 				break;
 
+			case GSHWFixId::DrawBuffering:
+				config.UserHacks_DrawBuffering = (value > 0);
+				break;
+
 			case GSHWFixId::PCRTCOffsets:
 				config.PCRTCOffsets = (value > 0);
 				break;

pcsx2/GameDatabase.h

@@ -60,6 +60,7 @@ namespace GameDatabaseSchema
 		BilinearUpscale,
 		NativePaletteDraw,
 		EstimateTextureRegion,
+		DrawBuffering,
 		PCRTCOffsets,
 		PCRTCOverscan,
 

pcsx2/ImGui/ImGuiOverlays.cpp

@@ -893,6 +893,8 @@ __ri void ImGuiManager::DrawSettingsOverlay(float scale, float margin, float spa
 			APPEND("PLFD ");
 		if (GSConfig.UserHacks_EstimateTextureRegion)
 			APPEND("ETR ");
+		if (GSConfig.UserHacks_DrawBuffering)
+			APPEND("DRWB");
 		if (GSConfig.HWSpinGPUForReadbacks)
 			APPEND("RBSG ");
 		if (GSConfig.HWSpinCPUForReadbacks)

pcsx2/Pcsx2Config.cpp

@@ -996,6 +996,7 @@ void Pcsx2Config::GSOptions::LoadSave(SettingsWrapper& wrap)
 	SettingsWrapIntEnumEx(UserHacks_TextureInsideRt, "UserHacks_TextureInsideRt");
 	SettingsWrapIntEnumEx(UserHacks_Limit24BitDepth, "UserHacks_Limit24BitDepth");
 	SettingsWrapBitBoolEx(UserHacks_EstimateTextureRegion, "UserHacks_EstimateTextureRegion");
+	SettingsWrapBitBoolEx(UserHacks_DrawBuffering, "UserHacks_DrawBuffering");
 	SettingsWrapBitBoolEx(FXAA, "fxaa");
 	SettingsWrapBitBool(ShadeBoost);
 	SettingsWrapBitBoolEx(DumpGSData, "DumpGSData");
@@ -1130,6 +1131,7 @@ void Pcsx2Config::GSOptions::MaskUserHacks()
 	UserHacks_TextureInsideRt = GSTextureInRtMode::Disabled;
 	UserHacks_Limit24BitDepth = GSLimit24BitDepth::Disabled;
 	UserHacks_EstimateTextureRegion = false;
+	UserHacks_DrawBuffering = false;
 	UserHacks_TCOffsetX = 0;
 	UserHacks_TCOffsetY = 0;
 	UserHacks_CPUSpriteRenderBW = 0;