GS/TC: Update alpha channel of 24bit target is alpha is dirty

GS/TC: Disallow badly misaligned GPU CLUT textures
GS/TC: Detect alpha channel source width mismatches
2026-08-20 21:03:08 +02:00 · 2026-07-28 20:19:18 +01:00 · 2026-07-28 20:18:19 +01:00 · 2026-07-28 20:17:35 +01:00 · 2026-07-28 20:13:09 +01:00
72 changed files with 207225 additions and 297825 deletions
@@ -185,7 +185,6 @@ PAPX-90020:
    estimateTextureRegion: 1 # Improves performance and reduces hash cache size.
    halfPixelOffset: 2 # Aligns post effects.
    nativeScaling: 1 # Fixes post effects.
-    textureInsideRT: 1 # Fixes post shuffles.
 PAPX-90201:
  name: "ファンタビジョン [体験版]"
  name-sort: "ふぁんたびじょん [たいけんばん]"
@@ -9112,7 +9111,6 @@ SCPS-15064:
    estimateTextureRegion: 1 # Improves performance and reduces hash cache size.
    halfPixelOffset: 2 # Aligns post effects.
    nativeScaling: 1 # Fixes post effects.
-    textureInsideRT: 1 # Fixes post shuffles.
  patches:
    A5768F53:
      content: |-
@@ -25662,7 +25660,6 @@ SLES-54138:
    preloadFrameData: 1 # Fixes menu graphics.
    autoFlush: 1 # Fixes motion blur.
    minimumBlendingLevel: 2 # Improves post effects.
-    limit24BitDepth: 2 # Fixes icon brightness.
 SLES-54139:
  name: "Earache - Extreme Metal Racing"
  region: "PAL-E"
@@ -26319,7 +26316,6 @@ SLES-54335:
    preloadFrameData: 1 # Fixes menu graphics.
    autoFlush: 1 # Fixes motion blur.
    minimumBlendingLevel: 2 # Improves post effects.
-    limit24BitDepth: 2 # Fixes icon brightness.
 SLES-54336:
  name: "Lumines Plus"
  region: "PAL-M5"
@@ -32431,10 +32427,6 @@ SLKA-25255:
  name-sort: "Mobile Suit Gundam Seed - Kkeunnaji Anneun Naeillo"
  name-en: "Mobile Suit Gundam Seed - Never Ending Tomorrow"
  region: "NTSC-K"
-SLKA-25256:
-  name: "UEFA 챔피언스 리그 2006-2007"
-  name-en: "UEFA Champions League 2006-2007"
-  region: "NTSC-K"
 SLKA-25257:
  name: "풍운　막말전" # Undumped on ReDump as of 2025-08-28
  name-en: "Fu-un Bakumatsu-den"
@@ -32664,7 +32656,7 @@ SLKA-25299:
 SLKA-25300:
  name: "디지털 데빌 사가: 아바탈 튜너 [Special Package]"
  name-en: "Digital Devil Saga - Avatar Tuner [Special Package]"
-  region: "NTSC-K"
+  region: "NTSC-J-K"
  compat: 5
  gameFixes:
    - EETimingHack
@@ -64197,9 +64189,6 @@ SLPS-73270:
  name-sort: "すーぱーろぼっとたいせんZ [PlayStation2 the Best]"
  name-en: "Super Robot Taisen Z [PlayStation2 the Best]"
  region: "NTSC-J"
-  memcardFilters:
-    - "SLPS-73270"
-    - "SLPS-25887"
 SLPS-73401:
  name: "はじめの一歩 VICTORIOUS BOXERS ～CHAMPIONSHIP VERSION～ [PlayStation2 the Best]"
  name-sort: "はじめのいっぽ VICTORIOUS BOXERS CHAMPIONSHIP VERSION [PlayStation2 the Best]"
@@ -71847,7 +71836,6 @@ SLUS-21344:
    preloadFrameData: 1 # Fixes menu graphics.
    autoFlush: 1 # Fixes motion blur.
    minimumBlendingLevel: 2 # Improves post effects.
-    limit24BitDepth: 2 # Fixes icon brightness.
 SLUS-21345:
  name: "Grandia III [Disc 2 of 2]"
  region: "NTSC-U"
@@ -75406,7 +75394,6 @@ SLUS-28061:
    preloadFrameData: 1 # Fixes menu graphics.
    autoFlush: 1 # Fixes motion blur.
    minimumBlendingLevel: 2 # Improves post effects.
-    limit24BitDepth: 2 # Fixes icon brightness.
 SLUS-28062:
  name: "Dance Factory [Trade Demo]"
  region: "NTSC-U"
@@ -76193,7 +76180,6 @@ SLUS-29188:
    preloadFrameData: 1 # Fixes menu graphics.
    autoFlush: 1 # Fixes motion blur.
    minimumBlendingLevel: 2 # Improves post effects.
-    limit24BitDepth: 2 # Fixes icon brightness.
 SLUS-29189:
  name: "FIFA World Cup - Germany 2006 [Demo]"
  region: "NTSC-U"
@@ -79,10 +79,10 @@
 03000000c82d00001230000000000000,8BitDo Ultimate,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b2,paddle2:b5,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00001330000000000000,8BitDo Ultimate,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b23,paddle2:b19,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00001260000000000000,8BitDo Ultimate 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b17,paddle2:b16,paddle3:b2,paddle4:b5,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-03000000c82d00000a31000000000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00001b30000000000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00001c30000000000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b2,paddle2:b5,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00001d30000000000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000c82d00000a31000000000000,8BitDo Ultimate 2C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b5,paddle2:b2,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00001530000000000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00001630000000000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000c82d00001730000000000000,8BitDo Ultimate C,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
@@ -244,7 +244,7 @@
 03000000ac0500001a06000000000000,GameSir T3 2.02,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
 03000000373500000410000000000000,GameSir T4 Kaleid,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
 03000000373500009410000000000000,GameSir Tegenaria Lite,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
-03000000373500001611000000000000,GameSir X5 Lite,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
+03000000373500001611000000000000,GameSir X5 Lite,a:b0,b:b1,x:b3,y:b4,back:b10,guide:b12,start:b11,leftstick:b13,rightstick:b14,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:b8,righttrigger:b9,platform:Windows,
 030000004c0e00001035000000000000,Gamester,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
 030000000d0f00001110000000000000,GameStick Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
 0300000047530000616d000000000000,GameStop,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
@@ -428,6 +428,7 @@
 03000000380700008084000000000000,Mad Catz TE2 PS4 Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
 030000002a0600001024000000000000,Matricom,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a3,righty:a4,start:b9,x:b2,y:b3,platform:Windows,
 030000009f000000adbb000000000000,MaxJoypad Virtual Controller,a:b1,b:b2,back:b9,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b8,x:b3,y:b0,platform:Windows,
+030000008f0e00001330000000000000,Mayflash Adapter,a:b1,b:b2,back:b8,dpdown:h0.8,dpleft:h0.2,dpright:h0.1,dpup:h0.4,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a3~,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
 03000000250900000128000000000000,Mayflash Arcade Stick,a:b1,b:b2,back:b8,leftshoulder:b0,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b3,righttrigger:b7,start:b9,x:b5,y:b6,platform:Windows,
 03000000242f00003700000000000000,Mayflash F101,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
 03000000790000003018000000000000,Mayflash F300 Arcade Joystick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
@@ -440,7 +441,6 @@
 03000000242f0000f400000000000000,Mayflash N64 Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a5,start:b9,platform:Windows,
 03000000242f0000f500000000000000,Mayflash N64 Adapter,a:b2,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightx:a2,righty:a5,start:b9,platform:Windows,
 03000000790000007918000000000000,Mayflash N64 Adapter,a:b1,b:b2,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b9,leftx:a0,lefty:a1,righttrigger:b7,rightx:a3,righty:a2,start:b8,platform:Windows,
-030000008f0e00001330000000000000,Mayflash N64 Adapter,a:b1,b:b2,back:b8,dpdown:h0.8,dpleft:h0.2,dpright:h0.1,dpup:h0.4,leftshoulder:b6,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightx:a3~,righty:a2,start:b9,x:b0,y:b3,platform:Windows,
 030000008f0e00001030000000000000,Mayflash Saturn Adapter,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b5,lefttrigger:b7,rightshoulder:b6,righttrigger:b2,start:b9,x:b3,y:b4,platform:Windows,
 0300000025090000e803000000000000,Mayflash Wii Classic Adapter,a:b1,b:b0,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:a4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:a5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Windows,
 03000000790000000318000000000000,Mayflash Wii DolphinBar,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b11,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b1,platform:Windows,
@@ -516,7 +516,6 @@
 030000006f0e00000901000000000000,PDP PS3 Versus Fighting,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Windows,
 030000006f0e00008901000000000000,PDP Realmz Nintendo Switch Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 030000008f0e00004100000000000000,PlaySega,a:b1,b:b0,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b2,start:b8,x:b4,y:b3,platform:Windows,
-03000000d620000020a7000000000000,PowerA Advantage Nintendo Switch 2 Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,misc2:b16,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000d620000011a7000000000000,PowerA Core Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000dd62000015a7000000000000,PowerA Fusion Nintendo Switch Arcade Stick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
 03000000d620000012a7000000000000,PowerA Fusion Nintendo Switch Fight Pad,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Windows,
@@ -805,8 +804,6 @@
 030000006f0e00000302000000000000,Victrix PS4 Pro Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
 030000006f0e00000702000000000000,Victrix PS4 Pro Fightstick,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,touchpad:b13,x:b0,y:b3,platform:Windows,
 0300000034120000adbe000000000000,vJoy Device,a:b0,b:b1,back:b15,dpdown:b6,dpleft:b7,dpright:b8,dpup:b5,guide:b16,leftshoulder:b9,leftstick:b13,lefttrigger:b11,leftx:a0,lefty:a1,rightshoulder:b10,rightstick:b14,righttrigger:b12,rightx:a3,righty:a4,start:b4,x:b2,y:b3,platform:Windows,
-03000000d23800001010000000000000,Void Genesis,a:b0,b:b1,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b2,leftstick:b9,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b18,misc2:b21,misc3:b20,paddle1:b22,paddle2:b15,paddle3:b23,paddle4:b17,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a5,start:b19,x:b3,y:b4,platform:Windows,
-03000000d23800001210000000000000,Void Genesis,a:b0,b:b1,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b6,leftshoulder:b2,leftstick:b9,lefttrigger:a3,leftx:a0,lefty:a1,misc1:b18,misc2:b21,misc3:b20,paddle1:b22,paddle2:b15,paddle3:b23,paddle4:b17,rightshoulder:b5,rightstick:b10,righttrigger:a4,rightx:a2,righty:a5,start:b19,x:b3,y:b4,platform:Windows,
 03000000120c0000ab57000000000000,Warrior Joypad JS083,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Windows,
 030000007e0500003003000000000000,Wii U Pro,a:b0,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b16,dpup:b13,leftshoulder:b6,leftstick:b11,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b12,righttrigger:b5,rightx:a2,righty:a3,start:b9,x:b3,y:b2,platform:Windows,
 0300000032150000030a000000000000,Wildcat,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
@@ -1473,7 +1470,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
 030000006d0400001ec2000020200000,Logitech F510,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
 030000006d04000019c2000011010000,Logitech F710,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000006d0400001fc2000005030000,Logitech F710,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
-030000006d0400001ac2000010010000,Logitech Precision,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Linux,
 030000006d04000018c2000010010000,Logitech RumblePad 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000006d04000019c2000010010000,Logitech RumblePad 2,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
 030000006d0400000ac2000010010000,Logitech WingMan RumblePad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b2,rightx:a3,righty:a4,x:b3,y:b4,platform:Linux,
@@ -587,7 +587,7 @@ void main()

 #define PS_FEEDBACK_LOOP_IS_NEEDED_RT (PS_TEX_IS_FB == 1 || AFAIL_NEEDS_RT || PS_FBMASK || SW_BLEND_NEEDS_RT || SW_AD_TO_HW || (PS_DATE >= 5))
 #define PS_FEEDBACK_LOOP_IS_NEEDED_DEPTH (AFAIL_NEEDS_DEPTH || ZTST_NEEDS_DEPTH || AA1_NEEDS_DEPTH)
-#define ZWRITE (PS_ZCLAMP || PS_ZFLOOR || PS_FEEDBACK_LOOP_IS_NEEDED_DEPTH)
+#define ZWRITE (PS_ZCLAMP || PS_ZFLOOR || SW_DEPTH || PS_FEEDBACK_LOOP_IS_NEEDED_DEPTH)

 #define PS_RETURN_COLOR_ROV (!PS_NO_COLOR && PS_ROV_COLOR)
 #define PS_RETURN_COLOR (!PS_NO_COLOR && !PS_ROV_COLOR)
@@ -284,7 +284,7 @@ void DisplaySurface::handleKeyInputEvent(QEvent* event)

 void DisplaySurface::onResizeDebounceTimer()
 {
-	emit windowResizedEvent(m_last_window_width, m_last_window_height, m_last_window_scale);
+	emit windowResizedEvent(m_pending_window_width, m_pending_window_height, m_pending_window_scale);
 }

 bool DisplaySurface::event(QEvent* event)
@@ -397,6 +397,10 @@ bool DisplaySurface::event(QEvent* event)
 			// avoid spamming resize events for paint events (sent on move on windows)
 			if (m_last_window_width != scaled_width || m_last_window_height != scaled_height || m_last_window_scale != dpr)
 			{
+				m_pending_window_width = scaled_width;
+				m_pending_window_height = scaled_height;
+				m_pending_window_scale = dpr;
+
 				m_last_window_width = scaled_width;
 				m_last_window_height = scaled_height;
 				m_last_window_scale = dpr;
@@ -70,5 +70,9 @@ private:
 	float m_last_window_scale = 1.0f;

 	QTimer* m_resize_debounce_timer = nullptr;
+	u32 m_pending_window_width = 0;
+	u32 m_pending_window_height = 0;
+	float m_pending_window_scale = 1.0f;
+
 	QWidget* m_container = nullptr;
 };
@@ -1202,21 +1202,6 @@ void MainWindow::updateDisplayRelatedActions(bool has_surface, bool render_to_ma
 		QSignalBlocker blocker(m_ui.actionToolbarFullscreen);
 		m_ui.actionToolbarFullscreen->setChecked(fullscreen);
 	}
-
-#ifdef __APPLE__
-	if (render_to_main && fullscreen)
-	{
-		m_ui.toolBar->setVisible(false);
-		m_ui.statusBar->setVisible(false);
-	}
-	else
-	{
-		m_ui.toolBar->setVisible(m_ui.actionViewToolbar->isChecked());
-		m_ui.statusBar->setVisible(m_ui.actionViewStatusBar->isChecked());
-	}
-	m_ui.actionViewToolbar->setEnabled(!(render_to_main && fullscreen));
-	m_ui.actionViewStatusBar->setEnabled(!(render_to_main && fullscreen));
-#endif
 }

 void MainWindow::updateStatusBarWidgetVisibility()
@@ -1391,12 +1376,6 @@ bool MainWindow::isRenderingFullscreen() const
 	if (!MTGS::IsOpen() || !m_display_surface)
 		return false;

-#ifdef __APPLE__
-	// When rendering to main, the main window is what goes fullscreen.
-	if (isRenderingToMain())
-		return isFullScreen();
-#endif
-
 	return m_display_surface->isFullScreen();
 }

@@ -1415,12 +1394,7 @@ bool MainWindow::shouldHideMainWindow() const
 {
 	// NOTE: We can't use isRenderingToMain() here, because this happens post-fullscreen-switch.
 	return (Host::GetBoolSettingValue("UI", "HideMainWindowWhenRunning", false) && !g_emu_thread->shouldRenderToMain()) ||
-#ifdef __APPLE__
-	       // macOS keeps fullscreen on the main window so don't hide it there.
-	       (g_emu_thread->shouldRenderToMain() && (g_emu_thread->isExclusiveFullscreen() || m_is_temporarily_windowed)) ||
-#else
 	       (g_emu_thread->shouldRenderToMain() && (isRenderingFullscreen() || g_emu_thread->isExclusiveFullscreen() || m_is_temporarily_windowed)) ||
-#endif
 	       Host::InNoGUIMode();
 }

@@ -2822,27 +2796,6 @@ std::optional<WindowInfo> MainWindow::acquireRenderWindow(bool recreate_window,
 		return m_display_surface->getWindowInfo();
 	}

-#ifdef __APPLE__
-	// Skip recreating when toggling fullscreen if we're still rendering to main.
-	if (m_display_created && !recreate_window && is_rendering_to_main && render_to_main && !changing_surfaceless)
-	{
-		updateDisplayRelatedActions(true, true, fullscreen);
-
-		if (fullscreen)
-			showFullScreen();
-		else
-			showNormal();
-
-		while (!m_is_closing && isFullScreen() != fullscreen)
-			QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
-
-		updateDisplayWidgetCursor();
-		m_display_surface->setFocus();
-		updateWindowState();
-		return m_display_surface->getWindowInfo();
-	}
-#endif
-
 	destroyDisplayWidget(surfaceless);
 	m_display_created = true;

@@ -2882,23 +2835,14 @@ void MainWindow::createDisplayWidget(bool fullscreen, bool render_to_main)
 {
 	// If we're rendering to main and were hidden (e.g. coming back from fullscreen),
 	// make sure we're visible before trying to add ourselves. Otherwise Wayland breaks.
-#ifdef __APPLE__
-	// On macOS the main window itself goes fullscreen so it needs to be visible then too.
-	if (render_to_main && !isVisible())
-#else
 	if (!fullscreen && render_to_main && !isVisible())
-#endif
 	{
 		setVisible(true);
 		QGuiApplication::sync();
 	}

 	m_display_surface = new DisplaySurface();
-#ifdef __APPLE__
-	if (!render_to_main)
-#else
 	if (fullscreen || !render_to_main)
-#endif
 	{
 #ifdef DISPLAY_SURFACE_WINDOW
 		m_display_surface->setTitle(windowTitle());
@@ -2914,11 +2858,7 @@ void MainWindow::createDisplayWidget(bool fullscreen, bool render_to_main)
 		m_display_container = m_display_surface->createWindowContainer(getContentParent());
 	}

-#ifdef __APPLE__
-	if (!render_to_main && (fullscreen || g_emu_thread->isExclusiveFullscreen()))
-#else
 	if (fullscreen || g_emu_thread->isExclusiveFullscreen())
-#endif
 	{
 		// On Wayland, while move/restoreGeometry can't position the window, it can influence which screen they show up on.
 		// Other platforms can position windows fine, but the only thing that matters here is the screen.
@@ -2974,15 +2914,6 @@ void MainWindow::createDisplayWidget(bool fullscreen, bool render_to_main)

 	updateDisplayRelatedActions(true, render_to_main, fullscreen);

-#ifdef __APPLE__
-	if (render_to_main && fullscreen)
-	{
-		showFullScreen();
-		while (!m_is_closing && !isFullScreen())
-			QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
-	}
-#endif
-
 	// We need the surface visible.
 	QGuiApplication::sync();
 }
@@ -3075,16 +3006,6 @@ void MainWindow::destroyDisplayWidget(bool show_game_list)
 	if (!(m_display_surface->isFullScreen() || m_display_is_exclusive_fullscreen) && !isRenderingToMain())
 		saveDisplayWindowGeometryToConfig();

-#ifdef __APPLE__
-	// Need to leave fullscreen before destroying otherwise we could get stuck in it.
-	if (isRenderingToMain() && isFullScreen())
-	{
-		showNormal();
-		while (isFullScreen())
-			QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
-	}
-#endif
-
 	if (isRenderingToMain())
 	{
 		pxAssertRel(m_ui.mainContainer->indexOf(m_display_container) == 1, "Display widget in stack");
@@ -898,12 +898,7 @@ std::optional<WindowInfo> EmuThread::acquireRenderWindow(bool recreate_window)
 	// Check if we're wanting to get exclusive fullscreen. This should be safe to read, since we're going to be calling from the GS thread.
 	m_is_exclusive_fullscreen = m_is_fullscreen && GSWantsExclusiveFullscreen();
 	const bool window_fullscreen = m_is_fullscreen && !m_is_exclusive_fullscreen;
-#ifdef __APPLE__
-	// Fullscreen the main window instead of opening a separate one on macOS.
-	const bool render_to_main = !m_is_exclusive_fullscreen && m_is_rendering_to_main;
-#else
 	const bool render_to_main = !m_is_exclusive_fullscreen && !window_fullscreen && m_is_rendering_to_main;
-#endif

 	return emit onAcquireRenderWindowRequested(recreate_window, window_fullscreen, render_to_main, m_is_surfaceless);
 }
@@ -163,7 +163,7 @@ static bool OpenGSDevice(GSRendererType renderer, bool clear_state_on_fail, bool

 	if (!g_gs_device->SetGPUTimingEnabled(true))
 		GSConfig.OsdShowGPU = false;
-	if (GSConfig.OsdShowGPUStats && !g_gs_device->SetGPUPipelineStatisticsEnabled(true))
+	if (!g_gs_device->SetGPUPipelineStatisticsEnabled(true))
 		GSConfig.OsdShowGPUStats = false;

 	Console.WriteLn(Color_StrongGreen, "%s Graphics Driver Info:", GSDevice::RenderAPIToString(new_api));
@@ -373,7 +373,6 @@ void GSState::ResetDrawBufferIdx()
 void GSState::ResetDrawBuffers()
 {
 	m_used_buffers_idx = 1;
-	m_max_vertex_count = 0;

 	for (int i = 0; i < MAX_DRAW_BUFFERS; i++)
 	{
@@ -384,9 +383,9 @@ void GSState::ResetDrawBuffers()
 		m_index = &m_index_buffers[i];
 		m_vertex = &m_vertex_buffers[i];
 		m_vertex_buffers[i].head = m_vertex_buffers[i].tail = m_vertex_buffers[i].next = 0;
+		GrowVertexBuffer();
 	}

-	GrowVertexBuffer();
 	ResetDrawBufferIdx();
 }

@@ -474,16 +473,15 @@ void GSState::PushBuffer()
 		m_index = &m_index_buffers[m_used_buffers_idx];
 		m_vertex = &m_vertex_buffers[m_used_buffers_idx];
 		GSVertexBuff& vtx_buff = *m_vertex;
+		GSIndexBuff& idx_buff = *m_index;

 		const u32 base = m_vertex_buffers[m_current_buffer_idx].head;
-		u32 copy_amt = m_vertex_buffers[m_current_buffer_idx].tail - base;
+		const u32 copy_amt = m_vertex_buffers[m_current_buffer_idx].tail - base;

 		m_vertex->tail = 0;

-		if (copy_amt && m_env.PRIM.PRIM == m_env_buffers[m_current_buffer_idx].m_env.PRIM.PRIM)
+		if (copy_amt)
 			memcpy(vtx_buff.buff, &m_vertex_buffers[m_current_buffer_idx].buff[base], sizeof(GSVertex) * copy_amt);
-		else
-			copy_amt = 0;

 		vtx_buff.head = 0;
 		vtx_buff.next = 0;
@@ -640,27 +638,20 @@ bool GSState::CanBufferNewDraw()
 				GSVertexBuff& vtx_buff = *m_vertex;
 				GSIndexBuff& idx_buff = *m_index;

+				const u32 copy_amt = m_vertex_buffers[m_current_buffer_idx].tail - m_vertex_buffers[m_current_buffer_idx].head;
+
+				m_recent_buffer_switch = vtx_buff.tail == vtx_buff.head;
 				if (idx_buff.tail)
-					vtx_buff.tail = std::max(idx_buff.buff[idx_buff.tail - 1], idx_buff.buff[std::max(static_cast<int>(idx_buff.tail) - 2, 0)]) + 1;
+					vtx_buff.tail = idx_buff.buff[idx_buff.tail - 1] + 1;
 				else
 					vtx_buff.tail = 0;

-				vtx_buff.head = vtx_buff.tail;
-				vtx_buff.next = vtx_buff.head;
-
-				u32 copy_amt = m_vertex_buffers[m_current_buffer_idx].tail - m_vertex_buffers[m_current_buffer_idx].head;
-
-				if (copy_amt && m_env_buffers[i].m_env.PRIM.PRIM == m_env_buffers[m_current_buffer_idx].m_env.PRIM.PRIM)
-				{
+				if (copy_amt)
 					memcpy(&vtx_buff.buff[vtx_buff.tail], &m_vertex_buffers[m_current_buffer_idx].buff[m_vertex_buffers[m_current_buffer_idx].head], sizeof(GSVertex) * copy_amt);

-					vtx_buff.tail += copy_amt;
-				}
-				else
-					copy_amt = 0;
-
-				m_recent_buffer_switch = vtx_buff.tail == vtx_buff.head;
-
+				vtx_buff.head = vtx_buff.tail;
+				vtx_buff.next = vtx_buff.head;
+				vtx_buff.tail += copy_amt;
 				m_backed_up_ctx = m_env_buffers[i].m_backed_up_ctx;
 				temp_draw_rect = m_env_buffers[i].draw_rect;
 				m_env_buffers[i].m_dirty_regs = 0;
@@ -687,6 +678,7 @@ bool GSState::CanBufferNewDraw()
 					vtx_buff.xy_tail = 0;

 				m_current_buffer_idx = i;
+
 			}

 			m_dirty_gs_regs = 0;
@@ -2535,8 +2527,7 @@ void GSState::FlushPrim()

 		if (tail > head)
 		{
-			// NOTE: Do not use PRIM->PRIM as the previous environment may have been restored and it may have changed from strip to fan, which messes up the backup.
-			switch (m_env.PRIM.PRIM)
+			switch (PRIM->PRIM)
 			{
 				case GS_POINTLIST:
 					pxAssert(0);
@@ -2676,7 +2667,7 @@ void GSState::FlushPrim()

 			// If it's a Triangle fan the XY buffer needs to be updated to point to the correct head vert
 			// Jak 3 shadows get spikey (with autoflush) if you don't.
-			if (m_env.PRIM.PRIM == GS_TRIANGLEFAN)
+			if (PRIM->PRIM == GS_TRIANGLEFAN)
 			{
 				for (u32 i = 0; i < unused; i++)
 				{
@@ -3826,49 +3817,56 @@ void GSState::UpdateVertexKick()
 	m_fpGIFPackedRegHandlersC[GIF_REG_STQRGBAXYZ2] = m_fpGIFPackedRegHandlerSTQRGBAXYZ2[prim];
 }

-static void GrowBuffer(void** pbuff, size_t old_size, size_t new_size, bool vertices)
-{
-	void* new_buff = _aligned_malloc(new_size, 32);
-	if (!new_buff)
-	{
-		Console.Error("GS: failed to allocate %zu bytes for %s.", new_size, vertices ? "vertices" : "indices");
-		pxFailRel("Memory allocation failed");
-	}
-	if (*pbuff)
-	{
-		if (old_size)
-		{
-			std::memcpy(new_buff, *pbuff, old_size);
-		}
-		_aligned_free(*pbuff);
-	}
-	*pbuff = new_buff;
-}
-
-template <typename T>
-static void GrowBuffer(T** pbuff, size_t old_count, size_t new_count)
-{
-	static_assert(std::is_same_v<T, GSVertex> || std::is_same_v<T, u16>, "For use with indices or vertices");
-	GrowBuffer(reinterpret_cast<void**>(pbuff), old_count * sizeof(T), new_count * sizeof(T), std::is_same_v<T, GSVertex>);
-}
-
 void GSState::GrowVertexBuffer()
 {
-	const u32 maxcount = std::max<u32>(m_max_vertex_count * 3 / 2, 10000);
-	const u32 new_vertex_count = maxcount;
-	const u32 new_index_count = maxcount * 6; // Worst case index list is a list of points with vs expansion, 6 indices per point
+	const u32 maxcount = std::max<u32>(m_vertex->maxcount * 3 / 2, 10000);
+	const u32 old_vertex_size = sizeof(GSVertex) * m_vertex->tail;
+	const u32 new_vertex_size = sizeof(GSVertex) * maxcount;
+	const u32 old_index_size = sizeof(u16) * m_index->tail;
+	const u32 new_index_size = sizeof(u16) * maxcount * 6; // Worst case index list is a list of points with vs expansion, 6 indices per point

-	for (GSVertexBuff& buf : m_vertex_buffers)
+	// Structure describing buffers to reallocate
+	struct AllocDesc
 	{
-		GrowBuffer(&buf.buff, buf.tail, new_vertex_count);
-		GrowBuffer(&buf.buff_copy, 0, new_vertex_count);
-	}
-	for (GSIndexBuff& buf : m_index_buffers)
-		GrowBuffer(&buf.buff, buf.tail, new_index_count);
-	GrowBuffer(&m_draw_vertex.buff, m_vertex->tail, new_vertex_count);
-	GrowBuffer(&m_draw_index.buff, m_index->tail, new_index_count);
+		void** pbuff;
+		u32 old_size;
+		u32 new_size;
+	};
+	const std::array<AllocDesc, 5> alloc_desc = {{
+		{reinterpret_cast<void**>(&m_vertex->buff),      old_vertex_size, new_vertex_size},
+		// discard contents of buff_copy by setting old_size = 0
+		{reinterpret_cast<void**>(&m_vertex->buff_copy), 0,               new_vertex_size},
+		{reinterpret_cast<void**>(&m_draw_vertex.buff), old_vertex_size, new_vertex_size},
+		{reinterpret_cast<void**>(&m_index->buff),       old_index_size,  new_index_size},
+		{reinterpret_cast<void**>(&m_draw_index.buff),  old_index_size,  new_index_size}
+	}};

-	m_max_vertex_count = maxcount - 3; // -3 to have some space at the end of the buffer before DrawingKick can grow it
+	// For logging
+	u32 total_size = 0;
+	for (const auto& desc : alloc_desc)
+		total_size += desc.new_size;
+
+	// Reallocate each of the needed buffers
+	for (const auto [pbuff, old_size, new_size] : alloc_desc)
+	{
+		void* new_buff = _aligned_malloc(new_size, 32);
+		if (!new_buff)
+		{
+			Console.Error("GS: failed to allocate %zu bytes for vertices and indices.", total_size);
+			pxFailRel("Memory allocation failed");
+		}
+		if (*pbuff)
+		{
+			if (old_size)
+			{
+				std::memcpy(new_buff, *pbuff, old_size);
+			}
+			_aligned_free(*pbuff);
+		}
+		*pbuff = new_buff;
+	}
+
+	m_vertex->maxcount = maxcount - 3; // -3 to have some space at the end of the buffer before DrawingKick can grow it
 }

 // For returning order of vertices to form a right triangle
@@ -5837,7 +5835,7 @@ __forceinline void GSState::VertexKick(u32 skip)
 	GSVertexBuff& vtx_buff = *m_vertex;
 	GSIndexBuff& idx_buff = *m_index;
 	static_assert(n > 0);
-	pxAssert(vtx_buff.tail < m_max_vertex_count + 3);
+	pxAssert(vtx_buff.tail < vtx_buff. maxcount + 3);

 	if constexpr (prim == GS_INVALID)
 	{
@@ -5974,7 +5972,7 @@ __forceinline void GSState::VertexKick(u32 skip)
 				vtx_buff.head = head + 1;
 				[[fallthrough]];
 			case GS_TRIANGLEFAN:
-				if (tail >= m_max_vertex_count)
+				if (tail >= vtx_buff.maxcount)
 					GrowVertexBuffer(); // in case too many vertices were skipped
 				break;
 			default:
@@ -5998,7 +5996,7 @@ __forceinline void GSState::VertexKick(u32 skip)
 			SetDrawBufferEnv();
 	}

-	if (tail >= m_max_vertex_count)
+	if (tail >= vtx_buff.maxcount)
 		GrowVertexBuffer();

 	u16* RESTRICT buff = &idx_buff.buff[idx_buff.tail];
@@ -135,13 +135,12 @@ protected:
 	int  m_used_buffers_idx = 0;
 	int m_current_buffer_idx = 0;
 	bool m_recent_buffer_switch = false;
-	u32 m_max_vertex_count;

 	struct GSVertexBuff
 	{
 		GSVertex* buff;
 		GSVertex* buff_copy; // same size buffer to copy/modify the original buffer
-		u32 head, tail, next; // head: first vertex, tail: last vertex + 1, next: last indexed + 1
+		u32 head, tail, next, maxcount; // head: first vertex, tail: last vertex + 1, next: last indexed + 1
 		u32 xy_tail;
 		GSVector4i xy[4];
 		GSVector4i xyhead;
@@ -603,7 +603,7 @@ bool GSDevice11::Create(GSVSyncMode vsync_mode, bool allow_present_throttle)
 	}

 	// 1x1 dummy texture.
-	const GSTexture::Usage null_usage = m_uav_texture ? GSTexture::ShaderWriteTarget : GSTexture::FeedbackTarget;
+	const GSTexture::Usage null_usage = m_uav_texture ? GSTexture::ShaderWriteTarget : GSTexture::Feedback;
 	m_null_texture = CreateSurface(null_usage, 1, 1, 1, GSTexture::Format::Color);
 	if (!m_null_texture)
 		return false;
@@ -1167,7 +1167,7 @@ void GSDevice11::DestroyTimestampQueries()
 	m_read_timestamp_query = 0;
 	m_write_timestamp_query = 0;
 	m_waiting_timestamp_queries = 0;
-	m_timestamp_query_started = false;
+	m_timestamp_query_started = 0;
 }

 void GSDevice11::PopTimestampQuery()
@@ -1286,13 +1286,13 @@ void GSDevice11::DestroyPipelineStatisticsQueries()
 		return;

 	if (m_pipeline_statistics_query_started)
-		m_ctx->End(m_pipeline_statistics_queries[m_write_pipeline_statistics_query].get());
+		m_ctx->End(m_pipeline_statistics_queries[m_write_timestamp_query].get());

-	m_pipeline_statistics_queries = {};
-	m_read_pipeline_statistics_query = 0;
-	m_write_pipeline_statistics_query = 0;
-	m_waiting_pipeline_statistics_queries = 0;
-	m_pipeline_statistics_query_started = false;
+	m_timestamp_queries = {};
+	m_read_timestamp_query = 0;
+	m_write_timestamp_query = 0;
+	m_waiting_timestamp_queries = 0;
+	m_timestamp_query_started = 0;
 }

 void GSDevice11::PopPipelineStatisticsQuery()
@@ -222,7 +222,9 @@ void GSRendererHW::Lines2Sprites()

 	// each sprite converted to quad needs twice the space

-	while (m_vertex->tail * 2 > m_max_vertex_count)
+	const int tail = m_vertex->tail * 2;
+	const int max_count = m_vertex->maxcount;
+	while (tail > max_count)
 	{
 		GrowVertexBuffer();
 	}
@@ -3939,8 +3941,7 @@ void GSRendererHW::Draw()

 			if (next_ctx.FRAME.Block() == FRAME_TEX0.TBP0 && next_ctx.FRAME.PSM != FRAME_TEX0.PSM)
 				FRAME_TEX0.PSM = next_ctx.FRAME.PSM;
-			// Be careful of the next draw being a channel shuffle!
-			else if (next_ctx.TEX0.TBP0 == FRAME_TEX0.TBP0 && next_ctx.TEX0.PSM != FRAME_TEX0.PSM && GSLocalMemory::m_psm[next_ctx.TEX0.PSM].trbpp >= 16)
+			else if (next_ctx.TEX0.TBP0 == FRAME_TEX0.TBP0 && next_ctx.TEX0.PSM != FRAME_TEX0.PSM)
 				FRAME_TEX0.PSM = next_ctx.TEX0.PSM;
 			else
 				FRAME_TEX0.PSM = PSMCT32; // Guess full color if no upcoming hint, it'll fix itself later.
@@ -5383,7 +5384,7 @@ void GSRendererHW::HandleFlatShadedVertices()
 		return;

 	// De-index the vertices using the copy buffer
-	while (m_max_vertex_count < idx_buff.tail)
+	while (vtx_buff.maxcount < idx_buff.tail)
 		GrowVertexBuffer();

 	for (int i = static_cast<int>(idx_buff.tail) - 1; i >= 0; i--)
@@ -9826,8 +9827,12 @@ bool GSRendererHW::CanUseSwPrimRender(bool no_rt, bool no_ds, bool draw_sprite_t
 			return false;
 		}
 	}
-
-	if (PRIM->ABE && m_vt.m_eq.rgba == 0xffff && !m_context->ALPHA.IsOpaque(GetAlphaMinMax().min, GetAlphaMinMax().max))
+	const u32 frame_mask = GSLocalMemory::m_psm[m_cached_ctx.FRAME.PSM].fmsk;
+	const u32 alpha_mask = ((m_cached_ctx.FRAME.FBMSK & frame_mask) & 0xFF000000);
+	const u32 rgb_mask = ((m_cached_ctx.FRAME.FBMSK & frame_mask) & 0x00FFFFFF);
+	const bool difficult_fbmsk = m_cached_ctx.FRAME.FBMSK != 0 && (GSLocalMemory::m_psm[m_cached_ctx.FRAME.PSM].bpp == 16 || (alpha_mask != 0 && alpha_mask != (GSLocalMemory::m_psm[m_cached_ctx.FRAME.PSM].fmsk & 0xFF000000)) || 
+																	(rgb_mask != 0 && rgb_mask != (GSLocalMemory::m_psm[m_cached_ctx.FRAME.PSM].fmsk & 0x00FFFFFF)));
+	if (difficult_fbmsk || (PRIM->ABE && m_vt.m_eq.rgba == 0xffff && !m_context->ALPHA.IsOpaque(GetAlphaMinMax().min, GetAlphaMinMax().max)))
 	{
 		GSTextureCache::Target* rt = g_texture_cache->GetTargetWithSharedBits(m_cached_ctx.FRAME.Block(), m_cached_ctx.FRAME.PSM);

@@ -545,7 +545,19 @@ bool GSRendererHWFunctions::SwPrimRender(GSRendererHW& hw, bool invalidate_tc, b
 	static_cast<GSSingleRasterizer*>(hw.m_sw_rasterizer.get())->Draw(data);

 	if (invalidate_tc)
-		g_texture_cache->InvalidateVideoMem(context->offset.fb, bbox);
+	{
+		GSOffset frame_offs = context->offset.fb;
+
+		if (GSLocalMemory::m_psm[context->FRAME.PSM].trbpp == 32 && context->FRAME.FBMSK)
+		{
+			if (context->FRAME.FBMSK == 0xFF000000)
+				frame_offs = GSRendererHW::GetInstance()->m_mem.GetOffset(context->FRAME.Block(), context->FRAME.FBW, PSMCT24);
+			else if (context->FRAME.FBMSK == 0x00FFFFFF)
+				frame_offs = GSRendererHW::GetInstance()->m_mem.GetOffset(context->FRAME.Block(), context->FRAME.FBW, PSMT8H);
+		}
+
+		g_texture_cache->InvalidateVideoMem(frame_offs, bbox);
+	}

 	// Jak does sw prim render, then draws to the same target, and it needs to be uploaded.
 	if (add_ee_transfer)
@@ -1734,6 +1734,11 @@ GSTextureCache::Source* GSTextureCache::LookupSource(const bool is_color, const
 					if (found_t && (bw != t->m_TEX0.TBW || t->m_TEX0.PSM != psm))
 						match = false;

+					// Situations where font has been uploaded to the alpha channel and they use a different buffer width, this can't currently be translated correctly.
+					GSLocalMemory::psm_t req_psm = GSLocalMemory::m_psm[psm];
+					if (!possible_shuffle && req_psm.trbpp <= 8 && req_psm.bpp == 32 && t->m_TEX0.TBW != bw && (bw * 64) != t->m_valid.z && r.w > req_psm.pgs.y)
+						match = false;
+
 					// Different swizzle, different width, and dirty, so probably not what we want.
 					//	DevCon.Warning("Expected %x Got %x shuffle %d draw %d", psm, t_psm, possible_shuffle, GSState::s_n);
 					if (match)
@@ -2580,21 +2585,12 @@ GSTextureCache::Target* GSTextureCache::LookupDrawTarget(GIFRegTEX0 TEX0, const
 			{
 				// Some games misuse the scissor so it ends up valid 1 pixel over, which causes hell for us. So check if it still overlaps without the extra pixel.
 				const GSVector4i adjusted_valid = GSVector4i(t->m_valid.x, t->m_valid.y, std::min(t->m_valid.z, static_cast<int>(t->m_TEX0.TBW) * 64), t->m_valid.w - 1);
-				u32 adjusted_endblock = GSLocalMemory::GetUnwrappedEndBlockAddress(t->m_TEX0.TBP0, t->m_TEX0.TBW, t->m_TEX0.PSM, adjusted_valid);
+				const u32 adjusted_endblock = GSLocalMemory::GetEndBlockAddress(t->m_TEX0.TBP0, t->m_TEX0.TBW, t->m_TEX0.PSM, adjusted_valid);
 				if (adjusted_endblock <= bp)
 				{
 					i++;
 					continue;
 				}
-				const GSVector4i adjusted_rect = GSVector4i(min_rect.x, min_rect.y, std::min(min_rect.z, static_cast<int>(t->m_TEX0.TBW) * 64), min_rect.w - 1);
-				// Also check the offset from the bp to the current request to see if it overlaps the begining of the selected target.
-				adjusted_endblock = GSLocalMemory::GetUnwrappedEndBlockAddress(TEX0.TBP0, TEX0.TBW, TEX0.PSM, adjusted_rect);
-				if (adjusted_endblock <= t->m_TEX0.TBP0)
-				{
-					i++;
-					continue;
-				}
-
 				const GSLocalMemory::psm_t& s_psm = GSLocalMemory::m_psm[TEX0.PSM];
 				const u32 widthpage_offset = (std::abs(static_cast<int>(bp - t->m_TEX0.TBP0)) >> 5) % std::max(t->m_TEX0.TBW, 1U);
 				const bool is_aligned_ok = widthpage_offset == 0 || ((min_rect.width() <= static_cast<int>((t->m_TEX0.TBW - widthpage_offset) * 64) && (t->m_TEX0.TBW == TEX0.TBW || TEX0.TBW == 1)) && bp >= t->m_TEX0.TBP0);
@@ -7282,6 +7278,9 @@ GSTexture* GSTextureCache::LookupPaletteSource(u32 CBP, u32 CPSM, u32 CBW, GSVec
 		else if (GSConfig.UserHacks_GPUTargetCLUTMode == GSGPUTargetCLUTMode::InsideTarget &&
 				 t->m_TEX0.TBP0 < CBP && t->m_end_block >= CBP)
 		{
+			// If it's more than one group of 4 blocks, it's probably going to fail, horribly.
+			if ((size.x > GSLocalMemory::m_psm[CPSM].bs.x || size.y > GSLocalMemory::m_psm[CPSM].bs.y) && (CBP & 0x3) != (t->m_TEX0.TBP0 & 0x3))
+				continue;
 			// Somewhere within this target, can we find it?
 			const GSVector4i rc(0, 0, size.x, size.y);
 			SurfaceOffset so = ComputeSurfaceOffset(CBP, std::max<u32>(CBW, 0), CPSM, rc, t);
@@ -7294,7 +7293,7 @@ GSTexture* GSTextureCache::LookupPaletteSource(u32 CBP, u32 CPSM, u32 CBW, GSVec
 		}
 		else
 		{
-			// Not inside this target, skip.
+			// Not inside this target or not aligned, skip.
 			continue;
 		}

@@ -7962,7 +7961,9 @@ void GSTextureCache::Target::Update(bool cannot_scale)
 		alloca(sizeof(GSDevice::MultiStretchRect) * static_cast<u32>(m_dirty.size())));
 	u32 ndrects = 0;

-	const GSOffset off(g_gs_renderer->m_mem.GetOffset(m_TEX0.TBP0, m_TEX0.TBW, m_TEX0.PSM));
+	// There are cases where the alpha gets populated with font data, and the target has previously been PSMCT32 (or will be) so we need to make sure it gets filled in.
+	const u32 psm = (m_TEX0.PSM == PSMCT24) ? PSMCT32 : m_TEX0.PSM;
+	const GSOffset off(g_gs_renderer->m_mem.GetOffset(m_TEX0.TBP0, m_TEX0.TBW, psm));
 	const u32 bpp = GSLocalMemory::m_psm[m_TEX0.PSM].bpp;

 	std::pair<u8, u8> alpha_minmax = {255, 0};
@@ -7985,7 +7986,7 @@ void GSTextureCache::Target::Update(bool cannot_scale)
 		const GSVector4i t_r(read_r - t_offset);
 		if (mapped)
 		{
-			if ((m_TEX0.PSM & 0xf) != PSMCT24 && m_dirty[i].rgba.c.a && bpp >= 16)
+			if (((m_TEX0.PSM & 0xf) != PSMCT24 || m_valid_alpha_high || m_valid_alpha_low) && m_dirty[i].rgba.c.a && bpp >= 16)
 			{
 				// TODO: Only read once in 32bit and copy to the mapped texture. Bit out of scope of this PR and not a huge impact.
 				const int pitch = VectorAlign(read_r.width() * sizeof(u32));
@@ -8004,7 +8005,7 @@ void GSTextureCache::Target::Update(bool cannot_scale)
 			const int pitch = VectorAlign(read_r.width() * sizeof(u32));
 			g_gs_renderer->m_mem.ReadTexture(off, read_r, s_unswizzle_buffer, pitch, TEXA);

-			if ((m_TEX0.PSM & 0xf) != PSMCT24 && m_dirty[i].rgba.c.a && bpp >= 16)
+			if (((m_TEX0.PSM & 0xf) != PSMCT24 || m_valid_alpha_high || m_valid_alpha_low) &&m_dirty[i].rgba.c.a && bpp >= 16)
 			{
 				std::pair<u8, u8> new_alpha_minmax = GSGetRGBA8AlphaMinMax(s_unswizzle_buffer, read_r.width(), read_r.height(), pitch);
 				alpha_minmax.first = std::min(alpha_minmax.first, new_alpha_minmax.first);
@@ -1292,7 +1292,7 @@ bool GSDeviceOGL::SetGPUPipelineStatisticsEnabled(bool enabled)
 	else
 		DestroyPipelineStatisticsQueries();

-	return (enabled == m_gpu_pipeline_statistics_enabled);
+	return true;
 }

 void GSDeviceOGL::DrawPrimitive()
@@ -320,7 +320,7 @@ void GSRendererSW::RewriteVerticesIfSTOverflow()
 			constexpr int n = GSUtil::GetClassVertexCount(primclass);

 			// Make sure the copy buffer is large enough.
-			while (m_max_vertex_count < m_index->tail)
+			while (m_vertex->maxcount < m_index->tail)
 				GrowVertexBuffer();

 			GSVertex* RESTRICT vertex = m_vertex->buff;
@@ -1150,7 +1150,7 @@ GPUPipelineStatistics GSDeviceVK::GetAndResetAccumulatedGPUPipelineStatistics()
 bool GSDeviceVK::SetGPUPipelineStatisticsEnabled(bool enabled)
 {
 	m_gpu_pipeline_statistics_enabled = enabled && m_gpu_pipeline_statistics_supported;
-	return (enabled == m_gpu_pipeline_statistics_enabled);
+	return true;
 }

 void GSDeviceVK::ScanForCommandBufferCompletion()
@@ -1657,11 +1657,9 @@ VkRenderPass GSDeviceVK::CreateCachedRenderPass(RenderPassCacheKey key)
 	if (key.depth_format != VK_FORMAT_UNDEFINED)
 	{
 		const VkImageLayout layout =
-			key.depth_sampling ?
-				((m_features.depth_feedback && UseFeedbackLoopLayout()) ?
-					VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT :
-					VK_IMAGE_LAYOUT_GENERAL) :
-				VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
+			key.depth_sampling ? (UseFeedbackLoopLayout() ? VK_IMAGE_LAYOUT_ATTACHMENT_FEEDBACK_LOOP_OPTIMAL_EXT :
+															VK_IMAGE_LAYOUT_GENERAL) :
+								 VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
 		attachments[num_attachments] = {0, static_cast<VkFormat>(key.depth_format), VK_SAMPLE_COUNT_1_BIT,
 			static_cast<VkAttachmentLoadOp>(key.depth_load_op), static_cast<VkAttachmentStoreOp>(key.depth_store_op),
 			static_cast<VkAttachmentLoadOp>(key.stencil_load_op),
@@ -2256,11 +2254,8 @@ void GSDeviceVK::Destroy()

 	m_swap_chain.reset();

-	if (m_device != VK_NULL_HANDLE)
-	{
-		DestroySpinResources();
-		DestroyResources();
-	}
+	DestroySpinResources();
+	DestroyResources();

 	VKShaderCache::Destroy();

@@ -3759,14 +3754,12 @@ void GSDeviceVK::OMSetRenderTargets(
 			}
 			else if (feedback_loop & FeedbackLoopFlag_ReadDepth)
 			{
-				const GSTextureVK::Layout layout = m_features.depth_feedback ?
-					GSTextureVK::Layout::FeedbackLoop : GSTextureVK::Layout::General;
-				if (vkDs->GetLayout() != layout)
+				if (vkDs->GetLayout() != GSTextureVK::Layout::FeedbackLoop)
 				{
 					m_dirty_flags |= (DIRTY_FLAG_TFX_TEXTURE_0 << TFX_TEXTURE_TEXTURE);
 					if (m_tfx_textures[TFX_TEXTURE_TEXTURE] == vkDs)
 						m_dirty_flags |= DIRTY_FLAG_TFX_TEXTURE_0 << TFX_TEXTURE_TEXTURE;
-					vkDs->TransitionToLayout(layout);
+					vkDs->TransitionToLayout(GSTextureVK::Layout::FeedbackLoop);
 				}
 			}
 			else
@@ -5422,17 +5415,6 @@ void GSDeviceVK::PSSetROVs(GSTexture* rt, GSTexture* ds, bool write_rt, bool wri
 		PSSetShaderResource(TFX_TEXTURE_DEPTH_ROV, nullptr, false);
 	}

-	if (IsDeviceNVIDIA() && InRenderPass())
-	{
-		// Nvidia doesn't like switching ROV targets mid-render pass, doing so causes flickering or missing geometry.
-		// End the render pass to avoid such issues.
-		if (vkRt != oldVkRt || vkDs != oldVkDs)
-		{
-			GL_INS("VK: Ending render pass due to UAV switch");
-			EndRenderPass();
-		}
-	}
-
 	if (GSConfig.HWROVBarriersVK)
 	{
 		// This is to fix issues with some systems that seem to require barriers even with FSI.
@@ -170,12 +170,24 @@ void FullscreenUI::ApplyLayoutSettings(const SettingsInterface* bsi)
 			return InputLayout::Playstation;
 		if (mode == "nintendo")
 			return InputLayout::Nintendo;
-		if (mode == "generic")
-			return InputLayout::Generic;
 		return InputLayout::Unknown;
 	};

-	InputManager::SetGamepadIconPreference(parse_glyph_layout(glyph_mode));
+	switch (parse_glyph_layout(glyph_mode))
+	{
+		case InputLayout::Xbox:
+			InputManager::SetGamepadIconPreference(InputLayout::Xbox);
+			break;
+		case InputLayout::Playstation:
+			InputManager::SetGamepadIconPreference(InputLayout::Playstation);
+			break;
+		case InputLayout::Nintendo:
+			InputManager::SetGamepadIconPreference(InputLayout::Nintendo);
+			break;
+		default:
+			InputManager::SetGamepadIconPreference(InputLayout::Unknown);
+			break;
+	}

 	const InputLayout layout = ImGuiFullscreen::GetGamepadLayout();

@@ -545,7 +557,6 @@ void FullscreenUI::Shutdown(bool clear_state)
 		CloseCoverDownloaderWindow();
 		s_cover_image_map.clear();
 		s_game_list_sorted_entries = {};
-		s_last_unsorted_entries = {};
 		s_game_list_directories_cache = {};
 		s_game_cheat_unlabelled_count = 0;
 		s_enabled_game_cheat_cache = {};
@@ -2456,6 +2467,7 @@ void FullscreenUI::PopulateGameListEntryList()
 	static int s_last_sort = -1;
 	static bool s_last_reverse = false;
 	static bool s_last_prefer_eng = false;
+	static std::vector<const GameList::Entry*> s_last_unsorted_entries;

 	// Sort can be expensive, try to avoid when possible
 	const u32 count = GameList::GetEntryCount();
@@ -369,9 +369,6 @@ namespace FullscreenUI
 	inline std::vector<const GameList::Entry*> s_game_list_sorted_entries;
 	inline GameListView s_game_list_view = GameListView::Grid;

-	// Cached list of unsorted game list entries; used to detect changes and re-sort when needed
-	inline std::vector<const GameList::Entry*> s_last_unsorted_entries;
-
 	//////////////////////////////////////////////////////////////////////////
 	// Background
 	//////////////////////////////////////////////////////////////////////////
@@ -2296,14 +2296,12 @@ void FullscreenUI::DrawInterfaceSettingsPage()
 		FSUI_NSTR("Xbox"),
 		FSUI_NSTR("PlayStation"),
 		FSUI_NSTR("Nintendo"),
-		FSUI_NSTR("Generic"),
 	};
 	static constexpr const char* glyph_values[] = {
 		"auto",
 		"xbox",
 		"playstation",
 		"nintendo",
-		"generic",
 	};
 	size_t glyph_index = std::size(glyph_values);
 	for (size_t i = 0; i < std::size(glyph_values); i++)
@@ -6324,7 +6322,6 @@ TRANSLATE_NOOP("FullscreenUI", "Tile");
 TRANSLATE_NOOP("FullscreenUI", "Xbox");
 TRANSLATE_NOOP("FullscreenUI", "PlayStation");
 TRANSLATE_NOOP("FullscreenUI", "Nintendo");
-TRANSLATE_NOOP("FullscreenUI", "Generic");
 TRANSLATE_NOOP("FullscreenUI", "Enabled");
 TRANSLATE_NOOP("FullscreenUI", "Disabled");
 TRANSLATE_NOOP("FullscreenUI", "2% [1 FPS (NTSC) / 1 FPS (PAL)]");
@@ -971,10 +971,22 @@ InputLayout ImGuiFullscreen::GetGamepadLayout()
 static InputLayout GetEffectiveGlyphLayout()
 {
 	const InputLayout preferred_layout = InputManager::GetGamepadIconPreference();
-	if (preferred_layout != InputLayout::Unknown)
+	if (preferred_layout == InputLayout::Xbox || preferred_layout == InputLayout::Playstation || preferred_layout == InputLayout::Nintendo)
 		return preferred_layout;

-	return ImGuiFullscreen::GetGamepadLayout();
+	const InputLayout detected_layout = ImGuiFullscreen::GetGamepadLayout();
+	switch (detected_layout)
+	{
+		case InputLayout::Playstation:
+			return InputLayout::Playstation;
+		case InputLayout::Xbox:
+			return InputLayout::Xbox;
+		case InputLayout::Nintendo:
+			return InputLayout::Nintendo;
+		case InputLayout::Unknown:
+		default:
+			return InputLayout::Playstation;
+	}
 }

 ImGuiFullscreen::GamepadGlyphs ImGuiFullscreen::GetGamepadGlyphs()
@@ -982,17 +994,16 @@ ImGuiFullscreen::GamepadGlyphs ImGuiFullscreen::GetGamepadGlyphs()
 	const InputLayout layout = GetEffectiveGlyphLayout();
 	const bool xbox = (layout == InputLayout::Xbox);
 	const bool nintendo = (layout == InputLayout::Nintendo);
-	const bool unknown = (layout == InputLayout::Unknown || layout == InputLayout::Generic);
 	return {
-		unknown ? ICON_PF_BUTTON_DOWN_A : (nintendo ? ICON_PF_BUTTON_B : (xbox ? ICON_PF_BUTTON_A : ICON_PF_BUTTON_CROSS)),
-		unknown ? ICON_PF_BUTTON_RIGHT_B : (nintendo ? ICON_PF_BUTTON_A : (xbox ? ICON_PF_BUTTON_B : ICON_PF_BUTTON_CIRCLE)),
-		unknown ? ICON_PF_BUTTON_LEFT_X : (nintendo ? ICON_PF_BUTTON_Y : (xbox ? ICON_PF_BUTTON_X : ICON_PF_BUTTON_SQUARE)),
-		unknown ? ICON_PF_BUTTON_UP_Y : (nintendo ? ICON_PF_BUTTON_X : (xbox ? ICON_PF_BUTTON_Y : ICON_PF_BUTTON_TRIANGLE)),
+		nintendo ? ICON_PF_BUTTON_B : (xbox ? ICON_PF_BUTTON_A : ICON_PF_BUTTON_CROSS),
+		nintendo ? ICON_PF_BUTTON_A : (xbox ? ICON_PF_BUTTON_B : ICON_PF_BUTTON_CIRCLE),
+		nintendo ? ICON_PF_BUTTON_Y : (xbox ? ICON_PF_BUTTON_X : ICON_PF_BUTTON_SQUARE),
+		nintendo ? ICON_PF_BUTTON_X : (xbox ? ICON_PF_BUTTON_Y : ICON_PF_BUTTON_TRIANGLE),
 		xbox ? ICON_PF_XBOX_DPAD : ICON_PF_DPAD,
 		xbox ? ICON_PF_XBOX_DPAD_LEFT_RIGHT : ICON_PF_DPAD_LEFT_RIGHT,
 		xbox ? ICON_PF_XBOX_DPAD_UP_DOWN : ICON_PF_DPAD_UP_DOWN,
-		nintendo ? ICON_PF_MINUS : ((xbox || unknown) ? ICON_PF_SHARE_CAPTURE : ICON_PF_SELECT_SHARE),
-		nintendo ? ICON_PF_PLUS : ((xbox || unknown) ? ICON_PF_BURGER_MENU : ICON_PF_START),
+		nintendo ? ICON_PF_MINUS : (xbox ? ICON_PF_SHARE_CAPTURE : ICON_PF_SELECT_SHARE),
+		nintendo ? ICON_PF_PLUS : (xbox ? ICON_PF_BURGER_MENU : ICON_PF_START),
 	};
 }

@@ -108,7 +108,7 @@ namespace InputManager
 	static float ApplySingleBindingScale(float sensitivity, float deadzone, float value);

 	static void AddHotkeyBindings(SettingsInterface& si, bool is_profile);
-	static void AddPadBindings(SettingsInterface& si, u32 pad, bool is_profile, SettingsInterface* nav_si);
+	static void AddPadBindings(SettingsInterface& si, u32 pad, bool is_profile);
 	static void AddUSBBindings(SettingsInterface& si, u32 port, bool is_profile);
 	static void UpdateContinuedVibration();
 	static void GenerateRelativeMouseEvents();
@@ -874,7 +874,7 @@ void InputManager::AddHotkeyBindings(SettingsInterface& si, bool is_profile)
 	}
 }

-void InputManager::AddPadBindings(SettingsInterface& si, u32 pad_index, bool is_profile, SettingsInterface* nav_si)
+void InputManager::AddPadBindings(SettingsInterface& si, u32 pad_index, bool is_profile)
 {
 	const Pad::ControllerType type = EmuConfig.Pad.Ports[pad_index].Type;

@@ -913,30 +913,30 @@ void InputManager::AddPadBindings(SettingsInterface& si, u32 pad_index, bool is_
 							Pad::SetControllerState(pad_index, bind_index, ApplySingleBindingScale(sensitivity, deadzone, value));
 						}},
 						bi.bind_type, si, section.c_str(), bi.name, is_profile);
-				}

-				// So per-game bindings never affect FullscreenUI navigation.
-				if (nav_si && bi.generic_mapping != GenericInputBinding::Unknown)
-				{
-					for (const std::string& binding_str : nav_si->GetStringList(section.c_str(), bi.name))
+					// Build reverse maps for controller navigation; user bindings take priority over static defaults.
+					if (bi.generic_mapping != GenericInputBinding::Unknown)
 					{
-						InputBindingKey bkey;
-						InputSource* bsrc;
-						if (!ParseBindingAndGetSource(binding_str, &bkey, &bsrc))
-							continue;
+						for (const std::string& binding_str : bindings)
+						{
+							InputBindingKey bkey;
+							InputSource* bsrc;
+							if (!ParseBindingAndGetSource(binding_str, &bkey, &bsrc))
+								continue;

-						if (bkey.source_subtype == InputSubclass::ControllerButton)
-						{
-							s_controller_button_generic_map.emplace(bkey.MaskDirection(), bi.generic_mapping);
-						}
-						else if (bkey.source_subtype == InputSubclass::ControllerAxis)
-						{
-							auto& entry = s_controller_axis_generic_map[bkey.MaskDirection()];
-							// Negate modifier = negative half of axis (e.g. "-Axis0" → LeftStickLeft)
-							if (bkey.modifier == InputModifier::Negate)
-								entry[0] = bi.generic_mapping;
-							else
-								entry[1] = bi.generic_mapping;
+							if (bkey.source_subtype == InputSubclass::ControllerButton)
+							{
+								s_controller_button_generic_map.emplace(bkey.MaskDirection(), bi.generic_mapping);
+							}
+							else if (bkey.source_subtype == InputSubclass::ControllerAxis)
+							{
+								auto& entry = s_controller_axis_generic_map[bkey.MaskDirection()];
+								// Negate modifier = negative half of axis (e.g. "-Axis0" → LeftStickLeft)
+								if (bkey.modifier == InputModifier::Negate)
+									entry[0] = bi.generic_mapping;
+								else
+									entry[1] = bi.generic_mapping;
+							}
 						}
 					}
 				}
@@ -1312,42 +1312,27 @@ bool InputManager::PreprocessEvent(InputBindingKey key, float value, GenericInpu
 	}
 	else if (key.source_subtype == InputSubclass::ControllerButton)
 	{
-		// Static table takes priority; falls back to the Shared/global map only if the source has none (e.g. DInput).
-		GenericInputBinding resolved = generic_key;
-		if (resolved == GenericInputBinding::Unknown)
-		{
-			const auto it = s_controller_button_generic_map.find(key.MaskDirection());
-			if (it != s_controller_button_generic_map.end())
-				resolved = it->second;
-		}
+		// User binding takes priority; fall back to the generic_key passed by the source (static table).
+		const auto it = s_controller_button_generic_map.find(key.MaskDirection());
+		const GenericInputBinding resolved = (it != s_controller_button_generic_map.end()) ? it->second : generic_key;
 		if (resolved != GenericInputBinding::Unknown)
 		{
 			const u32 controller_id = (static_cast<u32>(key.source_type) << 8) | key.source_index;
-			const InputLayout layout = s_input_sources[static_cast<u32>(key.source_type)]->GetControllerLayout(key.source_index);
+			const InputLayout layout = s_input_sources[static_cast<u32>(InputSourceType::SDL)]->GetControllerLayout(key.source_index);
 			if (ImGuiManager::ProcessGenericInputEvent(resolved, layout, value, controller_id) && value != 0.0f)
 				return true;
 		}
 	}
 	else if (key.source_subtype == InputSubclass::ControllerAxis)
 	{
-		// Same priority as above; map only fills in directions the source couldn't resolve.
-		GenericInputBinding neg = axis_neg_key;
-		GenericInputBinding pos = axis_pos_key;
-		if (neg == GenericInputBinding::Unknown || pos == GenericInputBinding::Unknown)
-		{
-			const auto it = s_controller_axis_generic_map.find(key.MaskDirection());
-			if (it != s_controller_axis_generic_map.end())
-			{
-				if (neg == GenericInputBinding::Unknown)
-					neg = it->second[0];
-				if (pos == GenericInputBinding::Unknown)
-					pos = it->second[1];
-			}
-		}
+		// User binding takes priority; fall back to the neg/pos keys passed by the source (static table).
+		const auto it = s_controller_axis_generic_map.find(key.MaskDirection());
+		const GenericInputBinding neg = (it != s_controller_axis_generic_map.end()) ? it->second[0] : axis_neg_key;
+		const GenericInputBinding pos = (it != s_controller_axis_generic_map.end()) ? it->second[1] : axis_pos_key;
 		if (neg != GenericInputBinding::Unknown || pos != GenericInputBinding::Unknown)
 		{
 			const u32 controller_id = (static_cast<u32>(key.source_type) << 8) | key.source_index;
-			const InputLayout layout = s_input_sources[static_cast<u32>(key.source_type)]->GetControllerLayout(key.source_index);
+			const InputLayout layout = s_input_sources[static_cast<u32>(InputSourceType::SDL)]->GetControllerLayout(key.source_index);
 			ImGuiManager::ProcessGenericAxisEvent(neg, pos, layout, value, controller_id);
 		}
 	}
@@ -1634,11 +1619,10 @@ void InputManager::ReloadBindings(SettingsInterface& si, SettingsInterface& bind
 	// Hotkeys use the base configuration, except if the custom hotkeys option is enabled.
 	AddHotkeyBindings(hotkey_binding_si, is_hotkey_profile);

-	// nav_si is always the base config, so per-game profiles can't affect UI navigation.
-	const LayeredSettingsInterface& lsi = static_cast<LayeredSettingsInterface&>(si);
-	SettingsInterface* base_si = lsi.GetLayer(LayeredSettingsInterface::LAYER_BASE);
+	// If there's an input profile, we load pad bindings from it alone, rather than
+	// falling back to the base configuration.
 	for (u32 pad = 0; pad < Pad::NUM_CONTROLLER_PORTS; pad++)
-		AddPadBindings(binding_si, pad, is_binding_profile, base_si);
+		AddPadBindings(binding_si, pad, is_binding_profile);

 	constexpr float ui_ctrl_range = 100.0f;
 	constexpr float pointer_sensitivity = 0.05f;
@@ -52,8 +52,7 @@ enum class InputLayout : u8
 	Unknown,
 	Xbox,
 	Playstation,
-	Nintendo,
-	Generic
+	Nintendo
 };

 enum class InputModifier : u32
@@ -225,38 +225,6 @@ static constexpr const char* s_sdl_button_names[] = {
 	"Misc 5", // SDL_GAMEPAD_BUTTON_MISC5
 	"Misc 6", // SDL_GAMEPAD_BUTTON_MISC6
 };
-static constexpr const char* s_sdl_button_standard_names[] = {
-	"A", // SDL_GAMEPAD_BUTTON_SOUTH
-	"B", // SDL_GAMEPAD_BUTTON_EAST
-	"X", // SDL_GAMEPAD_BUTTON_WEST
-	"Y", // SDL_GAMEPAD_BUTTON_NORTH
-};
-static constexpr const char* s_sdl_button_xbox360_names[] = {
-	nullptr, // SDL_GAMEPAD_BUTTON_SOUTH
-	nullptr, // SDL_GAMEPAD_BUTTON_EAST
-	nullptr, // SDL_GAMEPAD_BUTTON_WEST
-	nullptr, // SDL_GAMEPAD_BUTTON_NORTH
-	nullptr, // SDL_GAMEPAD_BUTTON_BACK
-	nullptr, // SDL_GAMEPAD_BUTTON_GUIDE
-	nullptr, // SDL_GAMEPAD_BUTTON_START
-	nullptr, // SDL_GAMEPAD_BUTTON_LEFT_STICK
-	nullptr, // SDL_GAMEPAD_BUTTON_RIGHT_STICK
-	"LB", // SDL_GAMEPAD_BUTTON_LEFT_SHOULDER
-	"RB", // SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER
-};
-static constexpr const char* s_sdl_button_xboxone_names[] = {
-	nullptr, // SDL_GAMEPAD_BUTTON_SOUTH
-	nullptr, // SDL_GAMEPAD_BUTTON_EAST
-	nullptr, // SDL_GAMEPAD_BUTTON_WEST
-	nullptr, // SDL_GAMEPAD_BUTTON_NORTH
-	"View", // SDL_GAMEPAD_BUTTON_BACK
-	"Xbox", // SDL_GAMEPAD_BUTTON_GUIDE
-	"Menu", // SDL_GAMEPAD_BUTTON_START
-	nullptr, // SDL_GAMEPAD_BUTTON_LEFT_STICK
-	nullptr, // SDL_GAMEPAD_BUTTON_RIGHT_STICK
-	"LB", // SDL_GAMEPAD_BUTTON_LEFT_SHOULDER
-	"RB", // SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER
-};
 static constexpr const char* s_sdl_button_ps3_names[] = {
 	"Cross", // SDL_GAMEPAD_BUTTON_SOUTH
 	"Circle", // SDL_GAMEPAD_BUTTON_EAST
@@ -301,39 +269,26 @@ static constexpr const char* s_sdl_button_ps5_names[] = {
 	nullptr, // SDL_GAMEPAD_BUTTON_DPAD_RIGHT
 	"Mute", // SDL_GAMEPAD_BUTTON_MISC1
 };
-static constexpr const char* s_sdl_button_nintendo_names[] = {
-	"B", // SDL_GAMEPAD_BUTTON_SOUTH
-	"A", // SDL_GAMEPAD_BUTTON_EAST
-	"Y", // SDL_GAMEPAD_BUTTON_WEST
-	"X", // SDL_GAMEPAD_BUTTON_NORTH
-	"Minus", // SDL_GAMEPAD_BUTTON_BACK
-	"Home", // SDL_GAMEPAD_BUTTON_GUIDE
-	"Plus", // SDL_GAMEPAD_BUTTON_START
-	"Left Stick", // SDL_GAMEPAD_BUTTON_LEFT_STICK
-	"Right Stick", // SDL_GAMEPAD_BUTTON_RIGHT_STICK
-	"L", // SDL_GAMEPAD_BUTTON_LEFT_SHOULDER
-	"R", // SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER
-};

 static constexpr const char* const* s_sdl_button_names_list[] = {
 	s_sdl_button_names, // SDL_GAMEPAD_TYPE_UNKNOWN
-	s_sdl_button_standard_names, // SDL_GAMEPAD_TYPE_STANDARD
-	s_sdl_button_xbox360_names, // SDL_GAMEPAD_TYPE_XBOX360
-	s_sdl_button_xboxone_names, // SDL_GAMEPAD_TYPE_XBOXONE
+	s_sdl_button_names, // SDL_GAMEPAD_TYPE_STANDARD
+	s_sdl_button_names, // SDL_GAMEPAD_TYPE_XBOX360
+	s_sdl_button_names, // SDL_GAMEPAD_TYPE_XBOXONE
 	s_sdl_button_ps3_names, // SDL_GAMEPAD_TYPE_PS3
 	s_sdl_button_ps4_names, // SDL_GAMEPAD_TYPE_PS4
 	s_sdl_button_ps5_names, // SDL_GAMEPAD_TYPE_PS5
-	s_sdl_button_nintendo_names, // SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO
+	// Switch
 };
 static constexpr size_t s_sdl_button_namesize_list[] = {
 	std::size(s_sdl_button_names), // SDL_GAMEPAD_TYPE_UNKNOWN
-	std::size(s_sdl_button_standard_names), // SDL_GAMEPAD_TYPE_STANDARD
-	std::size(s_sdl_button_xbox360_names), // SDL_GAMEPAD_TYPE_XBOX360
-	std::size(s_sdl_button_xboxone_names), // SDL_GAMEPAD_TYPE_XBOXONE
+	std::size(s_sdl_button_names), // SDL_GAMEPAD_TYPE_STANDARD
+	std::size(s_sdl_button_names), // SDL_GAMEPAD_TYPE_XBOX360
+	std::size(s_sdl_button_names), // SDL_GAMEPAD_TYPE_XBOXONE
 	std::size(s_sdl_button_ps3_names), // SDL_GAMEPAD_TYPE_PS3
 	std::size(s_sdl_button_ps4_names), // SDL_GAMEPAD_TYPE_PS4
 	std::size(s_sdl_button_ps5_names), // SDL_GAMEPAD_TYPE_PS5
-	std::size(s_sdl_button_nintendo_names), // SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO
+	// Switch
 };

 static constexpr const char* s_sdl_face_button_icons[] = {
@@ -353,52 +308,12 @@ static constexpr const char* s_sdl_button_icons[] = {
 	ICON_PF_BUTTON_LEFT_X, // SDL_GAMEPAD_BUTTON_WEST
 	ICON_PF_BUTTON_UP_Y, // SDL_GAMEPAD_BUTTON_NORTH
 	ICON_PF_SHARE_CAPTURE, // SDL_GAMEPAD_BUTTON_BACK
-	ICON_PF_HOME_MENU, // SDL_GAMEPAD_BUTTON_GUIDE
+	ICON_PF_XBOX, // SDL_GAMEPAD_BUTTON_GUIDE
 	ICON_PF_BURGER_MENU, // SDL_GAMEPAD_BUTTON_START
 	ICON_PF_LEFT_ANALOG_CLICK, // SDL_GAMEPAD_BUTTON_LEFT_STICK
 	ICON_PF_RIGHT_ANALOG_CLICK, // SDL_GAMEPAD_BUTTON_RIGHT_STICK
 	ICON_PF_LEFT_SHOULDER_LB, // SDL_GAMEPAD_BUTTON_LEFT_SHOULDER
 	ICON_PF_RIGHT_SHOULDER_RB, // SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER
-	ICON_PF_DPAD_UP, // SDL_GAMEPAD_BUTTON_DPAD_UP
-	ICON_PF_DPAD_DOWN, // SDL_GAMEPAD_BUTTON_DPAD_DOWN
-	ICON_PF_DPAD_LEFT, // SDL_GAMEPAD_BUTTON_DPAD_LEFT
-	ICON_PF_DPAD_RIGHT, // SDL_GAMEPAD_BUTTON_DPAD_RIGHT
-};
-static constexpr const char* s_sdl_button_standard_icons[] = {
-	ICON_PF_BUTTON_A, // SDL_GAMEPAD_BUTTON_SOUTH
-	ICON_PF_BUTTON_B, // SDL_GAMEPAD_BUTTON_EAST
-	ICON_PF_BUTTON_X, // SDL_GAMEPAD_BUTTON_WEST
-	ICON_PF_BUTTON_Y, // SDL_GAMEPAD_BUTTON_NORTH
-};
-static constexpr const char* s_sdl_button_xbox360_icons[] = {
-	ICON_PF_BUTTON_A, // SDL_GAMEPAD_BUTTON_SOUTH
-	ICON_PF_BUTTON_B, // SDL_GAMEPAD_BUTTON_EAST
-	ICON_PF_BUTTON_X, // SDL_GAMEPAD_BUTTON_WEST
-	ICON_PF_BUTTON_Y, // SDL_GAMEPAD_BUTTON_NORTH
-	ICON_PF_JOYCON_DPAD_LEFT, // SDL_GAMEPAD_BUTTON_BACK
-	ICON_PF_XBOX, // SDL_GAMEPAD_BUTTON_GUIDE
-	ICON_PF_JOYCON_DPAD_RIGHT, // SDL_GAMEPAD_BUTTON_START
-	nullptr, // SDL_GAMEPAD_BUTTON_LEFT_STICK
-	nullptr, // SDL_GAMEPAD_BUTTON_RIGHT_STICK
-	nullptr, // SDL_GAMEPAD_BUTTON_LEFT_SHOULDER
-	nullptr, // SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER
-	ICON_PF_XBOX_DPAD_UP, // SDL_GAMEPAD_BUTTON_DPAD_UP
-	ICON_PF_XBOX_DPAD_DOWN, // SDL_GAMEPAD_BUTTON_DPAD_DOWN
-	ICON_PF_XBOX_DPAD_LEFT, // SDL_GAMEPAD_BUTTON_DPAD_LEFT
-	ICON_PF_XBOX_DPAD_RIGHT, // SDL_GAMEPAD_BUTTON_DPAD_RIGHT
-};
-static constexpr const char* s_sdl_button_xboxone_icons[] = {
-	ICON_PF_BUTTON_A, // SDL_GAMEPAD_BUTTON_SOUTH
-	ICON_PF_BUTTON_B, // SDL_GAMEPAD_BUTTON_EAST
-	ICON_PF_BUTTON_X, // SDL_GAMEPAD_BUTTON_WEST
-	ICON_PF_BUTTON_Y, // SDL_GAMEPAD_BUTTON_NORTH
-	nullptr, // SDL_GAMEPAD_BUTTON_BACK
-	ICON_PF_XBOX, // SDL_GAMEPAD_BUTTON_GUIDE
-	nullptr, // SDL_GAMEPAD_BUTTON_START
-	nullptr, // SDL_GAMEPAD_BUTTON_LEFT_STICK
-	nullptr, // SDL_GAMEPAD_BUTTON_RIGHT_STICK
-	nullptr, // SDL_GAMEPAD_BUTTON_LEFT_SHOULDER
-	nullptr, // SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER
 	ICON_PF_XBOX_DPAD_UP, // SDL_GAMEPAD_BUTTON_DPAD_UP
 	ICON_PF_XBOX_DPAD_DOWN, // SDL_GAMEPAD_BUTTON_DPAD_DOWN
 	ICON_PF_XBOX_DPAD_LEFT, // SDL_GAMEPAD_BUTTON_DPAD_LEFT
@@ -487,9 +402,9 @@ static constexpr const char* s_sdl_button_nintendo_icons[] = {
 };
 static constexpr const char* const* s_sdl_button_icons_list[] = {
 	s_sdl_button_icons, // SDL_GAMEPAD_TYPE_UNKNOWN
-	s_sdl_button_standard_icons, // SDL_GAMEPAD_TYPE_STANDARD
-	s_sdl_button_xbox360_icons, // SDL_GAMEPAD_TYPE_XBOX360
-	s_sdl_button_xboxone_icons, // SDL_GAMEPAD_TYPE_XBOXONE
+	s_sdl_button_icons, // SDL_GAMEPAD_TYPE_STANDARD
+	s_sdl_button_icons, // SDL_GAMEPAD_TYPE_XBOX360
+	s_sdl_button_icons, // SDL_GAMEPAD_TYPE_XBOXONE
 	s_sdl_button_ps3_icons, // SDL_GAMEPAD_TYPE_PS3
 	s_sdl_button_ps4_icons, // SDL_GAMEPAD_TYPE_PS4
 	s_sdl_button_ps5_icons, // SDL_GAMEPAD_TYPE_PS5
@@ -497,9 +412,9 @@ static constexpr const char* const* s_sdl_button_icons_list[] = {
 };
 static constexpr size_t s_sdl_button_iconsize_list[] = {
 	std::size(s_sdl_button_icons), // SDL_GAMEPAD_TYPE_UNKNOWN
-	std::size(s_sdl_button_standard_icons), // SDL_GAMEPAD_TYPE_STANDARD
-	std::size(s_sdl_button_xbox360_icons), // SDL_GAMEPAD_TYPE_XBOX360
-	std::size(s_sdl_button_xboxone_icons), // SDL_GAMEPAD_TYPE_XBOXONE
+	std::size(s_sdl_button_icons), // SDL_GAMEPAD_TYPE_STANDARD
+	std::size(s_sdl_button_icons), // SDL_GAMEPAD_TYPE_XBOX360
+	std::size(s_sdl_button_icons), // SDL_GAMEPAD_TYPE_XBOXONE
 	std::size(s_sdl_button_ps3_icons), // SDL_GAMEPAD_TYPE_PS3
 	std::size(s_sdl_button_ps4_icons), // SDL_GAMEPAD_TYPE_PS4
 	std::size(s_sdl_button_ps5_icons), // SDL_GAMEPAD_TYPE_PS5
@@ -1119,7 +1034,7 @@ TinyString SDLInputSource::ConvertKeyToString(InputBindingKey key, bool display,
 				if (it != m_controllers.end())
 					type = SDL_GetRealGamepadType(it->gamepad);

-				if (type > SDL_GAMEPAD_TYPE_UNKNOWN && type < std::size(s_sdl_button_names_list) &&
+				if (type > SDL_GAMEPAD_TYPE_STANDARD && type < std::size(s_sdl_button_names_list) &&
 					key.data < s_sdl_button_namesize_list[type] && s_sdl_button_names_list[type][key.data] != nullptr)
 				{
 					ret.format("SDL-{} {}", static_cast<u32>(key.source_index), s_sdl_button_names_list[type][key.data]);
@@ -1196,8 +1111,6 @@ TinyString SDLInputSource::ConvertKeyToIcon(InputBindingKey key)
 			type = SDL_GAMEPAD_TYPE_PS5;
 		else if (glyph_preference == InputLayout::Nintendo)
 			type = SDL_GAMEPAD_TYPE_NINTENDO_SWITCH_PRO;
-		else if (glyph_preference == InputLayout::Generic)
-			type = SDL_GAMEPAD_TYPE_UNKNOWN;

 		if (key.source_subtype == InputSubclass::ControllerAxis)
 		{
@@ -1228,7 +1141,7 @@ TinyString SDLInputSource::ConvertKeyToIcon(InputBindingKey key)
 		}
 		else if (key.source_subtype == InputSubclass::ControllerButton)
 		{
-			if (type > SDL_GAMEPAD_TYPE_UNKNOWN && type < std::size(s_sdl_button_icons_list) &&
+			if (type > SDL_GAMEPAD_TYPE_STANDARD && type < std::size(s_sdl_button_icons_list) &&
 				key.data < s_sdl_button_iconsize_list[type] && s_sdl_button_icons_list[type][key.data] != nullptr)
 			{
 				ret.format("SDL-{}  {}", static_cast<u32>(key.source_index), s_sdl_button_icons_list[type][key.data]);
@@ -1236,7 +1149,7 @@ TinyString SDLInputSource::ConvertKeyToIcon(InputBindingKey key)
 			else if (key.data < 4)
 			{
 				SDL_GamepadButtonLabel label = SDL_GAMEPAD_BUTTON_LABEL_UNKNOWN;
-				if (glyph_preference != InputLayout::Generic && it != m_controllers.end() && it->gamepad)
+				if (it != m_controllers.end() && it->gamepad)
 					label = SDL_GetGamepadButtonLabel(it->gamepad, static_cast<SDL_GamepadButton>(key.data));

 				if (label > SDL_GAMEPAD_BUTTON_LABEL_UNKNOWN && label < std::size(s_sdl_face_button_icons))
@@ -79,7 +79,7 @@ static const char* s_button_names[XInputSource::NUM_BUTTONS] = {
 	"B", // XINPUT_GAMEPAD_B
 	"X", // XINPUT_GAMEPAD_X
 	"Y", // XINPUT_GAMEPAD_Y
-	"Xbox", // XINPUT_GAMEPAD_GUIDE
+	"Guide", // XINPUT_GAMEPAD_GUIDE
 };

 static const u16 s_button_masks[XInputSource::NUM_BUTTONS] = {
@@ -387,7 +387,7 @@ TinyString XInputSource::ConvertKeyToIcon(InputBindingKey key)
 {
 	TinyString ret;

-	if (key.source_type == InputSourceType::XInput)
+	if (key.source_type == InputSourceType::SDL)
 	{
 		if (key.source_subtype == InputSubclass::ControllerAxis)
 		{
@@ -83,9 +83,8 @@ static std::string hostRoot;

 void Hle_SetHostRoot(const char* bootFilename)
 {
-	std::string path = Path::RealPath(bootFilename);
-	hostRoot = Path::ToNativePath(Path::GetDirectory(path));
-	Console.WriteLn("HLE Host: Set 'host:' root path to: %s", hostRoot.c_str());
+	hostRoot = Path::ToNativePath(Path::GetDirectory(bootFilename));
+	Console.WriteLn("HLE Host: Set 'host:' root path to: %s\n", hostRoot.c_str());
 }

 void Hle_ClearHostRoot()
@@ -3,7 +3,6 @@

 #include "Common.h"

-#include "common/Path.h"
 #include "common/StringUtil.h"
 #include "ps2/BiosTools.h"
 #include "R5900.h"
@@ -672,8 +671,7 @@ void eeloadHook()
 		const std::string& elf_override = VMManager::Internal::GetELFOverride();
 		if (!elf_override.empty())
 		{
-			// The host: root should be directory containg the elf, so get only the filename part
-			elfname = fmt::format("host:{}", Path::GetFileName(elf_override));
+			elfname = fmt::format("host:{}", elf_override);
 		}
 		else
 		{
@@ -3,4 +3,4 @@

 /// Version number for GS and other shaders. Increment whenever any of the contents of the
 /// shaders change, to invalidate the cache.
-static constexpr u32 SHADER_CACHE_VERSION = 109; // Last changed in PR 14795
+static constexpr u32 SHADER_CACHE_VERSION = 108; // Last changed in PR 14688
@@ -25,10 +25,10 @@ struct mVU_Globals
 	u32   one     [4] = __four(0x3f800000);
 	u32   Pi4     [4] = __four(0x3f490fdb);
 	u32   T1      [4] = __four(0x3f7ffff5);
-	u32   T2      [4] = __four(0xbeaaa61c);
-	u32   T3      [4] = __four(0x3e4c40a6);
-	u32   T4      [4] = __four(0xbe0e6c63);
-	u32   T5      [4] = __four(0x3dc577df);
+	u32   T5      [4] = __four(0xbeaaa61c);
+	u32   T2      [4] = __four(0x3e4c40a6);
+	u32   T3      [4] = __four(0xbe0e6c63);
+	u32   T4      [4] = __four(0x3dc577df);
 	u32   T6      [4] = __four(0xbd6501c4);
 	u32   T7      [4] = __four(0x3cb31652);
 	u32   T8      [4] = __four(0xbb84d7e7);
Author	SHA1	Message	Date
$refractionpcsx2$ refractionpcsx2	c1fec35e92	GS/TC: Update alpha channel of 24bit target is alpha is dirty	2026-07-28 20:19:18 +01:00
$refractionpcsx2$ refractionpcsx2	2a523635ea	GS/TC: Disallow badly misaligned GPU CLUT textures	2026-07-28 20:18:19 +01:00
$refractionpcsx2$ refractionpcsx2	a63bd58525	GS/TC: Detect alpha channel source width mismatches	2026-07-28 20:17:35 +01:00
$refractionpcsx2$ refractionpcsx2	f630422f6c	GS/HW: Consider FBMSK combos when using CSBW	2026-07-28 20:13:09 +01:00