CI: Use the upstream Flatpak action

https://github.com/flathub-infra/flatpak-github-actions/issues/17
[ci skip] Qt: Update Base Translation.
2026-01-31 01:15:24 +01:00 · 2025-04-21 11:21:10 -04:00 · 2025-04-20 09:37:04 -04:00 · 2025-04-19 17:37:54 +02:00 · 2025-04-19 17:37:54 +02:00 · 2025-04-19 17:05:22 +02:00
41 changed files with 907 additions and 610 deletions
--- a/.github/workflows/linux_build_flatpak.yml
+++ b/.github/workflows/linux_build_flatpak.yml
@@ -96,7 +96,7 @@ jobs:

      - name: Build Flatpak (beta)
        if: ${{ inputs.stableBuild == false || inputs.stableBuild == 'false' }}
-        uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
+        uses: flatpak/flatpak-github-actions/flatpak-builder@10a3c29f0162516f0f68006be14c92f34bd4fa6c
        with:
          bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
          upload-artifact: false
@@ -112,7 +112,7 @@ jobs:

      - name: Build Flatpak (stable)
        if: ${{ inputs.stableBuild == true || inputs.stableBuild == 'true' }}
-        uses: flathub-infra/flatpak-github-actions/flatpak-builder@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
+        uses: flatpak/flatpak-github-actions/flatpak-builder@10a3c29f0162516f0f68006be14c92f34bd4fa6c
        with:
          bundle: ${{ steps.artifact-metadata.outputs.artifact-name }}.flatpak
          upload-artifact: false
@@ -132,7 +132,7 @@ jobs:

      - name: Push to Flathub (beta)
        if: ${{ inputs.publish == true && (inputs.stableBuild == false || inputs.stableBuild == 'false') }}
-        uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
+        uses: flatpak/flatpak-github-actions/flatpak-builder@10a3c29f0162516f0f68006be14c92f34bd4fa6c
        with:
          flat-manager-url: https://hub.flathub.org/
          repository: beta
@@ -141,7 +141,7 @@ jobs:

      - name: Push to Flathub (stable)
        if: ${{ inputs.publish == true && (inputs.stableBuild == true || inputs.stableBuild == 'true') }}
-        uses: flathub-infra/flatpak-github-actions/flat-manager@23796715b3dfa4c86ddf50cf29c3cc8b3c82dca8
+        uses: flatpak/flatpak-github-actions/flatpak-builder@10a3c29f0162516f0f68006be14c92f34bd4fa6c
        with:
          flat-manager-url: https://hub.flathub.org/
          repository: stable
--- a/bin/resources/GameIndex.yaml
+++ b/bin/resources/GameIndex.yaml
@@ -1274,7 +1274,7 @@ SCAJ-10015:
  gsHWFixes:
    alignSprite: 1 # Fixes vertical lines.
    textureInsideRT: 1 # Fixes post effects.
-    getSkipCount: "GSC_Tekken5" # Fixes upscaling grid, same engine.
+    getSkipCount: "GSC_NamcoGames" # Fixes upscaling grid, same engine.
 SCAJ-20001:
  name: "Ratchet & Clank"
  region: "NTSC-Unk"
@@ -1987,7 +1987,7 @@ SCAJ-20125:
    alignSprite: 1
    halfPixelOffset: 4 # Align post.
    nativeScaling: 1 # Fixes depth of field effect.
-    getSkipCount: "GSC_Tekken5"
+    getSkipCount: "GSC_NamcoGames"
 SCAJ-20126:
  name: "Tekken 5"
  region: "NTSC-Unk"
@@ -1998,7 +1998,7 @@ SCAJ-20126:
    alignSprite: 1
    halfPixelOffset: 4 # Align post.
    nativeScaling: 1 # Fixes depth of field effect.
-    getSkipCount: "GSC_Tekken5"
+    getSkipCount: "GSC_NamcoGames"
 SCAJ-20127:
  name: "EyeToy - Play 2 [with Camera]"
  region: "NTSC-Unk"
@@ -2248,7 +2248,7 @@ SCAJ-20163:
  gsHWFixes:
    halfPixelOffset: 2 # Fixes ghosting.
    autoFlush: 2 # Fixes post lighting.
-    getSkipCount: "GSC_Tekken5" # Fixes upscaling grid, same engine.
+    getSkipCount: "GSC_NamcoGames" # Fixes upscaling grid, same engine.
 SCAJ-20164:
  name: "Kingdom Hearts II"
  region: "NTSC-Unk"
@@ -2477,7 +2477,7 @@ SCAJ-20199:
    alignSprite: 1
    halfPixelOffset: 4 # Align post.
    nativeScaling: 1 # Fixes depth of field effect.
-    getSkipCount: "GSC_Tekken5"
+    getSkipCount: "GSC_NamcoGames"
 SCAJ-25002:
  name: "Shinobi"
  region: "NTSC-Unk"
@@ -4188,7 +4188,7 @@ SCED-53538:
    alignSprite: 1
    halfPixelOffset: 4 # Align post.
    nativeScaling: 1 # Fixes depth of field effect.
-    getSkipCount: "GSC_Tekken5"
+    getSkipCount: "GSC_NamcoGames"
 SCED-53611:
  name: "Official PlayStation 2 Magazine - German Kids Special"
  region: "PAL-G"
@@ -4578,6 +4578,17 @@ SCED-55120:
 SCED-55432:
  name: "Buzz! Junior - Ace Racers [Demo]"
  region: "PAL-M15"
+SCES-00000:
+  name: "Ico [Preview]"
+  region: "PAL-M5"
+  compat: 5
+  clampModes:
+    eeClampMode: 2 # Otherwise freezes in various spots, check full intro.
+    vuClampMode: 1 # Otherwise camera does not focus correctly on main character.
+  gsHWFixes:
+    mipmap: 1
+    halfPixelOffset: 1 # Fixes effect misalignment.
+    moveHandler: "MV_Ico" # Fixes depth buffer post-processing.
 SCES-50000:
  name: "Ridge Racer V"
  region: "PAL-M5"
@@ -5816,7 +5827,7 @@ SCES-53202:
    alignSprite: 1
    halfPixelOffset: 4 # Align post.
    nativeScaling: 1 # Fixes depth of field effect.
-    getSkipCount: "GSC_Tekken5"
+    getSkipCount: "GSC_NamcoGames"
 SCES-53247:
  name: "WRC Rally Evolved"
  region: "PAL-M8"
@@ -7274,7 +7285,7 @@ SCKA-20049:
    alignSprite: 1
    halfPixelOffset: 4 # Align post.
    nativeScaling: 1 # Fixes depth of field effect.
-    getSkipCount: "GSC_Tekken5"
+    getSkipCount: "GSC_NamcoGames"
 SCKA-20050:
  name: "Tales of Legendia"
  region: "NTSC-K"
@@ -7501,7 +7512,7 @@ SCKA-20081:
    alignSprite: 1
    halfPixelOffset: 4 # Align post.
    nativeScaling: 1 # Fixes depth of field effect.
-    getSkipCount: "GSC_Tekken5"
+    getSkipCount: "GSC_NamcoGames"
 SCKA-20082:
  name: "Ace Combat 5 - The Unsung War [PlayStation 2 Big Hit Series]"
  region: "NTSC-K"
@@ -54877,7 +54888,7 @@ SLPS-20485:
  gsHWFixes:
    alignSprite: 1 # Fixes vertical lines.
    textureInsideRT: 1 # Fixes post effects.
-    getSkipCount: "GSC_Tekken5" # Fixes upscaling grid, same engine.
+    getSkipCount: "GSC_NamcoGames" # Fixes upscaling grid, same engine.
 SLPS-20486:
  name: "太鼓の達人 ドカッ！と大盛り七代目 [ソフト単体]"
  name-sort: "たいこのたつじん どかっ！とおおもりななだいめ [そふとたんたい]"
@@ -54886,7 +54897,7 @@ SLPS-20486:
  gsHWFixes:
    alignSprite: 1 # Fixes vertical lines.
    textureInsideRT: 1 # Fixes post effects.
-    getSkipCount: "GSC_Tekken5" # Fixes upscaling grid, same engine.
+    getSkipCount: "GSC_NamcoGames" # Fixes upscaling grid, same engine.
 SLPS-20487:
  name: "パチスロキング！ 科学忍者隊ガッチャマン"
  name-sort: "ぱちすろきんぐ！ かがくにんじゃたいがっちゃまん"
@@ -58032,7 +58043,7 @@ SLPS-25510:
    alignSprite: 1 # Fixes vertical lines.
    halfPixelOffset: 4 # Align post.
    nativeScaling: 1 # Fixes depth of field effect.
-    getSkipCount: "GSC_Tekken5"
+    getSkipCount: "GSC_NamcoGames"
 SLPS-25511:
  name: "羅刹 -Alternative-"
  name-sort: "らせつ -Alternative-"
@@ -58473,7 +58484,7 @@ SLPS-25586:
    halfPixelOffset: 4 # Fixes post positioning.
    nativeScaling: 1 # Fixes post effects.
    autoFlush: 2 # Fixes post lighting.
-    getSkipCount: "GSC_Tekken5" # Fixes upscaling grid, same engine.
+    getSkipCount: "GSC_NamcoGames" # Fixes upscaling grid, same engine.
 SLPS-25587:
  name: "シュガシュガルーン 恋もおしゃれもピックアップ！"
  name-sort: "しゅがしゅがるーん こいもおしゃれもぴっくあっぷ！"
@@ -61211,7 +61222,7 @@ SLPS-73223:
    alignSprite: 1 # Fixes vertical lines.
    halfPixelOffset: 4 # Align post.
    nativeScaling: 1 # Fixes depth of field effect.
-    getSkipCount: "GSC_Tekken5"
+    getSkipCount: "GSC_NamcoGames"
 SLPS-73224:
  name: "ゼノサーガ エピソードⅡ [善悪の彼岸] [PlayStation2 the Best] [ディスク1/2]"
  name-sort: "ぜのさーが えぴそーど2 ぜんあくのひがん [PlayStation2 the Best] [でぃすく1/2]"
@@ -61511,7 +61522,7 @@ SLPS-73252:
    halfPixelOffset: 4 # Fixes post positioning.
    nativeScaling: 1 # Fixes post effects.
    autoFlush: 2 # Fixes post lighting.
-    getSkipCount: "GSC_Tekken5" # Fixes upscaling grid, same engine.
+    getSkipCount: "GSC_NamcoGames" # Fixes upscaling grid, same engine.
 SLPS-73253:
  name: "るろうに剣心-明治剣客浪漫譚- 炎上！京都輪廻 [PlayStation2 the Best]"
  name-sort: "るろうにけんしん めいじけんかくろまんたん えんじょう きょうとりんね [PlayStation2 the Best]"
@@ -67238,7 +67249,7 @@ SLUS-21059:
    alignSprite: 1 # Fixes vertical lines.
    halfPixelOffset: 4 # Align post.
    nativeScaling: 1 # Fixes depth of field effect.
-    getSkipCount: "GSC_Tekken5"
+    getSkipCount: "GSC_NamcoGames"
 SLUS-21060:
  name: "WWE SmackDown! vs. RAW"
  region: "NTSC-U"
@@ -67790,7 +67801,7 @@ SLUS-21160:
    alignSprite: 1 # Fixes vertical lines.
    halfPixelOffset: 4 # Align post.
    nativeScaling: 1 # Fixes depth of field effect.
-    getSkipCount: "GSC_Tekken5"
+    getSkipCount: "GSC_NamcoGames"
 SLUS-21161:
  name: "Fight Night Round 2"
  region: "NTSC-U"
@@ -69376,7 +69387,7 @@ SLUS-21386:
    halfPixelOffset: 4 # Fixes post positioning.
    nativeScaling: 1 # Fixes post effects.
    autoFlush: 2 # Fixes post lighting.
-    getSkipCount: "GSC_Tekken5" # Fixes upscaling grid, same engine.
+    getSkipCount: "GSC_NamcoGames" # Fixes upscaling grid, same engine.
 SLUS-21387:
  name: "Warship Gunner 2"
  region: "NTSC-U"
@@ -69521,6 +69532,9 @@ SLUS-21410:
  name: "Mortal Kombat - Armageddon"
  region: "NTSC-U"
  compat: 5
+  memcardFilters: # Saves from the non-Premium can be imported
+    - "SLUS-21410"
+    - "SLUS-21543"
 SLUS-21411:
  name: "M2 Rock"
  region: "NTSC-U"
@@ -70163,6 +70177,9 @@ SLUS-21543:
  name: "Mortal Kombat - Armageddon [Premium Edition]"
  region: "NTSC-U"
  compat: 5
+  memcardFilters: # Saves from the non-Premium can be imported
+    - "SLUS-21543"
+    - "SLUS-21410"
 SLUS-21544:
  name: "Fantastic 4 - Rise of Silver Surfer"
  region: "NTSC-U"
--- a/bin/resources/RedumpDatabase.yaml
+++ b/bin/resources/RedumpDatabase.yaml
@@ -1749,7 +1749,7 @@
 - hashes:
  - md5: f95ea9eb021181b888229df60ba8effd
    size: 2159050752
-  name: Shadow the Hedgehog (Europe, Australia) (En,Fr,De,Es,It)
+  name: Shadow the Hedgehog (Europe, Australia) (En,Ja,Fr,De,Es,It)
  serial: SLES-53542
  version: '1.01'
 - hashes:
@@ -8524,7 +8524,7 @@
 - hashes:
  - md5: ce030f48dcb588682902b5a569baa24e
    size: 4677795840
-  name: 007 - Quantum of Solace (USA)
+  name: 007 - Quantum of Solace (USA) (En,Fr)
  serial: SLUS-21813
  version: '1.00'
 - hashes:
@@ -8620,7 +8620,7 @@
 - hashes:
  - md5: c15a1707d1c89728e0c596b97ba91b27
    size: 4313153536
-  name: Official PlayStation 2 Magazine Sonderausgabe 2004-3 (Germany) (En,Fr,De,Es,It)
+  name: Official PlayStation 2 Magazine - Special Edition 2004-03 (Germany) (En,Fr,De,Es,It)
  serial: SCED-52997
  version: '1.00'
 - hashes:
@@ -8854,7 +8854,7 @@
 - hashes:
  - md5: fab56e6f617b0a64ad35221341bd167c
    size: 3529965568
-  name: Rock Band - Metal Track Pack (USA)
+  name: Rock Band - Metal Track Pack (USA, Canada)
  serial: SLUS-21889
  version: '1.00'
 - hashes:
@@ -9753,7 +9753,7 @@
 - hashes:
  - md5: 63d3e8e5da0305650160bc50f46df87b
    size: 4033478656
-  name: Fight Night Round 3 (Europe) (En,Fr)
+  name: Fight Night Round 3 (Europe, Australia) (En,Fr)
  serial: SLES-53982
  version: '1.00'
 - hashes:
@@ -13331,7 +13331,7 @@
 - hashes:
  - md5: aac303724ce688c8f242245ea0f4b9e4
    size: 877953024
-  name: Tokyo Bus Guide - Kyou kara Kimi mo Untenshu (Japan)
+  name: SuperLite 2000 Vol. 5 - Tokyo Bus Guide - Kyou kara Kimi mo Untenshu (Japan)
  serial: SLPM-65032
  version: '1.04'
 - hashes:
@@ -15880,7 +15880,7 @@
 - hashes:
  - md5: 29e5cf458549ca5321dd0c12619a002b
    size: 3846504448
-  name: Bakugan - Battle Brawlers (USA)
+  name: Bakugan - Battle Brawlers (USA) (En,Fr)
  serial: SLUS-21902
  version: '1.00'
 - hashes:
@@ -20525,7 +20525,7 @@
 - hashes:
  - md5: 2e7fcee5a1333b72eef8a18c7a673e9f
    size: 8539766784
-  name: Guitar Hero - Metallica (USA)
+  name: Guitar Hero - Metallica (USA) (En,Fr)
  serial: SLUS-21843
  version: '1.00'
 - hashes:
@@ -20868,7 +20868,7 @@
 - hashes:
  - md5: 35d939b30458790cf58ddd16ef11e159
    size: 697149264
-  name: Online Start-Up Disc 4.0 - Broadband Only (USA)
+  name: Online Start-Up Disc 4.0 - Broadband Only (USA) (v1.02)
  serial: PBPX-95248
  version: '1.02'
 - hashes:
@@ -21320,8 +21320,7 @@
 - hashes:
  - md5: 4f18266ee64804fc1ba858c5d5bee759
    size: 3782836224
-  name: Official PlayStation 2 Magazine Germany Special Edition 01-2004 (Germany)
-    (En,Fr,De,Es,It)
+  name: Official PlayStation 2 Magazine - Special Edition 2004-01 (Germany) (En,Fr,De,Es,It)
  serial: SCED-52119
  version: '1.01'
 - hashes:
@@ -21764,7 +21763,7 @@
 - hashes:
  - md5: e6159c29d23cd03252e94823045b4ff8
    size: 4071424000
-  name: DJ Hero (USA)
+  name: DJ Hero (USA) (En,Fr)
  serial: SLUS-21909
  version: '1.00'
 - hashes:
@@ -22190,7 +22189,7 @@
 - hashes:
  - md5: 007f0ccc933f59b65f28c72ad227843d
    size: 4580573184
-  name: Score International Baja 1000 - World Championship Off Road Racing (Europe)
+  name: SCORE International Baja 1000 - World Championship Off Road Racing (Europe)
  serial: SLES-55295
  version: '1.00'
 - hashes:
@@ -22862,7 +22861,7 @@
 - hashes:
  - md5: cadce0add00903396577b5d53cff1929
    size: 4679565312
-  name: Marvel Super Hero Squad (USA)
+  name: Marvel Super Hero Squad (USA) (En,Fr,Es)
  serial: SLUS-21910
  version: '1.00'
 - hashes:
@@ -22946,7 +22945,7 @@
 - hashes:
  - md5: 77ae418d710142291b5d6eb5d5d904d1
    size: 3007021056
-  name: Buzz! The Schools Quiz (Europe)
+  name: Buzz! The Schools Quiz (UK) (v2.00)
  serial: SCES-54941
  version: '2.00'
 - hashes:
@@ -30411,7 +30410,7 @@
 - hashes:
  - md5: 01abdbe56de95af5b5379cf7fea1bec0
    size: 3683680256
-  name: Ratchet & Clank 2 - Gagaga! Ginga no Commando-ssu (Japan, Asia)
+  name: Ratchet & Clank 2 - Gagaga! Ginga no Commando ssu (Japan, Asia)
  serial: SCAJ-20052
  version: '1.00'
 - hashes:
@@ -32035,7 +32034,7 @@
 - hashes:
  - md5: 47e03c7b246239330d5e41efb5160fda
    size: 1328939008
-  name: Nickelodeon Bob L'eponge - Silence on Tourne! (France)
+  name: Nickelodeon Bob L'eponge - Silence on Tourne ! (France)
  serial: SLES-53495
  version: '1.00'
 - hashes:
@@ -33603,19 +33602,19 @@
 - hashes:
  - md5: ac71dddc4a60475a689fcb6f1836e607
    size: 4307582976
-  name: Buzz! The Big Quiz (Europe) (En,Fr,Nl)
+  name: Buzz! The Big Quiz (Belgium, Netherlands) (En,Fr,Nl)
  serial: SCES-53925
  version: '1.00'
 - hashes:
  - md5: 0f457023f2a436d38a0cd53599115846
    size: 4611080192
-  name: Buzz! The Mega Quiz (Europe) (En,Fr,Nl)
+  name: Buzz! The Mega Quiz (Belgium, Netherlands) (En,Fr,Nl)
  serial: SCES-54505
  version: '1.00'
 - hashes:
  - md5: 409302dffc2512d1ccd2227d17ff6bf2
    size: 4688314368
-  name: Buzz! The Pop Quiz (Europe) (En,Fr,Nl)
+  name: Buzz! The Pop Quiz (Belgium, Netherlands) (En,Fr,Nl)
  serial: SCES-55098
  version: '1.00'
 - hashes:
@@ -34577,7 +34576,7 @@
 - hashes:
  - md5: 4703eb006c9921927145c878acd7324c
    size: 3536748544
-  name: Buzz! The Sports Quiz (Europe) (En,Fr,Nl)
+  name: Buzz! The Sports Quiz (Belgium, Netherlands) (En,Fr,Nl)
  serial: SCES-54265
  version: '1.00'
 - hashes:
@@ -36547,7 +36546,7 @@
 - hashes:
  - md5: fa7523e49dc9825589504430857c5c25
    size: 564202464
-  name: LEGO Island Xtreme Stunts (USA)
+  name: Island Xtreme Stunts (USA)
  serial: SLUS-20575
  version: '1.01'
 - hashes:
@@ -38437,7 +38436,7 @@
 - hashes:
  - md5: 06553f511a16b8cc0396bab31cc910a6
    size: 2924576768
-  name: DreamWorks Madagascar - Escape 2 Africa (USA)
+  name: DreamWorks Madagascar - Escape 2 Africa (USA) (En,Fr)
  serial: SLUS-21840
  version: '1.01'
 - hashes:
@@ -39061,7 +39060,7 @@
 - hashes:
  - md5: cc5e862a633532654176096888dfacba
    size: 2679865344
-  name: PES 2011 - Pro Evolution Soccer (USA)
+  name: PES 2011 - Pro Evolution Soccer (USA) (En,Fr,Es,Pt)
  serial: SLUS-21942
  version: '1.00'
 - hashes:
@@ -39355,7 +39354,7 @@
 - hashes:
  - md5: 298ad8520c82f4edbaacb3194bc46d5c
    size: 3530391552
-  name: PES 2010 - Pro Evolution Soccer (USA)
+  name: PES 2010 - Pro Evolution Soccer (USA) (En,Fr,Es,Pt)
  serial: SLUS-21918
  version: '1.02'
 - hashes:
@@ -39421,7 +39420,7 @@
 - hashes:
  - md5: 491a3f6a39ce290de2f6dbb9ba98575f
    size: 2129297408
-  name: PES 2013 - Pro Evolution Soccer (USA)
+  name: PES 2013 - Pro Evolution Soccer (USA) (En,Fr,Es,Pt)
  serial: SLUS-21955
  version: '1.00'
 - hashes:
@@ -39433,7 +39432,7 @@
 - hashes:
  - md5: b2d139590f169442a46d21ed2f8558ab
    size: 2437316608
-  name: PES 2012 - Pro Evolution Soccer (USA)
+  name: PES 2012 - Pro Evolution Soccer (USA) (En,Fr,Es,Pt)
  serial: SLUS-21948
  version: '1.00'
 - hashes:
@@ -39511,7 +39510,7 @@
 - hashes:
  - md5: 6821bded97877694e8cf4ccf9ca64ad4
    size: 4659347456
-  name: Vitamin Z - Welcome Our New Supplement Boys (Japan) (Genteiban)
+  name: VitaminZ - Welcome Our New Supplement Boys (Japan) (Genteiban)
  serial: SLPS-25922
  version: '1.02'
 - hashes:
@@ -39770,7 +39769,7 @@
 - hashes:
  - md5: 6f2533c2ae433f1beac4f1aa3a88f4c6
    size: 4588797952
-  name: AND 1 Streetball (USA) (v1.03)
+  name: AND 1 Streetball (USA) (En,Fr,Es) (v1.03)
  serial: SLUS-21237
  version: '1.03'
 - hashes:
@@ -39902,7 +39901,7 @@
 - hashes:
  - md5: 2d3dd4cd0d8c16e97a1a887b70349658
    size: 4636672000
-  name: Score International Baja 1000 - The Official Game (USA)
+  name: SCORE International Baja 1000 - The Official Game (USA)
  serial: SLUS-21850
  version: '1.00'
 - hashes:
@@ -40463,7 +40462,7 @@
  - md5: 08a63db4f248acdc24cdaa0b9507b854
    size: 2205908992
  name: Umishou (Japan)
-  serial: SLPM-66864
+  serial: FVGK-0001
  version: '1.01'
 - hashes:
  - md5: d3b19450aea4a9688e876fa71830aa77
@@ -40745,7 +40744,7 @@
 - hashes:
  - md5: 9be1477e6c0bd67bb6aff3a02601b4a6
    size: 1534427136
-  name: Freaky Flyers (USA) (Demo)
+  name: Freaky Flyers (USA) (Demo) (Rev 1)
  serial: SLUS-29061
  version: '0.30'
 - hashes:
@@ -41497,7 +41496,7 @@
 - hashes:
  - md5: 6dc613680039ba59d20f8baa61e56fc5
    size: 739706352
-  name: Momotarou Dentetsu 11 - Black Bombee Shutsugen! no Maki (Japan)
+  name: Momotarou Dentetsu 11 - Black Bonby Shutsugen! no Maki (Japan)
  serial: SLPM-62475
  version: '1.01'
 - hashes:
@@ -44241,7 +44240,7 @@
  - md5: 34d981b3883eaeb95c82fbed14dcad26
    size: 3115188224
  name: Harukanaru Toki no Naka de 3 (Japan) (History Box)
-  serial: SLPM-66005
+  serial: SLPM-65849
  version: '1.02'
 - hashes:
  - md5: d8ecac6d03a601d4a81f1389bfe25962
@@ -45207,13 +45206,13 @@
 - hashes:
  - md5: 29a454ebd230549939654022af5db917
    size: 4107206656
-  name: Vitamin X - We are Super Supriment Boys (Japan)
+  name: VitaminX - We are Super Supriment Boys (Japan)
  serial: SLPS-25761
  version: '1.01'
 - hashes:
  - md5: 19cc959d502b7eebae156ee760731454
    size: 4659347456
-  name: Vitamin Z - Welcome Our New Supplement Boys (Japan)
+  name: VitaminZ - Welcome Our New Supplement Boys (Japan)
  serial: SLPS-25923
  version: '1.02'
 - hashes:
@@ -46244,7 +46243,7 @@
 - hashes:
  - md5: ecb21ce06339ab6b628e077f3c03690b
    size: 3962535936
-  name: Suigetsu - Mayoi Gokoro (Japan)
+  name: Suigetsu - Mayoigokoro (Japan)
  serial: SLPM-65751
  version: '1.01'
 - hashes:
@@ -47270,7 +47269,7 @@
 - hashes:
  - md5: 68634f9b74fe47e4a039ada615970ca1
    size: 541969008
-  name: Momotarou Dentetsu 15 - Godai Bombee Toujou! no Maki (Japan) (v2.00)
+  name: Momotarou Dentetsu 15 - Godai Bonby Toujou! no Maki (Japan) (v2.00)
  serial: SLPM-74104
  version: '2.00'
 - hashes:
@@ -49343,8 +49342,7 @@
 - hashes:
  - md5: 72e49d4201496dea3e0851abf58098cf
    size: 4677992448
-  name: Official PlayStation 2 Magazine Germany Special Edition 2003-01 (Germany)
-    (En,De)
+  name: Official PlayStation 2 Magazine - Special Edition 2003-01 (Germany) (En,De)
  serial: SCED-51512
  version: '1.00'
 - hashes:
@@ -49422,7 +49420,7 @@
 - hashes:
  - md5: aa26f473fc9ecf2df7fad3a9acc30351
    size: 3115188224
-  name: Harukanaru Toki no Naka de 3 (Japan) (Triple Pack)
+  name: Harukanaru Toki no Naka de 3 (Japan) (Premium Box)
  serial: SLPM-65850
  version: '1.02'
 - hashes:
@@ -51309,12 +51307,6 @@
  name: Magazine Ufficiale PlayStation 2 Demo Italia 05-2006 (Italy) (En,Fr,De,Es,It)
  serial: SCED-54180
  version: '1.00'
- hashes:
-  - md5: 0b14951eb38e4f5f4730bcf48bf64898
-    size: 4569923584
-  name: Magazine Ufficiale PlayStation 2 Italia 05-04 (Italy) (En,Fr,De,Es,It)
-  serial: SCED-52443
-  version: '1.00'
 - hashes:
  - md5: 771bfe48ce1a10c8a638da8bedc9acf6
    size: 4175429632
@@ -51698,13 +51690,13 @@
 - hashes:
  - md5: cf45002cd37168e4a2b3a8f96c560941
    size: 3983638528
-  name: Official PlayStation 2 Magazine Germany Special 2-2005 (Germany)
+  name: Official PlayStation 2 Magazine - Special Edition 2005-02 (Germany)
  serial: SCED-53662
  version: '1.00'
 - hashes:
  - md5: 8191fa8441cd8c947ab80b9db6de0ce3
    size: 4583129088
-  name: Official PlayStation 2 Magazine Germany Special 3-2005 (Germany)
+  name: Official PlayStation 2 Magazine - Special Edition 2005-03 (Germany)
  serial: SCED-53938
  version: '1.00'
 - hashes:
@@ -51818,7 +51810,7 @@
 - hashes:
  - md5: 8e18b5399008416a7d012f2ea1bf9353
    size: 663976656
-  name: Pro Evolution Soccer 3 (Europe) (Demo 1)
+  name: Pro Evolution Soccer 3 (UK) (Demo)
  serial: SLED-51992
  version: '1.00'
 - hashes:
@@ -51950,7 +51942,7 @@
 - hashes:
  - md5: 209c4247ffb84795b23ce2cec0f090a4
    size: 3793453056
-  name: Official PlayStation 2 Magazine Germany Special Edition 2003-03 (Germany)
+  name: Official PlayStation 2 Magazine - Special Edition 2003-03 (Germany)
  serial: SCED-51551
  version: '1.00'
 - hashes:
@@ -52038,7 +52030,7 @@
 - hashes:
  - md5: e8e5b428c642c78d510cbd854c17b9cc
    size: 1616740352
-  name: Primal + The Mark of Kri + War of the Monsters (Europe) (En,Fr,De,Es,It)
+  name: Primal & The Mark of Kri & War of the Monsters (Europe) (En,Fr,De,Es,It)
  serial: SCED-51506
  version: '1.00'
 - hashes:
@@ -52350,7 +52342,7 @@
 - hashes:
  - md5: d42eed1d14cdaf8add8295116776a447
    size: 3765108736
-  name: Best PS2 Games Ever 10 (Europe)
+  name: Official PlayStation 2 Magazine-UK Special Edition - Yearbook 2002 (Europe)
  serial: SCED-51389
  version: '1.00'
 - hashes:
@@ -52637,7 +52629,7 @@
 - hashes:
  - md5: cded45ee044b5a7614644fa444a59989
    size: 4334157824
-  name: Official PlayStation 2 Magazine Germany Special Edition 2003-02 (Germany)
+  name: Official PlayStation 2 Magazine - Special Edition 2003-02 (Germany)
  serial: SCED-51549
  version: '1.01'
 - hashes:
@@ -53111,7 +53103,7 @@
 - hashes:
  - md5: f309b4b48dc775dbbde635a1ef3b662b
    size: 4522639360
-  name: Germany Special Issue 3 (Germany)
+  name: Official PlayStation 2 Magazine - Special Edition 3 (Germany)
  serial: SCED-51375
  version: '1.00'
 - hashes:
@@ -54054,7 +54046,7 @@
 - hashes:
  - md5: ac5b76bd39b0cabd1acfe4dcb08df502
    size: 1649803264
-  name: Primal + The Mark of Kri (Europe)
+  name: Primal & The Mark of Kri (Europe)
  serial: SCED-51491
  version: '1.00'
 - hashes:
@@ -54085,7 +54077,7 @@
 - hashes:
  - md5: 2475b61666f06dc2aa9ca032f15a4cde
    size: 4241293312
-  name: Official PlayStation 2 Magazine Germany Special Edition 2007-1 (Germany)
+  name: Official PlayStation 2 Magazine - Special Edition 2007-01 (Germany)
  serial: SCED-54693
  version: '1.02'
 - hashes:
@@ -54462,7 +54454,7 @@
 - hashes:
  - md5: 97a9156abd199f588d4f46e9af7ab5a7
    size: 4107206656
-  name: Vitamin X - We are Super Supriment Boys (Japan) (Genteiban)
+  name: VitaminX - We are Super Supriment Boys (Japan) (Genteiban)
  serial: SLPS-25760
  version: '1.01'
 - hashes:
@@ -54767,7 +54759,7 @@
 - hashes:
  - md5: a4b5b1d6c13c15bc1bac6fc63622c9ee
    size: 2925920256
-  name: Ever 17 - The Out of Infinity Premium Edition (Japan)
+  name: Ever 17 - The Out of Infinity - Premium Edition (Japan)
  serial: SLPM-65421
  version: '1.01'
 - hashes:
@@ -55910,7 +55902,7 @@
 - hashes:
  - md5: 05b210d50d92a418ac1e37a1fff0df8a
    size: 243996480
-  name: Giant Robo - The Animation - Chikyuu ga Seishi suru Hi (Japan)
+  name: Giant Robo - The Animation - Chikyuu ga Seishi Suru Hi (Japan)
  serial: SLPM-62526
  version: '1.02'
 - hashes:
@@ -56111,7 +56103,7 @@
 - hashes:
  - md5: 45d62f1cf862b8e6c47d373a5c55d2f2
    size: 708511776
-  name: Pro Evolution Soccer 4 (Europe) (Demo)
+  name: Pro Evolution Soccer 4 (UK) (Demo)
  serial: SLED-52873
  version: '1.02'
 - hashes:
@@ -56171,7 +56163,7 @@
 - hashes:
  - md5: 139585af1bf276d5f2e17a32def4f66d
    size: 4528504832
-  name: Official PlayStation 2 Magazine Germany Special Edition 1 (Germany)
+  name: Official PlayStation 2 Magazine - Special Edition 1 (Germany)
  serial: SCED-50780
  version: '1.10'
 - hashes:
@@ -57668,7 +57660,7 @@
 - hashes:
  - md5: 1ce4a9368f7c6c73dcd983ad5f86f3eb
    size: 718702992
-  name: MaxPlay (Europe) (Unl)
+  name: Max Play (Europe) (Unl)
  version: 1.00 (European)
 - hashes:
  - md5: 8182f27cc5a0cac14da217e45861e49e
@@ -57841,8 +57833,7 @@
 - hashes:
  - md5: 4fb718d2059a1843882a70b17922b483
    size: 4613996544
-  name: Official PlayStation 2 Magazine Germany Special Edition 2005-01 (Germany)
-    (En,De)
+  name: Official PlayStation 2 Magazine - Special Edition 2005-01 (Germany) (En,De)
  serial: SCED-53298
  version: '1.02'
 - hashes:
@@ -57854,7 +57845,7 @@
 - hashes:
  - md5: 739a2f519751c64f7291d036105c2c0d
    size: 1670316032
-  name: Buzz! Junior - Robojam (Europe) (Beta) (2007-01-12)
+  name: Buzz! Junior - RoboJam (Europe) (Beta) (2007-01-12)
  serial: SCES-54676
  version: '1.00'
 - hashes:
@@ -58392,7 +58383,7 @@
 - hashes:
  - md5: 6969a8f3623387131e2e1d49fff4c3f5
    size: 4492853248
-  name: Magical Tale - Chiicha na Mahoutsukai (Japan)
+  name: Magical Tale - Chitcha na Mahoutsukai (Japan)
  serial: SLPM-65965
  version: '1.01'
 - hashes:
@@ -59340,7 +59331,7 @@
 - hashes:
  - md5: 8d61b97a6dd45165b012b338d42e53a8
    size: 2358018048
-  name: Harry Potter and the Prisoner of Azkaban (Korea)
+  name: Harry Potter-wa Azkaban-ui Joesu (Korea)
  serial: SLKA-25172
  version: '1.01'
 - hashes:
@@ -59646,7 +59637,7 @@
 - hashes:
  - md5: 1162e6411d9e16fbefc9fd8a9e886d70
    size: 4412145664
-  name: Official PlayStation 2 Magazine Germany Winter 2006 (Germany) (En,De)
+  name: Official PlayStation 2 Magazine - Winter 2006 (Germany) (En,De)
  serial: SCED-54558
  version: '1.00'
 - hashes:
@@ -60504,7 +60495,7 @@
 - hashes:
  - md5: 78f327cd6c0f2bd6f99a299e982b9a93
    size: 1253867520
-  name: TOCA Race Driver 3 + V8 Supercars Australia 3 (Australia) (Demo)
+  name: TOCA Race Driver 3 (Australia) (Demo)
  serial: SLED-53888
  version: '1.00'
 - hashes:
@@ -60764,7 +60755,7 @@
 - hashes:
  - md5: 7e964b27119adc590228452d42c634b0
    size: 4614062080
-  name: Buzz! Hollywood Quiz (Europe) (En,Fr,Nl)
+  name: Buzz! Hollywood Quiz (Belgium, Netherlands) (En,Fr,Nl)
  serial: SCES-54854
  version: '1.00'
 - hashes:
@@ -62041,7 +62032,7 @@
 - hashes:
  - md5: dd5ccdc3e325716d7f7ed08a9836f3f0
    size: 3938189312
-  name: PlayStation 2 Revista Oficial - Portugal 9 (Portugal)
+  name: Official PlayStation 2 Magazine Demo 32 (Portugal)
  serial: SCED-51657
  version: '1.00'
 - hashes:
@@ -62487,7 +62478,7 @@
 - hashes:
  - md5: fe79ea717184a278802679ef78f6df7b
    size: 7774928896
-  name: Zhen San Guo Wu Shuang 5 Special (Taiwan)
+  name: Zhen Sanguo Wushuang 5 Special (Taiwan)
  serial: SLAJ-35007
  version: '1.00'
 - hashes:
@@ -63024,7 +63015,7 @@
 - hashes:
  - md5: 18e6281d238ccb19e8975d45e8c157f0
    size: 3816554496
-  name: Offizielle PlayStation 2 Magazin 02-2004, Das - Uncut Edition (Germany)
+  name: Official PlayStation 2 Magazine 02-2004 - Uncut Edition (Germany)
  serial: SCED-52082
  version: '1.01'
 - hashes:
@@ -63141,7 +63132,7 @@
 - hashes:
  - md5: d38ab694e14843f16af11a15d1883023
    size: 4677795840
-  name: Koi suru Otome to Shugo no Tate - The Shield of AIGIS (Japan)
+  name: Koi Suru Otome to Shugo no Tate - The Shield of AIGIS (Japan)
  serial: SLPM-55098
  version: '1.02'
 - hashes:
@@ -63554,7 +63545,7 @@
 - hashes:
  - md5: 3acdf0ae8cc67fe9e0db9f4707cb3905
    size: 2638381056
-  name: I Love Baseball - Pro Yakyuu o Koyonaku Ai suru Hitotachi e (Japan)
+  name: I Love Baseball - Pro Yakyuu o Koyonaku Ai Suru Hitotachi e (Japan)
  serial: SLPM-65633
  version: '1.04'
 - hashes:
@@ -63941,13 +63932,13 @@
 - hashes:
  - md5: 7ea2da0f39ae55794fd9fd5006b417cc
    size: 4446388224
-  name: Offizielle PlayStation 2 Magazin 09-2004, Das (Germany)
+  name: Official PlayStation 2 Magazine 09-2004 (Germany)
  serial: SCED-52089
  version: '1.02'
 - hashes:
  - md5: 11b80bd02a0a874212b014c56e44a4c5
    size: 4033347584
-  name: Offizielle PlayStation 2 Magazin 12-2003, Das (Germany)
+  name: Official PlayStation Magazine 12-2003 (Germany)
  serial: SCED-51936
  version: '1.00'
 - hashes:
@@ -64181,7 +64172,7 @@
 - hashes:
  - md5: 8990d1c3b88b04b1bbc7a78ee3e9df2f
    size: 33821760
-  name: Karat PS2-you Pro Action Replay 2 Taikenban (Japan) (Unl)
+  name: Karat PS2-you Pro Action Replay 2 Taikenban (Japan) (Unl) (Rev 1)
  version: '1.7'
 - hashes:
  - md5: 4a2754811946ef9badbbd872f541a03f
@@ -64254,7 +64245,7 @@
 - hashes:
  - md5: 0e35e8fd22fe57f8727b9764685bbc29
    size: 3871703040
-  name: Offizielle PlayStation 2 Magazin, Das - Special Edition 2 (Germany)
+  name: Official PlayStation 2 Magazine - Special Edition 2 (Germany)
  serial: SCED-51161
  version: '1.00'
 - hashes:
@@ -64563,7 +64554,7 @@
 - hashes:
  - md5: 477eb508b08f59386478908e481eb8a1
    size: 4519690240
-  name: Official PlayStation 2 Magazine - German Kids Special (Germany) (En,De)
+  name: Official PlayStation 2 Magazine - Kids Special (Germany) (En,De)
  serial: SCED-53611
  version: '1.00'
 - hashes:
@@ -64580,7 +64571,7 @@
 - hashes:
  - md5: ac9cb481855792415314e06e5c12b291
    size: 664183632
-  name: Pro Evolution Soccer 3 (Europe) (Demo 2)
+  name: Pro Evolution Soccer 3 (Europe) (Demo)
  serial: SLED-51994
  version: '1.00'
 - hashes:
@@ -65185,7 +65176,7 @@
 - hashes:
  - md5: 86af0c99c8a8566e5f9307110f339e20
    size: 364475328
-  name: Monopoly - Mezase!! Daifugou Jinsei!! (Japan)
+  name: Monopoly - Mezase!! Daifugou Jinsei!! (Japan) (v2.00)
  serial: SLPS-20281
  version: '2.00'
 - hashes:
@@ -66352,7 +66343,7 @@
 - hashes:
  - md5: ff59d561b843dbbb940c631d53294d63
    size: 1552318464
-  name: Monsterspass (Austria, Switzerland) (En,Fr,De,Es,It,Nl,Pt)
+  name: Monsterspass (Austria) (En,Fr,De,Es,It,Nl,Pt)
  serial: SCES-54704
  version: '1.00'
 - hashes:
@@ -66436,7 +66427,7 @@
 - hashes:
  - md5: 79fc6bc53ff748088a36d2f6778d0a0b
    size: 1943797760
-  name: Big! Sports Quiz, The (Austria, Switzerland)
+  name: Big! Sports Quiz, The (Austria)
  serial: SCES-54526
  version: '1.00'
 - hashes:
@@ -66803,7 +66794,7 @@
 - hashes:
  - md5: 91450691bed8af904b291c4d86c0c338
    size: 1645182976
-  name: Jungle Party (Austria, Switzerland)
+  name: Jungle Party (Austria)
  serial: SCES-54524
  version: '1.01'
 - hashes:
@@ -66934,7 +66925,7 @@
 - hashes:
  - md5: 777cd430a73b95945cee679a27446eed
    size: 2297200640
-  name: Disney-Pixar Finding Nemo (Korea)
+  name: Disney-Pixar Nemo-reul Chajaseo (Korea)
  serial: SLKA-25056
  version: '1.00'
 - hashes:
@@ -68550,7 +68541,7 @@
 - hashes:
  - md5: 5b315096f6bfc1897e52fec9c877b81d
    size: 4250206208
-  name: Offizielle PlayStation 2 Magazin 13-2003, Das - Uncut Edition (Germany)
+  name: Official PlayStation 2 Magazine 13-2003 - Uncut Edition (Germany)
  serial: SCED-51937
  version: '1.00'
 - hashes:
@@ -69278,7 +69269,7 @@
 - hashes:
  - md5: 6905874bbb6167417bac324464d70d28
    size: 541969008
-  name: Momotarou Dentetsu 15 - Godai Bombee Toujou! no Maki (Japan) (v1.01)
+  name: Momotarou Dentetsu 15 - Godai Bonby Toujou! no Maki (Japan) (v1.01)
  serial: SLPM-62702
  version: '1.01'
 - hashes:
@@ -69326,7 +69317,7 @@
 - hashes:
  - md5: 950783ce0723d41ff7aa46659a6eafbc
    size: 4492853248
-  name: Magical Tale - Chiicha na Mahoutsukai (Japan) (Shokai Genteiban)
+  name: Magical Tale - Chitcha na Mahoutsukai (Japan) (Shokai Genteiban)
  serial: SLPM-65964
  version: '1.01'
 - hashes:
@@ -69341,3 +69332,240 @@
  name: Quilt - Anata to Tsumugu Yume to Koi no Dress (Japan)
  serial: SLPM-66735
  version: '1.02'
+- hashes:
+  - md5: ad64473c57824cf607cf40a7d85cf36c
+    size: 2300313600
+  name: Guitar Hero (USA) (Demo)
+  serial: SLUS-29177
+  version: '1.00'
+- hashes:
+  - md5: 667607deb941380aa4d13db387b93077
+    size: 93254448
+  name: Codes Exclusifs (France) (Unl)
+  version: '1.00'
+- hashes:
+  - md5: 589e37362d073b8ad52670cdd5664415
+    size: 1822326784
+  name: DearS (Japan) (Genteiban)
+  serial: SLPS-25371
+  version: '1.04'
+- hashes:
+  - md5: 4afb874dc19e35051e79f7a881a584b4
+    size: 1524793344
+  name: Winning Post 6 - 2005-nendoban (Japan) (Premium Pack)
+  serial: SLPM-65893
+  version: '1.01'
+- hashes:
+  - md5: 132ce8a9e16ca7ef5a356aa111bce318
+    size: 4354473984
+  name: Jak 3 (Europe) (En,Fr,De,Es,It,Pt,Ko,Ru) (Beta) (2004-09-14)
+  serial: SCES-52460
+  version: '1.00'
+- hashes:
+  - md5: 6432d610b89d00eb1eea2ee71cf27147
+    size: 3007119360
+  name: Buzz! The Schools Quiz (UK) (v1.00)
+  serial: SCES-54941
+  version: '1.00'
+- hashes:
+  - md5: 3c47093b42a1e1a39692b220e7659ad9
+    size: 4601774080
+  name: Big! Pop Quiz, The (Austria)
+  serial: SCES-55099
+  version: '1.00'
+- hashes:
+  - md5: 859073451dbb344df7cee32703245ed5
+    size: 306380800
+  name: Freaky Flyers (USA) (Demo)
+  serial: SLUS-29051
+  version: '1.00'
+- hashes:
+  - md5: 8d987ddccb1e2ec4c068896a4182bc4c
+    size: 1542029312
+  name: Tennis no Oujisama - Smash Hit! 2 (Japan) (Shokai SP Genteiban C-Type)
+  serial: SLPM-65453
+  version: '1.01'
+- hashes:
+  - md5: b0a2a871249538d80b92e7ef837f20dd
+    size: 761692848
+  name: CD avec les Codes Action Replay Exclusivement pour le Jeu Enter the Matrix
+    (France)
+  version: 1.01 (European)
+- hashes:
+  - md5: db0c13bd5bddb659d563b4e2c0fcd5e8
+    size: 226549344
+  name: Action Replay Ultimate Cheats for Use with Grand Theft Auto - Vice City (UK)
+    (Unl)
+  version: '1.30'
+- hashes:
+  - md5: 7866eaffddb52bbf7375ab4deca20dd6
+    size: 33821760
+  name: Karat PS2-you Pro Action Replay 2 Taikenban (Japan) (Unl)
+  version: '1.7'
+- hashes:
+  - md5: 76b15475cac6977f2510ea07d9b87043
+    size: 4348444672
+  name: Official PlayStation 2 Magazine - Special Edition 2006-01 (Germany)
+  serial: SCED-54034
+  version: '1.00'
+- hashes:
+  - md5: c9f8be1699b50935c1e1989cd76bdbe1
+    size: 697118688
+  name: Online Start-Up Disc 4.0 - Broadband Only (USA) (v1.01)
+  serial: PBPX-95248
+  version: '1.01'
+- hashes:
+  - md5: d7cfe2da9a3598cb10bc61abd2657acd
+    size: 3497885696
+  name: Big! Movie Quiz, The (Austria)
+  serial: SCES-54857
+  version: '1.00'
+- hashes:
+  - md5: 875894a624cc3d7bc81311985b5eeff7
+    size: 549201408
+  name: Argus-ui Jeonsa (Korea) (Cheheompan)
+  serial: SCKA-90005
+  version: '1.00'
+- hashes:
+  - md5: 7f3b5e111ca4c77039a1641fe2785423
+    size: 3271229440
+  name: Mai-Otome HiME - Otome Butoushi!! (Japan) (Limited Edition)
+  serial: SLPS-25680
+  version: '1.01'
+- hashes:
+  - md5: 5626f8c491117a0924380c786ab7e458
+    size: 3049783296
+  name: Fire It Up Kids (Europe)
+  serial: SCED-53678
+  version: '1.00'
+- hashes:
+  - md5: 7d6503407ba1ea104753be2bfe1283e3
+    size: 2560065536
+  name: Nickelodeon SpongeBob SquarePants - Movin' with Friends (Europe) (En,Fr,De,Es)
+    (Beta) (2004-10-29)
+- hashes:
+  - md5: baf280135d74603e097a813d52e25afa
+    size: 707949648
+  name: Pro Evolution Soccer 4 (Europe) (Demo)
+  serial: SLED-52878
+  version: '1.03'
+- hashes:
+  - md5: 1fa77218061839d6ac9b39159fa46680
+    size: 1249804288
+  name: SingStar Rocks! (Europe) (Demo)
+  serial: SCED-54086
+  version: '1.00'
+- hashes:
+  - md5: 2d91ab06f6fc0f918c9389990df71a63
+    size: 1378156544
+  name: This Is Football 2004 (Belgium) (Demo)
+  serial: SCED-52321
+  version: '1.01'
+- hashes:
+  - md5: 6917a832cf75177a18c4ef4499966ba4
+    size: 3448471552
+  name: Official PlayStation 2 Magazine Demo 10 (Spain)
+  serial: SCED-50406
+- hashes:
+  - md5: e1615a414d9b561e70b395155edb7e39
+    size: 4697686016
+  name: Chaos Legion (Europe) (Demo)
+  serial: SLED-51808
+  version: '1.00'
+- hashes:
+  - md5: 670fabe932a7ad8b81f6356d162cdac6
+    size: 4569923584
+  name: Magazine Ufficiale PlayStation 2 Italia 05-04 (Italy) (En,Fr,De,Es,It)
+  serial: SCED-52443
+  version: '1.00'
+- hashes:
+  - md5: dd4dd82c735f0189b5cd91c0c5e4b327
+    size: 364472976
+  name: Monopoly - Mezase!! Daifugou Jinsei!! (Japan) (v1.04)
+  serial: SLPS-20281
+  version: '1.04'
+- hashes:
+  - md5: 2be7a399436665d532383e9e6d21f7fb
+    size: 1632665600
+  name: Musashiden II - Blademaster (Japan) (Taikenban)
+  serial: SLPM-61117
+  version: '1.00'
+- hashes:
+  - md5: 85f8dd4c84ac2fd97f4b154280c01910
+    size: 1239580672
+  name: Bratz - Rock Angelz (Denmark)
+  serial: SLES-53578
+  version: '1.00'
+- hashes:
+  - md5: 36c27c981bfdd9f311ecc36da4ad7071
+    size: 598507520
+  name: Metal Gear Solid 2 - Sons of Liberty (Europe) (En,Fr,De) (Demo)
+  serial: SLED-50782
+  version: '1.00'
+- hashes:
+  - md5: 626b946f71116a9ec455b41c0fb8aa3a
+    size: 2710274048
+  name: Bonus Demo 7 (15-16) (Europe)
+  serial: SCED-52437
+  version: '1.02'
+- hashes:
+  - md5: 2696c838c64d0f7f0c86adc5bbc1f54a
+    size: 4292870144
+  name: Buzz! The Big Quiz (Switzerland) (Fr,De,It)
+  serial: SCES-54071
+  version: '1.00'
+- hashes:
+  - md5: 865cb20ccc3b938879eb3cae955ab70c
+    size: 4598398976
+  name: Buzz! The Mega Quiz (Switzerland) (Fr,De,It)
+  serial: SCES-54506
+  version: '1.00'
+- hashes:
+  - md5: f543c17d10aa576cc4ea74622a7050ee
+    size: 750130416
+  name: Code Breaker (USA) (Unl) (v4.0)
+  version: '4.0'
+- hashes:
+  - md5: bae22925feb7587573b663cc83bc1eb3
+    size: 2719285248
+  name: Kaido Battle 2 - Chain Reaction (Korea)
+  serial: SLKA-25146
+  version: '1.02'
+- hashes:
+  - md5: 92c7a59eb4650bbc8a429970640b871b
+    size: 748700400
+  name: Time Crisis II (Europe) (Demo)
+  serial: SCED-50473
+  version: '1.01'
+- hashes:
+  - md5: fd46dd639a28f9f8ec7475f999d8b653
+    size: 2786852864
+  name: Call of Duty - World at War - Final Fronts (Korea)
+  serial: SLKA-25449
+  version: '1.00'
+- hashes:
+  - md5: 41ccada9d75b88b20adf6db41349df52
+    size: 4511367168
+  name: Shijag-ui Ilbo All Stars (Korea)
+  serial: SLKA-25152
+  version: '1.01'
+- hashes:
+  - md5: d46987283a22024d4b8e3e36c597035f
+    size: 4116643840
+  name: Fight Night Round 2 (Europe, Australia) (Demo)
+  serial: SLED-53126
+  version: '1.00'
+- hashes:
+  - md5: 22a1b12df6fae4ecd8da5bed8cd91dd6
+    size: 4192600064
+  name: SOCOM 3 - U.S. Navy SEALs (USA) (Beta) (2005-09-08)
+- hashes:
+  - md5: 3a04c1e3548d8169271336a73ae67e93
+    size: 566942544
+  name: Taz - Wanted (Europe)  (2002-01-29)
+  version: Beta
+- hashes:
+  - md5: ecb58db2de607ed68a215d052381a83b
+    size: 245814576
+  name: Taz - Wanted (Europe)  (2001-05-31)
+  version: Beta
--- a/bin/resources/shaders/dx11/convert.fx
+++ b/bin/resources/shaders/dx11/convert.fx
@@ -170,7 +170,7 @@ PS_OUTPUT ps_rta_decorrection(PS_INPUT input)
 	return output;
 }

-PS_OUTPUT ps_hdr_init(PS_INPUT input)
+PS_OUTPUT ps_colclip_init(PS_INPUT input)
 {
 	PS_OUTPUT output;
 	float4 value = sample_c(input.t);
@@ -178,7 +178,7 @@ PS_OUTPUT ps_hdr_init(PS_INPUT input)
 	return output;
 }

-PS_OUTPUT ps_hdr_resolve(PS_INPUT input)
+PS_OUTPUT ps_colclip_resolve(PS_INPUT input)
 {
 	PS_OUTPUT output;
 	float4 value = sample_c(input.t);
--- a/bin/resources/shaders/dx11/tfx.fx
+++ b/bin/resources/shaders/dx11/tfx.fx
@@ -55,7 +55,7 @@
 #define PS_CHANNEL_FETCH 0
 #define PS_TALES_OF_ABYSS_HLE 0
 #define PS_URBAN_CHAOS_HLE 0
-#define PS_HDR 0
+#define PS_COLCLIP_HW 0
 #define PS_RTA_CORRECTION 0
 #define PS_RTA_SRC_CORRECTION 0
 #define PS_COLCLIP 0
@@ -799,7 +799,7 @@ void ps_fbmask(inout float4 C, float2 pos_xy)
 {
 	if (PS_FBMASK)
 	{
-		float multi = PS_HDR ? 65535.0f : 255.0f;
+		float multi = PS_COLCLIP_HW ? 65535.0f : 255.0f;
 		float4 RT = trunc(RtTexture.Load(int3(pos_xy, 0)) * multi + 0.1f);
 		C = (float4)(((uint4)C & ~FbMask) | ((uint4)RT & FbMask));
 	}
@@ -843,13 +843,13 @@ void ps_color_clamp_wrap(inout float3 C)
 			C += 7.0f; // Need to round up, not down since the shader will invert

 		// Standard Clamp
-		if (PS_COLCLIP == 0 && PS_HDR == 0)
+		if (PS_COLCLIP == 0 && PS_COLCLIP_HW == 0)
 			C = clamp(C, (float3)0.0f, (float3)255.0f);

 		// In 16 bits format, only 5 bits of color are used. It impacts shadows computation of Castlevania
 		if (PS_DST_FMT == FMT_16 && PS_DITHER != 3 && (PS_BLEND_MIX == 0 || PS_DITHER))
 			C = (float3)((int3)C & (int3)0xF8);
-		else if (PS_COLCLIP == 1 || PS_HDR == 1)
+		else if (PS_COLCLIP == 1 || PS_COLCLIP_HW == 1)
 			C = (float3)((int3)C & (int3)0xFF);
 	}
 	else if (PS_DST_FMT == FMT_16 && PS_DITHER != 3 && PS_BLEND_MIX == 0 && PS_BLEND_HW == 0)
@@ -898,7 +898,7 @@ void ps_blend(inout float4 Color, inout float4 As_rgba, float2 pos_xy)
 		}
 		
 		float Ad = PS_RTA_CORRECTION ? trunc(RT.a * 128.0f + 0.1f) / 128.0f : trunc(RT.a * 255.0f + 0.1f) / 128.0f;
-		float color_multi = PS_HDR ? 65535.0f : 255.0f;
+		float color_multi = PS_COLCLIP_HW ? 65535.0f : 255.0f;
 		float3 Cd = trunc(RT.rgb * color_multi + 0.1f);
 		float3 Cs = Color.rgb;

@@ -1157,7 +1157,7 @@ PS_OUTPUT ps_main(PS_INPUT input)

 #if !PS_NO_COLOR
 	output.c0.a = PS_RTA_CORRECTION ? C.a / 128.0f : C.a / 255.0f;
-	output.c0.rgb = PS_HDR ? float3(C.rgb / 65535.0f) : C.rgb / 255.0f;
+	output.c0.rgb = PS_COLCLIP_HW ? float3(C.rgb / 65535.0f) : C.rgb / 255.0f;
 #if !PS_NO_COLOR1
 	output.c1 = alpha_blend;
 #endif
--- a/bin/resources/shaders/opengl/convert.glsl
+++ b/bin/resources/shaders/opengl/convert.glsl
@@ -348,16 +348,16 @@ void ps_rta_decorrection()
 }
 #endif

-#ifdef ps_hdr_init
-void ps_hdr_init()
+#ifdef ps_colclip_init
+void ps_colclip_init()
 {
 	vec4 value = sample_c();
 	SV_Target0 = vec4(round(value.rgb * 255.0f) / 65535.0f, value.a);
 }
 #endif

-#ifdef ps_hdr_resolve
-void ps_hdr_resolve()
+#ifdef ps_colclip_resolve
+void ps_colclip_resolve()
 {
 	vec4 value = sample_c();
 	SV_Target0 = vec4(vec3(uvec3(value.rgb * 65535.0f) & 255u) / 255.0f, value.a);
--- a/bin/resources/shaders/opengl/tfx_fs.glsl
+++ b/bin/resources/shaders/opengl/tfx_fs.glsl
@@ -707,7 +707,7 @@ void ps_fbmask(inout vec4 C)
 {
 	// FIXME do I need special case for 16 bits
 #if PS_FBMASK
-	#if PS_HDR == 1
+	#if PS_COLCLIP_HW == 1
 		vec4 RT = trunc(sample_from_rt() * 65535.0f);
 	#else
 		vec4 RT = trunc(sample_from_rt() * 255.0f + 0.1f);
@@ -757,7 +757,7 @@ void ps_color_clamp_wrap(inout vec3 C)
 #endif

 	// Correct the Color value based on the output format
-#if PS_COLCLIP == 0 && PS_HDR == 0
+#if PS_COLCLIP == 0 && PS_COLCLIP_HW == 0
 	// Standard Clamp
 	C = clamp(C, vec3(0.0f), vec3(255.0f));
 #endif
@@ -771,7 +771,7 @@ void ps_color_clamp_wrap(inout vec3 C)
 #if PS_DST_FMT == FMT_16 && PS_DITHER < 3 && (PS_BLEND_MIX == 0 || PS_DITHER)
 	// In 16 bits format, only 5 bits of colors are used. It impacts shadows computation of Castlevania
 	C = vec3(ivec3(C) & ivec3(0xF8));
-#elif PS_COLCLIP == 1 || PS_HDR == 1
+#elif PS_COLCLIP == 1 || PS_COLCLIP_HW == 1
 	C = vec3(ivec3(C) & ivec3(0xFF));
 #endif

@@ -828,7 +828,7 @@ float As = As_rgba.a;
 	#endif
 		
 	// Let the compiler do its jobs !
-	#if PS_HDR == 1
+	#if PS_COLCLIP_HW == 1
 		vec3 Cd = trunc(RT.rgb * 65535.0f);
 	#else
 		vec3 Cd = trunc(RT.rgb * 255.0f + 0.1f);
@@ -1125,7 +1125,7 @@ void ps_main()
 	#else
 		SV_Target0.a = C.a / 255.0f;
 	#endif
-	#if PS_HDR == 1
+	#if PS_COLCLIP_HW == 1
 		SV_Target0.rgb = vec3(C.rgb / 65535.0f);
 	#else
 		SV_Target0.rgb = C.rgb / 255.0f;
--- a/bin/resources/shaders/vulkan/convert.glsl
+++ b/bin/resources/shaders/vulkan/convert.glsl
@@ -148,16 +148,16 @@ void ps_rta_decorrection()
 }
 #endif

-#ifdef ps_hdr_init
-void ps_hdr_init()
+#ifdef ps_colclip_init
+void ps_colclip_init()
 {
 	vec4 value = sample_c(v_tex);
 	o_col0 = vec4(roundEven(value.rgb * 255.0f) / 65535.0f, value.a);
 }
 #endif

-#ifdef ps_hdr_resolve
-void ps_hdr_resolve()
+#ifdef ps_colclip_resolve
+void ps_colclip_resolve()
 {
 	vec4 value = sample_c(v_tex);
 	o_col0 = vec4(vec3(uvec3(value.rgb * 65535.5f) & 255u) / 255.0f, value.a);
--- a/bin/resources/shaders/vulkan/tfx.glsl
+++ b/bin/resources/shaders/vulkan/tfx.glsl
@@ -281,7 +281,7 @@ void main()
 #define PS_CHANNEL_FETCH 0
 #define PS_TALES_OF_ABYSS_HLE 0
 #define PS_URBAN_CHAOS_HLE 0
-#define PS_HDR 0
+#define PS_COLCLIP_HW 0
 #define PS_COLCLIP 0
 #define PS_BLEND_A 0
 #define PS_BLEND_B 0
@@ -974,7 +974,7 @@ void ps_fbmask(inout vec4 C)
 {
 	#if PS_FBMASK
 		
-		#if PS_HDR == 1
+		#if PS_COLCLIP_HW == 1
 			vec4 RT = trunc(sample_from_rt() * 65535.0f);
 		#else
 			vec4 RT = trunc(sample_from_rt() * 255.0f + 0.1f);
@@ -1027,7 +1027,7 @@ void ps_color_clamp_wrap(inout vec3 C)
 #endif

 	// Correct the Color value based on the output format
-#if PS_COLCLIP == 0 && PS_HDR == 0
+#if PS_COLCLIP == 0 && PS_COLCLIP_HW == 0
 	// Standard Clamp
 	C = clamp(C, vec3(0.0f), vec3(255.0f));
 #endif
@@ -1041,7 +1041,7 @@ void ps_color_clamp_wrap(inout vec3 C)
 #if PS_DST_FMT == FMT_16 && PS_DITHER != 3 && (PS_BLEND_MIX == 0 || PS_DITHER > 0)
 	// In 16 bits format, only 5 bits of colors are used. It impacts shadows computation of Castlevania
 	C = vec3(ivec3(C) & ivec3(0xF8));
-#elif PS_COLCLIP == 1 || PS_HDR == 1
+#elif PS_COLCLIP == 1 || PS_COLCLIP_HW == 1
 	C = vec3(ivec3(C) & ivec3(0xFF));
 #endif

@@ -1098,7 +1098,7 @@ void ps_blend(inout vec4 Color, inout vec4 As_rgba)
 		#endif

 			// Let the compiler do its jobs !
-			#if PS_HDR == 1
+			#if PS_COLCLIP_HW == 1
 			vec3 Cd = trunc(RT.rgb * 65535.0f);
 			#else
 			vec3 Cd = trunc(RT.rgb * 255.0f + 0.1f);
@@ -1390,7 +1390,7 @@ void main()
 		#else
 			o_col0.a = C.a / 255.0f;
 		#endif
-		#if PS_HDR == 1
+		#if PS_COLCLIP_HW == 1
 			o_col0.rgb = vec3(C.rgb / 65535.0f);
 		#else
 			o_col0.rgb = C.rgb / 255.0f;
--- a/common/Darwin/DarwinMisc.cpp
+++ b/common/Darwin/DarwinMisc.cpp
@@ -50,6 +50,27 @@ u64 GetPhysicalMemory()
 	return getmem;
 }

+u64 GetAvailablePhysicalMemory()
+{
+	const mach_port_t host_port = mach_host_self();
+	vm_size_t page_size;
+
+	if (host_page_size(host_port, &page_size) != KERN_SUCCESS)
+		return 0;
+
+	vm_statistics64_data_t vm_stat;
+	mach_msg_type_number_t host_size = sizeof(vm_statistics64_data_t) / sizeof(integer_t);
+
+	if (host_statistics64(host_port, HOST_VM_INFO, reinterpret_cast<host_info64_t>(&vm_stat), &host_size) != KERN_SUCCESS)
+		return 0;
+
+	const u64 free_pages = static_cast<u64>(vm_stat.free_count);
+	const u64 inactive_pages = static_cast<u64>(vm_stat.inactive_count);
+	const u64 get_available_mem = (free_pages + inactive_pages) * page_size;
+
+	return get_available_mem;
+}
+
 static mach_timebase_info_data_t s_timebase_info;
 static const u64 tickfreq = []() {
 	if (mach_timebase_info(&s_timebase_info) != KERN_SUCCESS)
--- a/common/HostSys.h
+++ b/common/HostSys.h
@@ -181,10 +181,7 @@ private:
 extern u64 GetTickFrequency();
 extern u64 GetCPUTicks();
 extern u64 GetPhysicalMemory();
-#ifdef _WIN32
-// TODO: Someone do linux/mac.
 extern u64 GetAvailablePhysicalMemory();
-#endif
 /// Spin for a short period of time (call while spinning waiting for a lock)
 /// Returns the approximate number of ns that passed
 extern u32 ShortSpin();
--- a/common/Linux/LnxMisc.cpp
+++ b/common/Linux/LnxMisc.cpp
@@ -15,6 +15,7 @@

 #include <dbus/dbus.h>
 #include <spawn.h>
+#include <sys/sysinfo.h>
 #include <sys/time.h>
 #include <sys/wait.h>
 #include <unistd.h>
@@ -40,6 +41,15 @@ u64 GetPhysicalMemory()
 	return pages * getpagesize();
 }

+u64 GetAvailablePhysicalMemory()
+{
+	struct sysinfo info;
+	if (sysinfo(&info) != 0)
+		return 0;
+
+	return static_cast<u64>(info.freeram) * info.mem_unit;
+}
+
 u64 GetTickFrequency()
 {
 	return 1000000000; // unix measures in nanoseconds
--- a/pcsx2-qt/Translations/pcsx2-qt_en.ts
+++ b/pcsx2-qt/Translations/pcsx2-qt_en.ts
@@ -2392,15 +2392,10 @@ Leaderboard Position: {1} of {2}</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/CDVD/ThreadedFileReader.cpp" line="279"/>
+        <location filename="../../pcsx2/CDVD/ThreadedFileReader.cpp" line="278"/>
        <source>Not enough free memory available for precaching, ({}GB) required.</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <location filename="../../pcsx2/CDVD/ThreadedFileReader.cpp" line="292"/>
-        <source>Required memory ({}GB) is the above the maximum allowed ({}GB).</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
    <name>ColorPickerButton</name>
@@ -10879,24 +10874,24 @@ Do you want to load this save and continue?</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp" line="2687"/>
+        <location filename="../../pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp" line="2688"/>
        <source>Stencil buffers and texture barriers are both unavailable, this will break some graphical effects.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp" line="5065"/>
+        <location filename="../../pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp" line="5060"/>
        <source>Spin GPU During Readbacks is enabled, but calibrated timestamps are unavailable.  This might be really slow.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/GS/Renderers/DX11/D3D.cpp" line="391"/>
+        <location filename="../../pcsx2/GS/Renderers/DX11/D3D.cpp" line="392"/>
        <source>Your system has the &quot;OpenCL, OpenGL, and Vulkan Compatibility Pack&quot; installed.
 This Vulkan driver crashes PCSX2 on some GPUs.
 To use the Vulkan renderer, you should remove this app package.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/GS/Renderers/DX11/D3D.cpp" line="410"/>
+        <location filename="../../pcsx2/GS/Renderers/DX11/D3D.cpp" line="411"/>
        <source>The Vulkan renderer was automatically selected, but no compatible devices were found.
       You should update all graphics drivers in your system, including any integrated GPUs
       to use the Vulkan renderer.</source>
@@ -19266,12 +19261,12 @@ Ejecting {3} and replacing it with {2}.</source>
 <context>
    <name>SDLInputSource</name>
    <message>
-        <location filename="../../pcsx2/Input/SDLInputSource.cpp" line="701"/>
+        <location filename="../../pcsx2/Input/SDLInputSource.cpp" line="767"/>
        <source>SDL3 Migration</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/Input/SDLInputSource.cpp" line="702"/>
+        <location filename="../../pcsx2/Input/SDLInputSource.cpp" line="768"/>
        <source>As part of our upgrade to SDL3, we&apos;ve had to migrate your binds
 Your controller did not match the Xbox layout and may need rebinding
 Please verify your controller settings and amend if required</source>
@@ -22702,182 +22697,182 @@ Error was: {}</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3067"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3069"/>
        <source>Cheats have been disabled due to achievements hardcore mode.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3120"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3122"/>
        <source>Fast CDVD is enabled, this may break games.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3124"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3126"/>
        <source>Cycle rate/skip is not at default, this may crash or make games run too slow.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3134"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3136"/>
        <source>Upscale multiplier is below native, this will break rendering.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3174"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3176"/>
        <source>Mipmapping is disabled. This may break rendering in some games.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3179"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3181"/>
        <source>Debug device is enabled. This will massively reduce performance.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3188"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3190"/>
        <source>Renderer is not set to Automatic. This may cause performance problems and graphical issues.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3194"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3196"/>
        <source>Texture filtering is not set to Bilinear (PS2). This will break rendering in some games.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3657"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3659"/>
        <source>No Game Running</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3139"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3141"/>
        <source>Trilinear filtering is not set to automatic. This may break rendering in some games.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3144"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3146"/>
        <source>Blending Accuracy is below Basic, this may break effects in some games.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3149"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3151"/>
        <source>Hardware Download Mode is not set to Accurate, this may break rendering in some games.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3200"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3202"/>
        <source>EE FPU Round Mode is not set to default, this may break some games.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3206"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3208"/>
        <source>EE FPU Clamp Mode is not set to default, this may break some games.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3211"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3213"/>
        <source>VU0 Round Mode is not set to default, this may break some games.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3216"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3218"/>
        <source>VU1 Round Mode is not set to default, this may break some games.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3223"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3225"/>
        <source>VU Clamp Mode is not set to default, this may break some games.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3228"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3230"/>
        <source>128MB RAM is enabled. Compatibility with some games may be affected.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3233"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3235"/>
        <source>Game Fixes are not enabled. Compatibility with some games may be affected.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3238"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3240"/>
        <source>Compatibility Patches are not enabled. Compatibility with some games may be affected.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3242"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3244"/>
        <source>Frame rate for NTSC is not default. This may break some games.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3244"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3246"/>
        <source>Frame rate for PAL is not default. This may break some games.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3263"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3265"/>
        <source>EE Recompiler is not enabled, this will significantly reduce performance.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3268"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3270"/>
        <source>VU0 Recompiler is not enabled, this will significantly reduce performance.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3273"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3275"/>
        <source>VU1 Recompiler is not enabled, this will significantly reduce performance.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3278"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3280"/>
        <source>IOP Recompiler is not enabled, this will significantly reduce performance.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3283"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3285"/>
        <source>EE Cache is enabled, this will significantly reduce performance.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3288"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3290"/>
        <source>EE Wait Loop Detection is not enabled, this may reduce performance.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3293"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3295"/>
        <source>INTC Spin Detection is not enabled, this may reduce performance.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3296"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3298"/>
        <source>Fastmem is not enabled, this will reduce performance.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3300"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3302"/>
        <source>Instant VU1 is disabled, this may reduce performance.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3305"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3307"/>
        <source>mVU Flag Hack is not enabled, this may reduce performance.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3154"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3156"/>
        <source>GPU Palette Conversion is enabled, this may reduce performance.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3159"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3161"/>
        <source>Texture Preloading is not Full, this may reduce performance.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3164"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3166"/>
        <source>Estimate texture region is enabled, this may reduce performance.</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../../pcsx2/VMManager.cpp" line="3169"/>
+        <location filename="../../pcsx2/VMManager.cpp" line="3171"/>
        <source>Texture dumping is enabled, this will continually dump textures to disk.</source>
        <translation type="unfinished"></translation>
    </message>
--- a/pcsx2/CDVD/ThreadedFileReader.cpp
+++ b/pcsx2/CDVD/ThreadedFileReader.cpp
@@ -266,12 +266,11 @@ bool ThreadedFileReader::Precache2(ProgressCallback* progress, Error* error)

 bool ThreadedFileReader::CheckAvailableMemoryForPrecaching(u64 required_size, Error* error)
 {
-#ifdef _WIN32
 	// We want to check available physical memory instead of total.
 	const u64 memory_available = GetAvailablePhysicalMemory();
 	// Reserve 2GB of available memory for headroom.
 	constexpr u64 memory_reserve = 2147483648;
-	const u64 max_precache_size = std::max(0LL, static_cast<s64>(memory_available - memory_reserve));
+	const u64 max_precache_size = std::max(s64{0}, static_cast<s64>(memory_available - memory_reserve));

 	if (required_size > max_precache_size)
 	{
@@ -280,20 +279,6 @@ bool ThreadedFileReader::CheckAvailableMemoryForPrecaching(u64 required_size, Er
 			(required_size + memory_reserve) / _1gb);
 		return false;
 	}
-#else
-	// Don't allow precaching to use more than 50% of system memory.
-	// Hopefully nobody's running 2-4GB potatoes anymore....
-	const u64 memory_size = GetPhysicalMemory();
-	const u64 max_precache_size = memory_size / 2;
-
-	if (required_size > max_precache_size)
-	{
-		Error::SetStringFmt(error,
-			TRANSLATE_FS("CDVD", "Required memory ({}GB) is the above the maximum allowed ({}GB)."),
-			required_size / _1gb, max_precache_size / _1gb);
-		return false;
-	}
-#endif

 	return true;
 }
--- a/pcsx2/GS/Renderers/Common/GSDevice.cpp
+++ b/pcsx2/GS/Renderers/Common/GSDevice.cpp
@@ -46,8 +46,8 @@ const char* shaderName(ShaderConvert value)
 		case ShaderConvert::DATM_0:                 return "ps_datm0";
 		case ShaderConvert::DATM_1_RTA_CORRECTION:  return "ps_datm1_rta_correction";
 		case ShaderConvert::DATM_0_RTA_CORRECTION:  return "ps_datm0_rta_correction";
-		case ShaderConvert::HDR_INIT:               return "ps_hdr_init";
-		case ShaderConvert::HDR_RESOLVE:            return "ps_hdr_resolve";
+		case ShaderConvert::COLCLIP_INIT:           return "ps_colclip_init";
+		case ShaderConvert::COLCLIP_RESOLVE:        return "ps_colclip_resolve";
 		case ShaderConvert::RTA_CORRECTION:         return "ps_rta_correction";
 		case ShaderConvert::RTA_DECORRECTION:       return "ps_rta_decorrection";
 		case ShaderConvert::TRANSPARENCY_FILTER:    return "ps_filter_transparency";
@@ -103,7 +103,9 @@ const char* shaderName(PresentShader value)
 enum class TextureLabel
 {
 	ColorRT,
-	HDRRT,
+	ColorHQRT,
+	ColorHDRRT,
+	ColorClipRT,
 	U16RT,
 	U32RT,
 	DepthStencil,
@@ -127,8 +129,12 @@ static TextureLabel GetTextureLabel(GSTexture::Type type, GSTexture::Format form
 			{
 				case GSTexture::Format::Color:
 					return TextureLabel::ColorRT;
-				case GSTexture::Format::HDRColor:
-					return TextureLabel::HDRRT;
+				case GSTexture::Format::ColorHQ:
+					return TextureLabel::ColorHQRT;
+				case GSTexture::Format::ColorHDR:
+					return TextureLabel::ColorHDRRT;
+				case GSTexture::Format::ColorClip:
+					return TextureLabel::ColorClipRT;
 				case GSTexture::Format::UInt16:
 					return TextureLabel::U16RT;
 				case GSTexture::Format::UInt32:
@@ -149,6 +155,7 @@ static TextureLabel GetTextureLabel(GSTexture::Type type, GSTexture::Format form
 				case GSTexture::Format::BC2:
 				case GSTexture::Format::BC3:
 				case GSTexture::Format::BC7:
+				case GSTexture::Format::ColorHDR:
 					return TextureLabel::ReplacementTexture;
 				default:
 					return TextureLabel::Other;
@@ -163,14 +170,19 @@ static TextureLabel GetTextureLabel(GSTexture::Type type, GSTexture::Format form
 	}
 }

+// Debug names
 static const char* TextureLabelString(TextureLabel label)
 {
 	switch (label)
 	{
 		case TextureLabel::ColorRT:
 			return "Color RT";
-		case TextureLabel::HDRRT:
-			return "HDR RT";
+		case TextureLabel::ColorHQRT:
+			return "Color HQ RT";
+		case TextureLabel::ColorHDRRT:
+			return "Color HDR RT";
+		case TextureLabel::ColorClipRT:
+			return "Color Clip RT";
 		case TextureLabel::U16RT:
 			return "U16 RT";
 		case TextureLabel::U32RT:
@@ -904,6 +916,7 @@ bool GSHWDrawConfig::BlendState::IsEffective(ColorMaskSelector colormask) const

 // clang-format off

+// Maps PS2 blend modes to our best approximation of them with PC hardware
 const std::array<HWBlend, 3*3*3*3> GSDevice::m_blendMap =
 {{
 	{ BLEND_NO_REC             , OP_ADD          , CONST_ONE       , CONST_ZERO}      , // 0000: (Cs - Cs)*As + Cs ==> Cs
--- a/pcsx2/GS/Renderers/Common/GSDevice.h
+++ b/pcsx2/GS/Renderers/Common/GSDevice.h
@@ -22,8 +22,8 @@ enum class ShaderConvert
 	DATM_0,
 	DATM_1_RTA_CORRECTION,
 	DATM_0_RTA_CORRECTION,
-	HDR_INIT,
-	HDR_RESOLVE,
+	COLCLIP_INIT,
+	COLCLIP_RESOLVE,
 	RTA_CORRECTION,
 	RTA_DECORRECTION,
 	TRANSPARENCY_FILTER,
@@ -257,11 +257,15 @@ enum HWBlendFlags
 	BLEND_A_MAX  = 0x8000, // Impossible blending uses coeff bigger than 1
 };

-// Determines the HW blend function for DX11/OGL
+// Determines the HW blend function for the video backend
 struct HWBlend
 {
+	typedef u8 BlendOp; /*GSDevice::BlendOp*/
+	typedef u8 BlendFactor; /*GSDevice::BlendFactor*/
+
 	u16 flags;
-	u8 op, src, dst;
+	BlendOp op;
+	BlendFactor src, dst;
 };

 struct alignas(16) GSHWDrawConfig
@@ -354,12 +358,12 @@ struct alignas(16) GSHWDrawConfig
 				u32 blend_c        : 2;
 				u32 blend_d        : 2;
 				u32 fixed_one_a    : 1;
-				u32 blend_hw       : 3;
+				u32 blend_hw       : 3; /*HWBlendType*/
 				u32 a_masked       : 1;
-				u32 hdr            : 1;
+				u32 colclip_hw     : 1; // colclip (COLCLAMP off) emulation through HQ textures
 				u32 rta_correction : 1;
 				u32 rta_source_correction : 1;
-				u32 colclip        : 1;
+				u32 colclip        : 1; // COLCLAMP off (color blend outputs wrap around 0-255)
 				u32 blend_mix      : 2;
 				u32 round_inv      : 1; // Blending will invert the value, so rounding needs to go the other way
 				u32 pabe           : 1;
@@ -631,26 +635,30 @@ struct alignas(16) GSHWDrawConfig
 			return true;
 		}
 	};
+	// For hardware rendering backends
 	struct BlendState
 	{
+		typedef u8 BlendOp; /*GSDevice::BlendOp*/
+		typedef u8 BlendFactor; /*GSDevice::BlendFactor*/
+
 		union
 		{
 			struct
 			{
-				u8 enable : 1;
-				u8 constant_enable : 1;
-				u8 op : 6;
-				u8 src_factor : 4;
-				u8 dst_factor : 4;
-				u8 src_factor_alpha : 4;
-				u8 dst_factor_alpha : 4;
+				bool enable : 1;
+				bool constant_enable : 1;
+				BlendOp op : 6;
+				BlendFactor src_factor : 4;
+				BlendFactor dst_factor : 4;
+				BlendFactor src_factor_alpha : 4;
+				BlendFactor dst_factor_alpha : 4;
 				u8 constant;
 			};
 			u32 key;
 		};
 		constexpr BlendState(): key(0) {}
-		constexpr BlendState(bool enable_, u8 src_factor_, u8 dst_factor_, u8 op_,
-			u8 src_alpha_factor_, u8 dst_alpha_factor_, bool constant_enable_, u8 constant_)
+		constexpr BlendState(bool enable_, BlendFactor src_factor_, BlendFactor dst_factor_, BlendOp op_,
+			BlendFactor src_alpha_factor_, BlendFactor dst_alpha_factor_, bool constant_enable_, u8 constant_)
 			: key(0)
 		{
 			enable = enable_;
@@ -675,7 +683,7 @@ struct alignas(16) GSHWDrawConfig
 		Full,           ///< Full emulation (using barriers / ROV)
 	};

-	enum class HDRMode : u8
+	enum class ColClipMode : u8
 	{
 		NoModify = 0,
 		ConvertOnly = 1,
@@ -730,7 +738,7 @@ struct alignas(16) GSHWDrawConfig
 	struct BlendMultiPass
 	{
 		BlendState blend;
-		u8 blend_hw;
+		u8 blend_hw; /*HWBlendType*/
 		u8 dither;
 		bool enable;
 	};
@@ -742,9 +750,9 @@ struct alignas(16) GSHWDrawConfig
 	PSConstantBuffer cb_ps;
 	
 	// These are here as they need to be preserved between draws, and the state clear only does up to the constant buffers.
-	HDRMode hdr_mode;
-	GIFRegFRAME hdr_frame;
-	GSVector4i hdr_update_area; ///< Area in the framebuffer which HDR will modify;
+	ColClipMode colclip_mode;
+	GIFRegFRAME colclip_frame;
+	GSVector4i colclip_update_area; ///< Area in the framebuffer which colclip will modify;
 };

 class GSDevice : public GSAlignedClass<32>
@@ -865,7 +873,7 @@ protected:
 	GSTexture* m_target_tmp = nullptr;
 	GSTexture* m_current = nullptr;
 	GSTexture* m_cas = nullptr;
-	GSTexture* m_hdr_rt = nullptr; ///< Temp HDR texture
+	GSTexture* m_colclip_rt = nullptr; ///< Temp hw colclip texture

 	bool AcquireWindow(bool recreate_window);

@@ -890,9 +898,9 @@ public:
 	/// Returns a string containing current adapter in use.
 	const std::string& GetName() const { return m_name; }

-	GSTexture* GetHDRTexture() const { return m_hdr_rt; }
+	GSTexture* GetColorClipTexture() const { return m_colclip_rt; }
 		
-	void SetHDRTexture(GSTexture* tex) { m_hdr_rt = tex; }
+	void SetColorClipTexture(GSTexture* tex) { m_colclip_rt = tex; }

 	/// Returns a string representing the specified API.
 	static const char* RenderAPIToString(RenderAPI api);
--- a/pcsx2/GS/Renderers/Common/GSTexture.cpp
+++ b/pcsx2/GS/Renderers/Common/GSTexture.cpp
@@ -66,7 +66,9 @@ const char* GSTexture::GetFormatName(Format format)
 	static constexpr const char* format_names[] = {
 		"Invalid",
 		"Color",
-		"HDRColor",
+		"ColorHQ",
+		"ColorHDR",
+		"ColorClip",
 		"DepthStencil",
 		"UNorm8",
 		"UInt16",
@@ -90,7 +92,9 @@ u32 GSTexture::GetCompressedBytesPerBlock(Format format)
 	static constexpr u32 bytes_per_block[] = {
 		1, // Invalid
 		4, // Color/RGBA8
-		8, // HDRColor/RGBA16
+		4, // ColorHQ/RGB10A2
+		8, // ColorHDR/RGBA16F
+		8, // ColorClip/RGBA16
 		4, // DepthStencil
 		1, // UNorm8/R8
 		2, // UInt16/R16UI
@@ -99,7 +103,7 @@ u32 GSTexture::GetCompressedBytesPerBlock(Format format)
 		8, // BC1 - 16 pixels in 64 bits
 		16, // BC2 - 16 pixels in 128 bits
 		16, // BC3 - 16 pixels in 128 bits
-		16, // BC4 - 16 pixels in 128 bits
+		16, // BC7 - 16 pixels in 128 bits
 	};

 	return bytes_per_block[static_cast<u32>(format)];
--- a/pcsx2/GS/Renderers/Common/GSTexture.h
+++ b/pcsx2/GS/Renderers/Common/GSTexture.h
@@ -22,15 +22,17 @@ public:
 		Invalid = 0,
 		RenderTarget = 1,
 		DepthStencil,
-		Texture,
-		RWTexture,
+		Texture,   // Generic texture (usually is color textures loaded by the game)
+		RWTexture, // UAV
 	};

 	enum class Format : u8
 	{
 		Invalid = 0,  ///< Used for initialization
-		Color,        ///< Standard (RGBA8) color texture
-		HDRColor,     ///< Color texture with more bits for colclip emulation (RGBA16Unorm)
+		Color,        ///< Standard (RGBA8) color texture (used to store most of PS2's textures)
+		ColorHQ,      ///< High quality (RGB10A2) color texture (no proper alpha)
+		ColorHDR,     ///< High dynamic range (RGBA16F) color texture
+		ColorClip,    ///< Color texture with more bits for colclip (wrap) emulation, given that blending requires 9bpc (RGBA16Unorm)
 		DepthStencil, ///< Depth stencil texture
 		UNorm8,       ///< A8UNorm texture for paletted textures and the OSD font
 		UInt16,       ///< UInt16 texture for reading back 16-bit depth
@@ -40,6 +42,7 @@ public:
 		BC2,          ///< BC2, aka DXT2/3 compressed texture for replacements
 		BC3,          ///< BC3, aka DXT4/5 compressed texture for replacements
 		BC7,          ///< BC7, aka BPTC compressed texture for replacements
+		Last = BC7,
 	};

 	enum class State : u8
--- a/pcsx2/GS/Renderers/DX11/D3D.cpp
+++ b/pcsx2/GS/Renderers/DX11/D3D.cpp
@@ -87,6 +87,7 @@ std::vector<GSAdapterInfo> D3D::GetAdapterInfo(IDXGIFactory5* factory)
 		ai.max_upscale_multiplier = GSGetMaxUpscaleMultiplier(ai.max_texture_size);

 		wil::com_ptr_nothrow<IDXGIOutput> output;
+		// Only check the first output, which would be the primary display (if any is connected)
 		if (SUCCEEDED(hr = adapter->EnumOutputs(0, &output)))
 		{
 			UINT num_modes = 0;
@@ -111,7 +112,7 @@ std::vector<GSAdapterInfo> D3D::GetAdapterInfo(IDXGIFactory5* factory)
 				ERROR_LOG("GetDisplayModeList() failed: {:08X}", static_cast<unsigned>(hr));
 			}
 		}
-		else
+		else if (hr != DXGI_ERROR_NOT_FOUND)
 		{
 			ERROR_LOG("EnumOutputs() failed: {:08X}", static_cast<unsigned>(hr));
 		}
@@ -515,7 +516,7 @@ wil::com_ptr_nothrow<ID3DBlob> D3D::CompileShader(D3D::ShaderType type, D3D_FEAT
 	}

 	static constexpr UINT flags_non_debug = D3DCOMPILE_OPTIMIZATION_LEVEL3;
-	static constexpr UINT flags_debug = D3DCOMPILE_SKIP_OPTIMIZATION | D3DCOMPILE_DEBUG;
+	static constexpr UINT flags_debug = D3DCOMPILE_SKIP_OPTIMIZATION | D3DCOMPILE_DEBUG | D3DCOMPILE_DEBUG_NAME_FOR_SOURCE;

 	wil::com_ptr_nothrow<ID3DBlob> blob;
 	wil::com_ptr_nothrow<ID3DBlob> error_blob;
--- a/pcsx2/GS/Renderers/DX11/D3D11ShaderCache.cpp
+++ b/pcsx2/GS/Renderers/DX11/D3D11ShaderCache.cpp
@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: GPL-3.0+

 #include "GS/Renderers/DX11/D3D11ShaderCache.h"
+#include "GS/Renderers/DX11/GSDevice11.h"
 #include "GS/GS.h"

 #include "Config.h"
@@ -300,6 +301,12 @@ wil::com_ptr_nothrow<ID3D11VertexShader> D3D11ShaderCache::GetVertexShader(ID3D1
 		return {};
 	}

+	const char* shader_name = entry_point; // Ideally we'd feed in a proper name
+	if (shader_name)
+	{
+		GSDevice11::SetD3DDebugObjectName(shader.get(), shader_name);
+	}
+
 	return shader;
 }

@@ -320,6 +327,12 @@ bool D3D11ShaderCache::GetVertexShaderAndInputLayout(ID3D11Device* device, ID3D1
 		return {};
 	}

+	const char* shader_name = entry_point; // Ideally we'd feed in a proper name
+	if (shader_name)
+	{
+		GSDevice11::SetD3DDebugObjectName(actual_vs.get(), shader_name);
+	}
+
 	hr = device->CreateInputLayout(layout, layout_size, blob->GetBufferPointer(), blob->GetBufferSize(), il);
 	if (FAILED(hr))
 	{
@@ -348,6 +361,12 @@ wil::com_ptr_nothrow<ID3D11PixelShader> D3D11ShaderCache::GetPixelShader(ID3D11D
 		return {};
 	}

+	const char* shader_name = entry_point; // Ideally we'd feed in a proper name
+	if (shader_name)
+	{
+		GSDevice11::SetD3DDebugObjectName(shader.get(), shader_name);
+	}
+
 	return shader;
 }

@@ -368,6 +387,12 @@ wil::com_ptr_nothrow<ID3D11ComputeShader> D3D11ShaderCache::GetComputeShader(ID3
 		return {};
 	}

+	const char* shader_name = entry_point; // Ideally we'd feed in a proper name
+	if (shader_name)
+	{
+		GSDevice11::SetD3DDebugObjectName(shader.get(), shader_name);
+	}
+
 	return shader;
 }

--- a/pcsx2/GS/Renderers/DX11/GSDevice11.cpp
+++ b/pcsx2/GS/Renderers/DX11/GSDevice11.cpp
@@ -1307,7 +1307,6 @@ void GSDevice11::StretchRect(GSTexture* sTex, const GSVector4& sRect, GSTexture*
 	else
 	{
 		ds = GSVector2i(m_window_info.surface_width, m_window_info.surface_height);
-
 	}

 	// om
@@ -1318,8 +1317,6 @@ void GSDevice11::StretchRect(GSTexture* sTex, const GSVector4& sRect, GSTexture*

 	OMSetBlendState(bs, 0);

-
-
 	// ia

 	const float left = dRect.x * 2 / ds.x - 1.0f;
@@ -1336,7 +1333,6 @@ void GSDevice11::StretchRect(GSTexture* sTex, const GSVector4& sRect, GSTexture*
 	};


-
    IASetVertexBuffer(vertices, sizeof(vertices[0]), std::size(vertices));
 	IASetInputLayout(m_convert.il.get());
 	IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
@@ -1345,7 +1341,6 @@ void GSDevice11::StretchRect(GSTexture* sTex, const GSVector4& sRect, GSTexture*

 	VSSetShader(m_convert.vs.get(), nullptr);

-
 	// ps

 	PSSetShaderResource(0, sTex);
@@ -1382,8 +1377,6 @@ void GSDevice11::PresentRect(GSTexture* sTex, const GSVector4& sRect, GSTexture*
 	OMSetDepthStencilState(m_convert.dss.get(), 0);
 	OMSetBlendState(m_convert.bs[D3D11_COLOR_WRITE_ENABLE_ALL].get(), 0);

-
-
 	// ia

 	const float left = dRect.x * 2 / ds.x - 1.0f;
@@ -1399,8 +1392,6 @@ void GSDevice11::PresentRect(GSTexture* sTex, const GSVector4& sRect, GSTexture*
 		{GSVector4(right, bottom, 0.5f, 1.0f), GSVector2(sRect.z, sRect.w)},
 	};

-
-
 	IASetVertexBuffer(vertices, sizeof(vertices[0]), std::size(vertices));
 	IASetInputLayout(m_present.il.get());
 	IASetPrimitiveTopology(D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
@@ -1409,7 +1400,6 @@ void GSDevice11::PresentRect(GSTexture* sTex, const GSVector4& sRect, GSTexture*

 	VSSetShader(m_present.vs.get(), nullptr);

-
 	// ps

 	PSSetShaderResource(0, sTex);
@@ -1748,7 +1738,7 @@ void GSDevice11::SetupPS(const PSSelector& sel, const GSHWDrawConfig::PSConstant
 		sm.AddMacro("PS_DST_FMT", sel.dst_fmt);
 		sm.AddMacro("PS_DEPTH_FMT", sel.depth_fmt);
 		sm.AddMacro("PS_PAL_FMT", sel.pal_fmt);
-		sm.AddMacro("PS_HDR", sel.hdr);
+		sm.AddMacro("PS_COLCLIP_HW", sel.colclip_hw);
 		sm.AddMacro("PS_RTA_CORRECTION", sel.rta_correction);
 		sm.AddMacro("PS_RTA_SRC_CORRECTION", sel.rta_source_correction);
 		sm.AddMacro("PS_COLCLIP", sel.colclip);
@@ -2182,8 +2172,6 @@ void GSDevice11::SetupDATE(GSTexture* rt, GSTexture* ds, const GSVertexPT1* vert
 	//

 	DrawPrimitive();
-
-	//
 }

 void* GSDevice11::IAMapVertexBuffer(u32 stride, u32 count)
@@ -2521,43 +2509,43 @@ void GSDevice11::RenderHW(GSHWDrawConfig& config)

 	GSVector2i rtsize = (config.rt ? config.rt : config.ds)->GetSize();

-	GSTexture* hdr_rt = g_gs_device->GetHDRTexture();
+	GSTexture* colclip_rt = g_gs_device->GetColorClipTexture();

-	if (hdr_rt)
+	if (colclip_rt)
 	{
-		if (config.hdr_mode == GSHWDrawConfig::HDRMode::EarlyResolve)
+		if (config.colclip_mode == GSHWDrawConfig::ColClipMode::EarlyResolve)
 		{
 			const GSVector2i size = config.rt->GetSize();
-			const GSVector4 dRect(config.hdr_update_area);
+			const GSVector4 dRect(config.colclip_update_area);
 			const GSVector4 sRect = dRect / GSVector4(size.x, size.y).xyxy();
-			StretchRect(hdr_rt, sRect, config.rt, dRect, ShaderConvert::HDR_RESOLVE, false);
+			StretchRect(colclip_rt, sRect, config.rt, dRect, ShaderConvert::COLCLIP_RESOLVE, false);
 			g_perfmon.Put(GSPerfMon::TextureCopies, 1);
-			Recycle(hdr_rt);
+			Recycle(colclip_rt);

-			g_gs_device->SetHDRTexture(nullptr);
+			g_gs_device->SetColorClipTexture(nullptr);

-			hdr_rt = nullptr;
+			colclip_rt = nullptr;
 		}
 		else
-			config.ps.hdr = 1;
+			config.ps.colclip_hw = 1;
 	}

-	if (config.ps.hdr)
+	if (config.ps.colclip_hw)
 	{
-		if (!hdr_rt)
+		if (!colclip_rt)
 		{
-			config.hdr_update_area = config.drawarea;
+			config.colclip_update_area = config.drawarea;

-			const GSVector4 dRect = GSVector4((config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertOnly) ? GSVector4i::loadh(rtsize) : config.drawarea);
+			const GSVector4 dRect = GSVector4((config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertOnly) ? GSVector4i::loadh(rtsize) : config.drawarea);
 			const GSVector4 sRect = dRect / GSVector4(rtsize.x, rtsize.y).xyxy();
-			hdr_rt = CreateRenderTarget(rtsize.x, rtsize.y, GSTexture::Format::HDRColor);
-			if (!hdr_rt)
+			colclip_rt = CreateRenderTarget(rtsize.x, rtsize.y, GSTexture::Format::ColorClip);
+			if (!colclip_rt)
 				return;

-			g_gs_device->SetHDRTexture(hdr_rt);
+			g_gs_device->SetColorClipTexture(colclip_rt);
 			// Warning: StretchRect must be called before BeginScene otherwise
 			// vertices will be overwritten. Trust me you don't want to do that.
-			StretchRect(config.rt, sRect, hdr_rt, dRect, ShaderConvert::HDR_INIT, false);
+			StretchRect(config.rt, sRect, colclip_rt, dRect, ShaderConvert::COLCLIP_INIT, false);
 			g_perfmon.Put(GSPerfMon::TextureCopies, 1);
 		}
 	}
@@ -2569,7 +2557,7 @@ void GSDevice11::RenderHW(GSHWDrawConfig& config)
 		if (!primid_tex)
 			return;

-		StretchRect(hdr_rt ? hdr_rt : config.rt, GSVector4(config.drawarea) / GSVector4(rtsize).xyxy(),
+		StretchRect(colclip_rt ? colclip_rt : config.rt, GSVector4(config.drawarea) / GSVector4(rtsize).xyxy(),
 			primid_tex, GSVector4(config.drawarea), m_date.primid_init_ps[static_cast<u8>(config.datm)].get(), nullptr, false);
 	}
 	else if (config.destination_alpha != GSHWDrawConfig::DestinationAlphaMode::Off)
@@ -2585,7 +2573,7 @@ void GSDevice11::RenderHW(GSHWDrawConfig& config)
 			{GSVector4(dst.z, -dst.w, 0.5f, 1.0f), GSVector2(src.z, src.w)},
 		};

-		SetupDATE(hdr_rt ? hdr_rt : config.rt, config.ds, vertices, config.datm);
+		SetupDATE(colclip_rt ? colclip_rt : config.rt, config.ds, vertices, config.datm);
 	}

 	if (config.vs.expand != GSHWDrawConfig::VSExpand::None)
@@ -2643,13 +2631,13 @@ void GSDevice11::RenderHW(GSHWDrawConfig& config)
 	}

 	GSTexture* rt_copy = nullptr;
-	if (config.require_one_barrier || (config.tex && config.tex == config.rt)) // Used as "bind rt" flag when texture barrier is unsupported
+	if (config.require_one_barrier || (config.tex && config.tex == config.rt)) // Used as "bind rt" flag when texture barrier is unsupported.
 	{
 		// Bind the RT.This way special effect can use it.
 		// Do not always bind the rt when it's not needed,
 		// only bind it when effects use it such as fbmask emulation currently
 		// because we copy the frame buffer and it is quite slow.
-		CloneTexture(hdr_rt ? hdr_rt : config.rt, &rt_copy, config.drawarea);
+		CloneTexture(colclip_rt ? colclip_rt : config.rt, &rt_copy, config.drawarea);
 		if (rt_copy)
 		{
 			if (config.require_one_barrier)
@@ -2679,7 +2667,7 @@ void GSDevice11::RenderHW(GSHWDrawConfig& config)
 	}

 	SetupOM(config.depth, OMBlendSelector(config.colormask, config.blend), config.blend.constant);
-	OMSetRenderTargets(hdr_rt ? hdr_rt : config.rt, config.ds, &config.scissor);
+	OMSetRenderTargets(colclip_rt ? colclip_rt : config.rt, config.ds, &config.scissor);
 	DrawIndexedPrimitive();

 	if (config.blend_multi_pass.enable)
@@ -2714,20 +2702,20 @@ void GSDevice11::RenderHW(GSHWDrawConfig& config)
 	if (primid_tex)
 		Recycle(primid_tex);

-	if (hdr_rt)
+	if (colclip_rt)
 	{
-		config.hdr_update_area = config.hdr_update_area.runion(config.drawarea);
+		config.colclip_update_area = config.colclip_update_area.runion(config.drawarea);

-		if (config.hdr_mode == GSHWDrawConfig::HDRMode::ResolveOnly || config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertAndResolve)
+		if (config.colclip_mode == GSHWDrawConfig::ColClipMode::ResolveOnly || config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertAndResolve)
 		{
 			const GSVector2i size = config.rt->GetSize();
-			const GSVector4 dRect(config.hdr_update_area);
+			const GSVector4 dRect(config.colclip_update_area);
 			const GSVector4 sRect = dRect / GSVector4(size.x, size.y).xyxy();
-			StretchRect(hdr_rt, sRect, config.rt, dRect, ShaderConvert::HDR_RESOLVE, false);
+			StretchRect(colclip_rt, sRect, config.rt, dRect, ShaderConvert::COLCLIP_RESOLVE, false);
 			g_perfmon.Put(GSPerfMon::TextureCopies, 1);
-			Recycle(hdr_rt);
+			Recycle(colclip_rt);

-			g_gs_device->SetHDRTexture(nullptr);
+			g_gs_device->SetColorClipTexture(nullptr);
 		}
 	}
 }
--- a/pcsx2/GS/Renderers/DX11/GSTexture11.cpp
+++ b/pcsx2/GS/Renderers/DX11/GSTexture11.cpp
@@ -29,7 +29,9 @@ DXGI_FORMAT GSTexture11::GetDXGIFormat(Format format)
 	switch (format)
 	{
 	case GSTexture::Format::Color:        return DXGI_FORMAT_R8G8B8A8_UNORM;
-	case GSTexture::Format::HDRColor:     return DXGI_FORMAT_R16G16B16A16_UNORM;
+	case GSTexture::Format::ColorHQ:      return DXGI_FORMAT_R10G10B10A2_UNORM;
+	case GSTexture::Format::ColorHDR:     return DXGI_FORMAT_R16G16B16A16_FLOAT;
+	case GSTexture::Format::ColorClip:    return DXGI_FORMAT_R16G16B16A16_UNORM;
 	case GSTexture::Format::DepthStencil: return DXGI_FORMAT_R32G8X24_TYPELESS;
 	case GSTexture::Format::UNorm8:       return DXGI_FORMAT_A8_UNORM;
 	case GSTexture::Format::UInt16:       return DXGI_FORMAT_R16_UINT;
--- a/pcsx2/GS/Renderers/DX12/GSDevice12.cpp
+++ b/pcsx2/GS/Renderers/DX12/GSDevice12.cpp
@@ -739,7 +739,9 @@ bool GSDevice12::Create(GSVSyncMode vsync_mode, bool allow_present_throttle)
 		return false;
 	}

-	CompileCASPipelines();
+	if (!CompileCASPipelines())
+		return false;
+
 	if (!CompileImGuiPipeline())
 		return false;

@@ -1265,13 +1267,17 @@ void GSDevice12::DrawIndexedPrimitive(int offset, int count)
 void GSDevice12::LookupNativeFormat(GSTexture::Format format, DXGI_FORMAT* d3d_format, DXGI_FORMAT* srv_format,
 	DXGI_FORMAT* rtv_format, DXGI_FORMAT* dsv_format) const
 {
-	static constexpr std::array<std::array<DXGI_FORMAT, 4>, static_cast<int>(GSTexture::Format::BC7) + 1>
+	static constexpr std::array<std::array<DXGI_FORMAT, 4>, static_cast<int>(GSTexture::Format::Last) + 1>
 		s_format_mapping = {{
 			{DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN, DXGI_FORMAT_UNKNOWN}, // Invalid
 			{DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM,
 				DXGI_FORMAT_UNKNOWN}, // Color
+			{DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_FORMAT_R10G10B10A2_UNORM, DXGI_FORMAT_R10G10B10A2_UNORM,
+				DXGI_FORMAT_UNKNOWN}, // ColorHQ
+			{DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_R16G16B16A16_FLOAT, DXGI_FORMAT_R16G16B16A16_FLOAT,
+				DXGI_FORMAT_UNKNOWN}, // ColorHDR
 			{DXGI_FORMAT_R16G16B16A16_UNORM, DXGI_FORMAT_R16G16B16A16_UNORM, DXGI_FORMAT_R16G16B16A16_UNORM,
-				DXGI_FORMAT_UNKNOWN}, // HDRColor
+				DXGI_FORMAT_UNKNOWN}, // ColorClip
 			{DXGI_FORMAT_D32_FLOAT_S8X24_UINT, DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS, DXGI_FORMAT_UNKNOWN,
 				DXGI_FORMAT_D32_FLOAT_S8X24_UINT}, // DepthStencil
 			{DXGI_FORMAT_A8_UNORM, DXGI_FORMAT_A8_UNORM, DXGI_FORMAT_A8_UNORM, DXGI_FORMAT_UNKNOWN}, // UNorm8
@@ -1424,9 +1430,10 @@ void GSDevice12::StretchRect(GSTexture* sTex, const GSVector4& sRect, GSTexture*
 	GL_PUSH("ColorCopy Red:%d Green:%d Blue:%d Alpha:%d", red, green, blue, alpha);

 	const u32 index = (red ? 1 : 0) | (green ? 2 : 0) | (blue ? 4 : 0) | (alpha ? 8 : 0);
+	int rta_offset = (shader == ShaderConvert::RTA_CORRECTION) ? 16 : 0;
 	const bool allow_discard = (index == 0xf);
 	DoStretchRect(static_cast<GSTexture12*>(sTex), sRect, static_cast<GSTexture12*>(dTex), dRect,
-		m_color_copy[index].get(), false, allow_discard);
+		m_color_copy[index + rta_offset].get(), false, allow_discard);
 }

 void GSDevice12::PresentRect(GSTexture* sTex, const GSVector4& sRect, GSTexture* dTex, const GSVector4& dRect,
@@ -2520,13 +2527,6 @@ bool GSDevice12::CompileConvertPipelines()
 			// compile color copy pipelines
 			gpb.SetRenderTarget(0, DXGI_FORMAT_R8G8B8A8_UNORM);
 			gpb.SetDepthStencilFormat(DXGI_FORMAT_UNKNOWN);
-
-			ComPtr<ID3DBlob> ps(GetUtilityPixelShader(*shader, shaderName(i)));
-			if (!ps)
-				return false;
-
-			gpb.SetPixelShader(ps.get());
-
 			for (u32 j = 16; j < 32; j++)
 			{
 				pxAssert(!m_color_copy[j]);
@@ -2540,10 +2540,10 @@ bool GSDevice12::CompileConvertPipelines()
 																j & 1u, (j >> 1) & 1u, (j >> 2) & 1u, (j >> 3) & 1u));
 			}
 		}
-		else if (i == ShaderConvert::HDR_INIT || i == ShaderConvert::HDR_RESOLVE)
+		else if (i == ShaderConvert::COLCLIP_INIT || i == ShaderConvert::COLCLIP_RESOLVE)
 		{
-			const bool is_setup = i == ShaderConvert::HDR_INIT;
-			std::array<ComPtr<ID3D12PipelineState>, 2>& arr = is_setup ? m_hdr_setup_pipelines : m_hdr_finish_pipelines;
+			const bool is_setup = i == ShaderConvert::COLCLIP_INIT;
+			std::array<ComPtr<ID3D12PipelineState>, 2>& arr = is_setup ? m_colclip_setup_pipelines : m_colclip_finish_pipelines;
 			for (u32 ds = 0; ds < 2; ds++)
 			{
 				pxAssert(!arr[ds]);
@@ -2554,7 +2554,7 @@ bool GSDevice12::CompileConvertPipelines()
 				if (!arr[ds])
 					return false;

-				D3D12::SetObjectName(arr[ds].get(), TinyString::from_format("HDR {}/copy pipeline (ds={})", is_setup ? "setup" : "finish", ds));
+				D3D12::SetObjectName(arr[ds].get(), TinyString::from_format("ColorClip {}/copy pipeline (ds={})", is_setup ? "setup" : "finish", ds));
 			}
 		}
 	}
@@ -2598,8 +2598,8 @@ bool GSDevice12::CompilePresentPipelines()
 		return false;
 	}

-	ComPtr<ID3DBlob> m_convert_vs = GetUtilityVertexShader(*shader, "vs_main");
-	if (!m_convert_vs)
+	ComPtr<ID3DBlob> vs = GetUtilityVertexShader(*shader, "vs_main");
+	if (!vs)
 		return false;

 	D3D12::GraphicsPipelineBuilder gpb;
@@ -2607,7 +2607,7 @@ bool GSDevice12::CompilePresentPipelines()
 	AddUtilityVertexAttributes(gpb);
 	gpb.SetNoCullRasterizationState();
 	gpb.SetNoBlendingState();
-	gpb.SetVertexShader(m_convert_vs.get());
+	gpb.SetVertexShader(vs.get());
 	gpb.SetDepthState(false, false, D3D12_COMPARISON_FUNC_ALWAYS);
 	gpb.SetNoStencilState();
 	gpb.SetRenderTarget(0, DXGI_FORMAT_R8G8B8A8_UNORM);
@@ -2663,7 +2663,7 @@ bool GSDevice12::CompileInterlacePipelines()
 		if (!m_interlace[i])
 			return false;

-		D3D12::SetObjectName(m_convert[i].get(), TinyString::from_format("Interlace pipeline {}", static_cast<int>(i)));
+		D3D12::SetObjectName(m_interlace[i].get(), TinyString::from_format("Interlace pipeline {}", static_cast<int>(i)));
 	}

 	return true;
@@ -2700,7 +2700,7 @@ bool GSDevice12::CompileMergePipelines()
 		if (!m_merge[i])
 			return false;

-		D3D12::SetObjectName(m_convert[i].get(), TinyString::from_format("Merge pipeline {}", i));
+		D3D12::SetObjectName(m_merge[i].get(), TinyString::from_format("Merge pipeline {}", i));
 	}

 	return true;
@@ -2780,8 +2780,8 @@ void GSDevice12::DestroyResources()
 	m_color_copy = {};
 	m_present = {};
 	m_convert = {};
-	m_hdr_setup_pipelines = {};
-	m_hdr_finish_pipelines = {};
+	m_colclip_setup_pipelines = {};
+	m_colclip_finish_pipelines = {};
 	m_date_image_setup_pipelines = {};
 	m_fxaa_pipeline.reset();
 	m_shadeboost_pipeline.reset();
@@ -2897,7 +2897,7 @@ const ID3DBlob* GSDevice12::GetTFXPixelShader(const GSHWDrawConfig::PSSelector&
 	sm.AddMacro("PS_DST_FMT", sel.dst_fmt);
 	sm.AddMacro("PS_DEPTH_FMT", sel.depth_fmt);
 	sm.AddMacro("PS_PAL_FMT", sel.pal_fmt);
-	sm.AddMacro("PS_HDR", sel.hdr);
+	sm.AddMacro("PS_COLCLIP_HW", sel.colclip_hw);
 	sm.AddMacro("PS_RTA_CORRECTION", sel.rta_correction);
 	sm.AddMacro("PS_RTA_SRC_CORRECTION", sel.rta_source_correction);
 	sm.AddMacro("PS_COLCLIP", sel.colclip);
@@ -2955,7 +2955,7 @@ GSDevice12::ComPtr<ID3D12PipelineState> GSDevice12::CreateTFXPipeline(const Pipe
 	{
 		const GSTexture::Format format = IsDATEModePrimIDInit(p.ps.date) ?
 											 GSTexture::Format::PrimID :
-											 (p.ps.hdr ? GSTexture::Format::HDRColor : GSTexture::Format::Color);
+											 (p.ps.colclip_hw ? GSTexture::Format::ColorClip : GSTexture::Format::Color);

 		DXGI_FORMAT native_format;
 		LookupNativeFormat(format, nullptr, nullptr, &native_format, nullptr);
@@ -3817,7 +3817,7 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 	const bool stencil_DATE = (config.destination_alpha == GSHWDrawConfig::DestinationAlphaMode::Stencil ||
 							   config.destination_alpha == GSHWDrawConfig::DestinationAlphaMode::StencilOne);

-	GSTexture12* hdr_rt = static_cast<GSTexture12*>(g_gs_device->GetHDRTexture());
+	GSTexture12* colclip_rt = static_cast<GSTexture12*>(g_gs_device->GetColorClipTexture());
 	GSTexture12* draw_rt = static_cast<GSTexture12*>(config.rt);
 	GSTexture12* draw_ds = static_cast<GSTexture12*>(config.ds);
 	GSTexture12* draw_rt_clone = nullptr;
@@ -3830,15 +3830,15 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 	// figure out the pipeline
 	UpdateHWPipelineSelector(config);

-	// now blit the hdr texture back to the original target
-	if (hdr_rt)
+	// now blit the colclip texture back to the original target
+	if (colclip_rt)
 	{
-		if (config.hdr_mode == GSHWDrawConfig::HDRMode::EarlyResolve)
+		if (config.colclip_mode == GSHWDrawConfig::ColClipMode::EarlyResolve)
 		{
-			GL_PUSH("Blit HDR back to RT");
+			GL_PUSH("Blit ColorClip back to RT");

 			EndRenderPass();
-			hdr_rt->TransitionToState(D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+			colclip_rt->TransitionToState(D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);

 			draw_rt = static_cast<GSTexture12*>(config.rt);
 			OMSetRenderTargets(draw_rt, draw_ds, config.scissor);
@@ -3850,19 +3850,19 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 				D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE_NO_ACCESS, D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_NO_ACCESS,
 				draw_rt->GetUNormClearColor(), 0.0f, 0);

-			const GSVector4 sRect(GSVector4(config.hdr_update_area) / GSVector4(rtsize.x, rtsize.y).xyxy());
-			SetPipeline(m_hdr_finish_pipelines[pipe.ds].get());
-			SetUtilityTexture(hdr_rt, m_point_sampler_cpu);
-			DrawStretchRect(sRect, GSVector4(config.hdr_update_area), rtsize);
+			const GSVector4 sRect(GSVector4(config.colclip_update_area) / GSVector4(rtsize.x, rtsize.y).xyxy());
+			SetPipeline(m_colclip_finish_pipelines[pipe.ds].get());
+			SetUtilityTexture(colclip_rt, m_point_sampler_cpu);
+			DrawStretchRect(sRect, GSVector4(config.colclip_update_area), rtsize);
 			g_perfmon.Put(GSPerfMon::TextureCopies, 1);

-			Recycle(hdr_rt);
-			g_gs_device->SetHDRTexture(nullptr);
+			Recycle(colclip_rt);
+			g_gs_device->SetColorClipTexture(nullptr);
 		}
 		else
 		{
-			draw_rt = hdr_rt;
-			pipe.ps.hdr = 1;
+			draw_rt = colclip_rt;
+			pipe.ps.colclip_hw = 1;
 		}
 	}

@@ -3900,10 +3900,10 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 		}
 	}

-	if (config.require_one_barrier)
+	if (config.require_one_barrier || (config.tex && config.tex == config.rt)) // Used as "bind rt" flag when texture barrier is unsupported.
 	{
 		// requires a copy of the RT
-		draw_rt_clone = static_cast<GSTexture12*>(CreateTexture(rtsize.x, rtsize.y, 1, hdr_rt ? GSTexture::Format::HDRColor : GSTexture::Format::Color, true));
+		draw_rt_clone = static_cast<GSTexture12*>(CreateTexture(rtsize.x, rtsize.y, 1, colclip_rt ? GSTexture::Format::ColorClip : GSTexture::Format::Color, true));
 		if (draw_rt_clone)
 		{
 			EndRenderPass();
@@ -3913,23 +3913,26 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)

 			draw_rt_clone->SetState(GSTexture::State::Invalidated);
 			CopyRect(draw_rt, draw_rt_clone, config.drawarea, config.drawarea.left, config.drawarea.top);
-			PSSetShaderResource(2, draw_rt_clone, true);
+			if (config.require_one_barrier)
+				PSSetShaderResource(2, draw_rt_clone, true);
+			if (config.tex && config.tex == config.rt)
+				PSSetShaderResource(0, draw_rt_clone, true);
 		}
 	}

-	// Switch to hdr target for colclip rendering
-	if (pipe.ps.hdr)
+	// Switch to colclip target for colclip hw rendering
+	if (pipe.ps.colclip_hw)
 	{
-		if (!hdr_rt)
+		if (!colclip_rt)
 		{
-			config.hdr_update_area = config.drawarea;
+			config.colclip_update_area = config.drawarea;

 			EndRenderPass();

-			hdr_rt = static_cast<GSTexture12*>(CreateRenderTarget(rtsize.x, rtsize.y, GSTexture::Format::HDRColor, false));
-			if (!hdr_rt)
+			colclip_rt = static_cast<GSTexture12*>(CreateRenderTarget(rtsize.x, rtsize.y, GSTexture::Format::ColorClip, false));
+			if (!colclip_rt)
 			{
-				Console.WriteLn("D3D12: Failed to allocate HDR render target, aborting draw.");
+				Console.WriteLn("D3D12: Failed to allocate ColorClip render target, aborting draw.");

 				if (date_image)
 					Recycle(date_image);
@@ -3937,17 +3940,17 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 				return;
 			}

-			g_gs_device->SetHDRTexture(static_cast<GSTexture*>(hdr_rt));
+			g_gs_device->SetColorClipTexture(static_cast<GSTexture*>(colclip_rt));

-			// propagate clear value through if the hdr render is the first
+			// propagate clear value through if the colclip render is the first
 			if (draw_rt->GetState() == GSTexture::State::Cleared)
 			{
-				hdr_rt->SetState(GSTexture::State::Cleared);
-				hdr_rt->SetClearColor(draw_rt->GetClearColor());
+				colclip_rt->SetState(GSTexture::State::Cleared);
+				colclip_rt->SetClearColor(draw_rt->GetClearColor());
 			}
 			else if (draw_rt->GetState() == GSTexture::State::Dirty)
 			{
-				GL_PUSH_("HDR Render Target Setup");
+				GL_PUSH_("ColorClip Render Target Setup");
 				draw_rt->TransitionToState(D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
 			}

@@ -3956,7 +3959,7 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 				PSSetShaderResource(2, draw_rt, true);
 		}

-		draw_rt = hdr_rt;
+		draw_rt = colclip_rt;
 	}

 	// clear texture binding when it's bound to RT or DS
@@ -3966,11 +3969,10 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 		PSSetShaderResource(0, nullptr, false);
 	}

-	// avoid restarting the render pass just to switch from rt+depth to rt and vice versa
 	if (m_in_render_pass && (m_current_render_target == draw_rt || m_current_depth_target == draw_ds))
 	{
 		// avoid restarting the render pass just to switch from rt+depth to rt and vice versa
-		// keep the depth even if doing HDR draws, because the next draw will probably re-enable depth
+		// keep the depth even if doing colclip hw draws, because the next draw will probably re-enable depth
 		if (!draw_rt && m_current_render_target && config.tex != m_current_render_target &&
 			m_current_render_target->GetSize() == draw_ds->GetSize())
 		{
@@ -3991,9 +3993,9 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 	if (!m_in_render_pass)
 	{
 		GSVector4 clear_color = draw_rt ? draw_rt->GetUNormClearColor() : GSVector4::zero();
-		if (pipe.ps.hdr)
+		if (pipe.ps.colclip_hw)
 		{
-			// Denormalize clear color for HDR.
+			// Denormalize clear color for hw colclip.
 			clear_color *= GSVector4::cxpr(255.0f / 65535.0f, 255.0f / 65535.0f, 255.0f / 65535.0f, 1.0f);
 		}
 		BeginRenderPass(GetLoadOpForTexture(draw_rt),
@@ -4007,13 +4009,13 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 			clear_color, draw_ds ? draw_ds->GetClearDepth() : 0.0f, 1);
 	}

-	// rt -> hdr blit if enabled
-	if (hdr_rt && (config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertOnly || config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertAndResolve) && config.rt->GetState() == GSTexture::State::Dirty)
+	// rt -> colclip hw blit if enabled
+	if (colclip_rt && (config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertOnly || config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertAndResolve) && config.rt->GetState() == GSTexture::State::Dirty)
 	{
 		SetUtilityTexture(static_cast<GSTexture12*>(config.rt), m_point_sampler_cpu);
-		SetPipeline(m_hdr_setup_pipelines[pipe.ds].get());
+		SetPipeline(m_colclip_setup_pipelines[pipe.ds].get());

-		const GSVector4 drawareaf = GSVector4((config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertOnly) ? GSVector4i::loadh(rtsize) : config.drawarea);
+		const GSVector4 drawareaf = GSVector4((config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertOnly) ? GSVector4i::loadh(rtsize) : config.drawarea);
 		const GSVector4 sRect(drawareaf / GSVector4(rtsize.x, rtsize.y).xyxy());
 		DrawStretchRect(sRect, GSVector4(drawareaf), rtsize);
 		g_perfmon.Put(GSPerfMon::TextureCopies, 1);
@@ -4021,9 +4023,9 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 		GL_POP();
 	}

-	// VB/IB upload, if we did DATE setup and it's not HDR this has already been done
+	// VB/IB upload, if we did DATE setup and it's not colclip hw this has already been done
 	SetPrimitiveTopology(s_primitive_topology_mapping[static_cast<u8>(config.topology)]);
-	if (!date_image || hdr_rt)
+	if (!date_image || colclip_rt)
 		UploadHWDrawVerticesAndIndices(config);

 	// now we can do the actual draw
@@ -4067,17 +4069,17 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 	if (date_image)
 		Recycle(date_image);

-	// now blit the hdr texture back to the original target
-	if (hdr_rt)
+	// now blit the colclip texture back to the original target
+	if (colclip_rt)
 	{
-		config.hdr_update_area = config.hdr_update_area.runion(config.drawarea);
+		config.colclip_update_area = config.colclip_update_area.runion(config.drawarea);

-		if ((config.hdr_mode == GSHWDrawConfig::HDRMode::ResolveOnly || config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertAndResolve))
+		if ((config.colclip_mode == GSHWDrawConfig::ColClipMode::ResolveOnly || config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertAndResolve))
 		{
-			GL_PUSH("Blit HDR back to RT");
+			GL_PUSH("Blit ColorClip back to RT");

 			EndRenderPass();
-			hdr_rt->TransitionToState(D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);
+			colclip_rt->TransitionToState(D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE);

 			draw_rt = static_cast<GSTexture12*>(config.rt);
 			OMSetRenderTargets(draw_rt, draw_ds, config.scissor);
@@ -4089,14 +4091,14 @@ void GSDevice12::RenderHW(GSHWDrawConfig& config)
 				D3D12_RENDER_PASS_BEGINNING_ACCESS_TYPE_NO_ACCESS, D3D12_RENDER_PASS_ENDING_ACCESS_TYPE_NO_ACCESS,
 				draw_rt->GetUNormClearColor(), 0.0f, 0);

-			const GSVector4 sRect(GSVector4(config.hdr_update_area) / GSVector4(rtsize.x, rtsize.y).xyxy());
-			SetPipeline(m_hdr_finish_pipelines[pipe.ds].get());
-			SetUtilityTexture(hdr_rt, m_point_sampler_cpu);
-			DrawStretchRect(sRect, GSVector4(config.hdr_update_area), rtsize);
+			const GSVector4 sRect(GSVector4(config.colclip_update_area) / GSVector4(rtsize.x, rtsize.y).xyxy());
+			SetPipeline(m_colclip_finish_pipelines[pipe.ds].get());
+			SetUtilityTexture(colclip_rt, m_point_sampler_cpu);
+			DrawStretchRect(sRect, GSVector4(config.colclip_update_area), rtsize);
 			g_perfmon.Put(GSPerfMon::TextureCopies, 1);

-			Recycle(hdr_rt);
-			g_gs_device->SetHDRTexture(nullptr);
+			Recycle(colclip_rt);
+			g_gs_device->SetColorClipTexture(nullptr);
 		}
 	}
 }
--- a/pcsx2/GS/Renderers/DX12/GSDevice12.h
+++ b/pcsx2/GS/Renderers/DX12/GSDevice12.h
@@ -315,8 +315,8 @@ private:
 	std::array<ComPtr<ID3D12PipelineState>, 32> m_color_copy{};
 	std::array<ComPtr<ID3D12PipelineState>, 2> m_merge{};
 	std::array<ComPtr<ID3D12PipelineState>, NUM_INTERLACE_SHADERS> m_interlace{};
-	std::array<ComPtr<ID3D12PipelineState>, 2> m_hdr_setup_pipelines{}; // [depth]
-	std::array<ComPtr<ID3D12PipelineState>, 2> m_hdr_finish_pipelines{}; // [depth]
+	std::array<ComPtr<ID3D12PipelineState>, 2> m_colclip_setup_pipelines{}; // [depth]
+	std::array<ComPtr<ID3D12PipelineState>, 2> m_colclip_finish_pipelines{}; // [depth]
 	std::array<std::array<ComPtr<ID3D12PipelineState>, 4>, 2> m_date_image_setup_pipelines{}; // [depth][datm]
 	ComPtr<ID3D12PipelineState> m_fxaa_pipeline;
 	ComPtr<ID3D12PipelineState> m_shadeboost_pipeline;
--- a/pcsx2/GS/Renderers/HW/GSHwHack.cpp
+++ b/pcsx2/GS/Renderers/HW/GSHwHack.cpp
@@ -178,7 +178,7 @@ bool GSHwHack::GSC_DTGames(GSRendererHW& r, int& skip)
 	return true;
 }

-bool GSHwHack::GSC_Tekken5(GSRendererHW& r, int& skip)
+bool GSHwHack::GSC_NamcoGames(GSRendererHW& r, int& skip)
 {
 	if (skip == 0)
 	{
@@ -195,7 +195,7 @@ bool GSHwHack::GSC_Tekken5(GSRendererHW& r, int& skip)
 			if (!rt)
 				return false;

-			GL_INS("GSC_Tekken5(): HLE channel shuffle");
+			GL_INS("GSC_NamcoGames(): HLE channel shuffle");

 			// have to set up the palette ourselves too, since GSC executes before it does
 			r.m_mem.m_clut.Read32(RTEX0, r.m_draw_env->TEXA);
@@ -1502,14 +1502,12 @@ const GSHwHack::Entry<GSRendererHW::GSC_Ptr> GSHwHack::s_get_skip_count_function
 	CRC_F(GSC_Battlefield2),

 	// Channel Effect
+	CRC_F(GSC_NamcoGames),
 	CRC_F(GSC_SteambotChronicles),

 	// Depth Issue
 	CRC_F(GSC_BurnoutGames),

-	// Half Screen bottom issue
-	CRC_F(GSC_Tekken5),
-
 	// Upscaling hacks
 	CRC_F(GSC_UltramanFightingEvolution),
 };
--- a/pcsx2/GS/Renderers/HW/GSHwHack.h
+++ b/pcsx2/GS/Renderers/HW/GSHwHack.h
@@ -11,7 +11,7 @@ public:
 	static bool GSC_GuitarHero(GSRendererHW& r, int& skip);
 	static bool GSC_SFEX3(GSRendererHW& r, int& skip);
 	static bool GSC_DTGames(GSRendererHW& r, int& skip);
-	static bool GSC_Tekken5(GSRendererHW& r, int& skip);
+	static bool GSC_NamcoGames(GSRendererHW& r, int& skip);
 	static bool GSC_BurnoutGames(GSRendererHW& r, int& skip);
 	static bool GSC_BlackAndBurnoutSky(GSRendererHW& r, int& skip);
 	static bool GSC_MidnightClub3(GSRendererHW& r, int& skip);
--- a/pcsx2/GS/Renderers/HW/GSRendererHW.cpp
+++ b/pcsx2/GS/Renderers/HW/GSRendererHW.cpp
@@ -1135,7 +1135,7 @@ GSVector2i GSRendererHW::GetTargetSize(const GSTextureCache::Source* tex, const
 	return g_texture_cache->GetTargetSize(m_cached_ctx.FRAME.Block(), m_cached_ctx.FRAME.FBW, m_cached_ctx.FRAME.PSM, valid_size.x, valid_size.y, can_expand);
 }

-bool GSRendererHW::NextDrawHDR() const
+bool GSRendererHW::NextDrawColClip() const
 {
 	const int get_next_ctx = (m_state_flush_reason == CONTEXTCHANGE) ? m_env.PRIM.CTXT : m_backed_up_ctx;
 	const GSDrawingContext& next_ctx = m_env.CTXT[get_next_ctx];
@@ -2438,31 +2438,31 @@ void GSRendererHW::Draw()

 	// I hate that I have to do this, but some games (like Pac-Man World Rally) troll us by causing a flush with degenerate triangles, so we don't have all available information about the next draw.
 	// So we have to check when the next draw happens if our frame has changed or if it's become recursive.
-	const bool has_HDR_texture = g_gs_device->GetHDRTexture() != nullptr;
-	if (!no_rt && has_HDR_texture && (m_conf.hdr_frame.FBP != m_cached_ctx.FRAME.FBP || m_conf.hdr_frame.Block() == m_cached_ctx.TEX0.TBP0))
+	const bool has_colclip_texture = g_gs_device->GetColorClipTexture() != nullptr;
+	if (!no_rt && has_colclip_texture && (m_conf.colclip_frame.FBP != m_cached_ctx.FRAME.FBP || m_conf.colclip_frame.Block() == m_cached_ctx.TEX0.TBP0))
 	{
 		GIFRegTEX0 FRAME;
-		FRAME.TBP0 = m_conf.hdr_frame.Block();
-		FRAME.TBW = m_conf.hdr_frame.FBW;
-		FRAME.PSM = m_conf.hdr_frame.PSM;
+		FRAME.TBP0 = m_conf.colclip_frame.Block();
+		FRAME.TBW = m_conf.colclip_frame.FBW;
+		FRAME.PSM = m_conf.colclip_frame.PSM;

 		GSTextureCache::Target* old_rt = g_texture_cache->LookupTarget(FRAME, GSVector2i(1, 1), GetTextureScaleFactor(), GSTextureCache::RenderTarget, true,
 			fm, false, false, true, true, GSVector4i(0, 0, 1, 1), true, false, false);

 		if (old_rt)
 		{
-			GL_CACHE("Pre-draw resolve of HDR! Address: %x", FRAME.TBP0);
-			GSTexture* hdr_texture = g_gs_device->GetHDRTexture();
-			g_gs_device->StretchRect(hdr_texture, GSVector4(m_conf.hdr_update_area) / GSVector4(GSVector4i(hdr_texture->GetSize()).xyxy()), old_rt->m_texture, GSVector4(m_conf.hdr_update_area),
-				ShaderConvert::HDR_RESOLVE, false);
+			GL_CACHE("Pre-draw resolve of colclip! Address: %x", FRAME.TBP0);
+			GSTexture* colclip_texture = g_gs_device->GetColorClipTexture();
+			g_gs_device->StretchRect(colclip_texture, GSVector4(m_conf.colclip_update_area) / GSVector4(GSVector4i(colclip_texture->GetSize()).xyxy()), old_rt->m_texture, GSVector4(m_conf.colclip_update_area),
+				ShaderConvert::COLCLIP_RESOLVE, false);

-			g_gs_device->Recycle(hdr_texture);
+			g_gs_device->Recycle(colclip_texture);

-			g_gs_device->SetHDRTexture(nullptr);
+			g_gs_device->SetColorClipTexture(nullptr);

 		}
 		else
-			DevCon.Warning("Error resolving HDR texture for pre-draw resolve");
+			DevCon.Warning("Error resolving colclip texture for pre-draw resolve");
 	}

 	const bool draw_sprite_tex = PRIM->TME && (m_vt.m_primclass == GS_SPRITE_CLASS);
@@ -4267,12 +4267,12 @@ void GSRendererHW::Draw()

 	if (GSConfig.ShouldDump(s_n, g_perfmon.GetFrame()))
 	{
-		const bool writeback_HDR_texture = g_gs_device->GetHDRTexture() != nullptr;
-		if (writeback_HDR_texture)
+		const bool writeback_colclip_texture = g_gs_device->GetColorClipTexture() != nullptr;
+		if (writeback_colclip_texture)
 		{
-			GSTexture* hdr_texture = g_gs_device->GetHDRTexture();
-			g_gs_device->StretchRect(hdr_texture, GSVector4(m_conf.hdr_update_area) / GSVector4(GSVector4i(hdr_texture->GetSize()).xyxy()), rt->m_texture, GSVector4(m_conf.hdr_update_area),
-				ShaderConvert::HDR_RESOLVE, false);
+			GSTexture* colclip_texture = g_gs_device->GetColorClipTexture();
+			g_gs_device->StretchRect(colclip_texture, GSVector4(m_conf.colclip_update_area) / GSVector4(GSVector4i(colclip_texture->GetSize()).xyxy()), rt->m_texture, GSVector4(m_conf.colclip_update_area),
+				ShaderConvert::COLCLIP_RESOLVE, false);
 		}

 		const u64 frame = g_perfmon.GetFrame();
@@ -5228,10 +5228,10 @@ void GSRendererHW::EmulateBlending(int rt_alpha_min, int rt_alpha_max, const boo
 	// Per pixel alpha blending.
 	const bool PABE = m_draw_env->PABE.PABE && GetAlphaMinMax().min < 128;

-	// HW blend can handle it, no need for sw or hdr colclip, Cd*Alpha or Cd*(1 - Alpha) where Alpha <= 128.
+	// HW blend can handle it, no need for sw or hw colclip, Cd*Alpha or Cd*(1 - Alpha) where Alpha <= 128.
 	bool color_dest_blend2 = !PABE && ((m_conf.ps.blend_a == 1 && m_conf.ps.blend_b == 2 && m_conf.ps.blend_d == 2) || (m_conf.ps.blend_a == 2 && m_conf.ps.blend_b == 1 && m_conf.ps.blend_d == 1)) &&
 		(alpha_eq_less_one || (alpha_c1_eq_less_max_one && new_rt_alpha_scale));
-	// HW blend can handle it, no need for sw or hdr colclip, Cs*Alpha + Cd*(1 - Alpha) or Cd*Alpha + Cs*(1 - Alpha) where Alpha <= 128.
+	// HW blend can handle it, no need for sw or hw colclip, Cs*Alpha + Cd*(1 - Alpha) or Cd*Alpha + Cs*(1 - Alpha) where Alpha <= 128.
 	bool blend_zero_to_one_range = !PABE && ((m_conf.ps.blend_a == 0 && m_conf.ps.blend_b == 1 && m_conf.ps.blend_d == 1) || (blend_flag & BLEND_MIX3)) &&
 		(alpha_eq_less_one || (alpha_c1_eq_less_max_one && new_rt_alpha_scale));

@@ -5382,36 +5382,35 @@ void GSRendererHW::EmulateBlending(int rt_alpha_min, int rt_alpha_max, const boo
 	// Color clip
 	if (COLCLAMP.CLAMP == 0)
 	{
-		bool has_HDR_texture = g_gs_device->GetHDRTexture() != nullptr;
+		bool has_colclip_texture = g_gs_device->GetColorClipTexture() != nullptr;

-		// Don't know any game that resizes the RT mid HDR, but gotta be careful.
-		if (has_HDR_texture)
+		// Don't know any game that resizes the RT mid colclip, but gotta be careful.
+		if (has_colclip_texture)
 		{
-			GSTexture* hdr_texture = g_gs_device->GetHDRTexture();
+			GSTexture* colclip_texture = g_gs_device->GetColorClipTexture();

-			if (hdr_texture->GetSize() != rt->m_texture->GetSize())
+			if (colclip_texture->GetSize() != rt->m_texture->GetSize())
 			{
+				GL_CACHE("Pre-Blend resolve of colclip due to size change! Address: %x", rt->m_TEX0.TBP0);
+				g_gs_device->StretchRect(colclip_texture, GSVector4(m_conf.colclip_update_area) / GSVector4(GSVector4i(colclip_texture->GetSize()).xyxy()), rt->m_texture, GSVector4(m_conf.colclip_update_area),
+					ShaderConvert::COLCLIP_RESOLVE, false);

-				GL_CACHE("Pre-Blend resolve of HDR due to size change! Address: %x", rt->m_TEX0.TBP0);
-				g_gs_device->StretchRect(hdr_texture, GSVector4(m_conf.hdr_update_area) / GSVector4(GSVector4i(hdr_texture->GetSize()).xyxy()), rt->m_texture, GSVector4(m_conf.hdr_update_area),
-					ShaderConvert::HDR_RESOLVE, false);
+				g_gs_device->Recycle(colclip_texture);

-				g_gs_device->Recycle(hdr_texture);
+				g_gs_device->SetColorClipTexture(nullptr);

-				g_gs_device->SetHDRTexture(nullptr);
-
-				has_HDR_texture = false;
+				has_colclip_texture = false;
 			}
 		}

-		const bool free_colclip = !has_HDR_texture && (features.framebuffer_fetch || no_prim_overlap || blend_non_recursive);
+		const bool free_colclip = !has_colclip_texture && (features.framebuffer_fetch || no_prim_overlap || blend_non_recursive);
 		GL_DBG("COLCLIP Info (Blending: %u/%u/%u/%u, OVERLAP: %d)", m_conf.ps.blend_a, m_conf.ps.blend_b, m_conf.ps.blend_c, m_conf.ps.blend_d, m_prim_overlap);
 		if (color_dest_blend || color_dest_blend2 || blend_zero_to_one_range)
 		{
 			// No overflow, disable colclip.
 			GL_INS("COLCLIP mode DISABLED");
 			sw_blending = false;
-			m_conf.hdr_mode = (has_HDR_texture && !NextDrawHDR()) ? GSHWDrawConfig::HDRMode::ResolveOnly : GSHWDrawConfig::HDRMode::NoModify;
+			m_conf.colclip_mode = (has_colclip_texture && !NextDrawColClip()) ? GSHWDrawConfig::ColClipMode::ResolveOnly : GSHWDrawConfig::ColClipMode::NoModify;
 		}
 		else if (free_colclip)
 		{
@@ -5419,35 +5418,35 @@ void GSRendererHW::EmulateBlending(int rt_alpha_min, int rt_alpha_max, const boo
 			GL_INS("COLCLIP Free mode ENABLED");
 			m_conf.ps.colclip  = 1;
 			sw_blending        = true;
-			// Disable the HDR algo
+			// Disable the colclip hw algo
 			accumulation_blend = false;
 			blend_mix          = false;
-			m_conf.hdr_mode = (has_HDR_texture && !NextDrawHDR()) ? GSHWDrawConfig::HDRMode::ResolveOnly : GSHWDrawConfig::HDRMode::NoModify;
+			m_conf.colclip_mode = (has_colclip_texture && !NextDrawColClip()) ? GSHWDrawConfig::ColClipMode::ResolveOnly : GSHWDrawConfig::ColClipMode::NoModify;
 		}
 		else if (accumulation_blend)
 		{
 			// A fast algo that requires 2 passes
-			GL_INS("COLCLIP Fast HDR mode ENABLED");
-			m_conf.ps.hdr = 1;
-			sw_blending = true; // Enable sw blending for the HDR algo
+			GL_INS("COLCLIP Fast HW mode ENABLED");
+			m_conf.ps.colclip_hw = 1;
+			sw_blending = true; // Enable sw blending for the colclip algo

-			m_conf.hdr_mode = has_HDR_texture ? (NextDrawHDR() ? GSHWDrawConfig::HDRMode::NoModify : GSHWDrawConfig::HDRMode::ResolveOnly) : (NextDrawHDR() ? GSHWDrawConfig::HDRMode::ConvertOnly : GSHWDrawConfig::HDRMode::ConvertAndResolve);
+			m_conf.colclip_mode = has_colclip_texture ? (NextDrawColClip() ? GSHWDrawConfig::ColClipMode::NoModify : GSHWDrawConfig::ColClipMode::ResolveOnly) : (NextDrawColClip() ? GSHWDrawConfig::ColClipMode::ConvertOnly : GSHWDrawConfig::ColClipMode::ConvertAndResolve);
 		}
 		else if (sw_blending)
 		{
 			// A slow algo that could requires several passes (barely used)
 			GL_INS("COLCLIP SW mode ENABLED");
 			m_conf.ps.colclip = 1;
-			m_conf.hdr_mode = (has_HDR_texture && !NextDrawHDR()) ? GSHWDrawConfig::HDRMode::ResolveOnly : GSHWDrawConfig::HDRMode::NoModify;
+			m_conf.colclip_mode = (has_colclip_texture && !NextDrawColClip()) ? GSHWDrawConfig::ColClipMode::ResolveOnly : GSHWDrawConfig::ColClipMode::NoModify;
 		}
 		else
 		{
-			GL_INS("COLCLIP HDR mode ENABLED");
-			m_conf.ps.hdr = 1;
-			m_conf.hdr_mode = has_HDR_texture ? (NextDrawHDR() ? GSHWDrawConfig::HDRMode::NoModify : GSHWDrawConfig::HDRMode::ResolveOnly) : (NextDrawHDR() ? GSHWDrawConfig::HDRMode::ConvertOnly : GSHWDrawConfig::HDRMode::ConvertAndResolve);
+			GL_INS("COLCLIP HW mode ENABLED");
+			m_conf.ps.colclip_hw = 1;
+			m_conf.colclip_mode = has_colclip_texture ? (NextDrawColClip() ? GSHWDrawConfig::ColClipMode::NoModify : GSHWDrawConfig::ColClipMode::ResolveOnly) : (NextDrawColClip() ? GSHWDrawConfig::ColClipMode::ConvertOnly : GSHWDrawConfig::ColClipMode::ConvertAndResolve);
 		}

-		m_conf.hdr_frame = m_cached_ctx.FRAME;
+		m_conf.colclip_frame = m_cached_ctx.FRAME;
 	}

 	// Per pixel alpha blending
@@ -5478,13 +5477,13 @@ void GSRendererHW::EmulateBlending(int rt_alpha_min, int rt_alpha_max, const boo
 				blend_mix          = false;
 				m_conf.ps.pabe     = 1;

-				// HDR mode should be disabled when doing sw blend, swap with sw colclip.
-				if (m_conf.ps.hdr)
+				// hw colclip mode should be disabled when doing sw blend, swap with sw colclip.
+				if (m_conf.ps.colclip_hw)
 				{
-					const bool has_HDR_texture = g_gs_device->GetHDRTexture() != nullptr;
-					m_conf.ps.hdr     = 0;
+					const bool has_colclip_texture = g_gs_device->GetColorClipTexture() != nullptr;
+					m_conf.ps.colclip_hw = 0;
 					m_conf.ps.colclip = 1;
-					m_conf.hdr_mode = has_HDR_texture ? GSHWDrawConfig::HDRMode::EarlyResolve : GSHWDrawConfig::HDRMode::NoModify;
+					m_conf.colclip_mode = has_colclip_texture ? GSHWDrawConfig::ColClipMode::EarlyResolve : GSHWDrawConfig::ColClipMode::NoModify;
 				}
 			}
 			else
@@ -5552,9 +5551,9 @@ void GSRendererHW::EmulateBlending(int rt_alpha_min, int rt_alpha_max, const boo
 			if (blend.op == GSDevice::OP_REV_SUBTRACT)
 			{
 				pxAssert(m_conf.ps.blend_a == 2);
-				if (m_conf.ps.hdr)
+				if (m_conf.ps.colclip_hw)
 				{
-					// HDR uses unorm, which is always positive
+					// HW colclip uses unorm, which is always positive
 					// Have the shader do the inversion, then clip to remove the negative
 					m_conf.blend.op = GSDevice::OP_ADD;
 				}
@@ -7405,7 +7404,7 @@ __ri void GSRendererHW::DrawPrims(GSTextureCache::Target* rt, GSTextureCache::Ta
 		m_conf.require_full_barrier = false;
 	}
 	// Multi-pass algorithms shouldn't be needed with full barrier and backends may not handle this correctly
-	pxAssert(!m_conf.require_full_barrier || !m_conf.ps.hdr);
+	pxAssert(!m_conf.require_full_barrier || !m_conf.ps.colclip_hw);

 	// Swap full barrier for one barrier when there's no overlap, or a texture shuffle.
 	if (m_conf.require_full_barrier && (m_prim_overlap == PRIM_OVERLAP_NO || m_conf.ps.shuffle))
--- a/pcsx2/GS/Renderers/HW/GSRendererHW.h
+++ b/pcsx2/GS/Renderers/HW/GSRendererHW.h
@@ -111,7 +111,7 @@ private:
 	void EmulateATST(float& AREF, GSHWDrawConfig::PSSelector& ps, bool pass_2);

 	void SetTCOffset();
-	bool NextDrawHDR() const;
+	bool NextDrawColClip() const;
 	bool IsPossibleChannelShuffle() const;
 	bool IsPageCopy() const;
 	bool NextDrawMatchesShuffle() const;
--- a/pcsx2/GS/Renderers/HW/GSTextureReplacementLoaders.cpp
+++ b/pcsx2/GS/Renderers/HW/GSTextureReplacementLoaders.cpp
@@ -465,7 +465,7 @@ static bool ParseDDSHeader(std::FILE* fp, DDSLoadInfo* info)
 		}

 		const GSDevice::FeatureSupport features(g_gs_device->Features());
-		if (header.ddspf.dwFourCC == MAKEFOURCC('D', 'X', 'T', '1') || dxt10_format == 71)
+		if (header.ddspf.dwFourCC == MAKEFOURCC('D', 'X', 'T', '1') || dxt10_format == 71 /*DXGI_FORMAT_BC1_UNORM*/)
 		{
 			info->format = GSTexture::Format::BC1;
 			info->block_size = 4;
@@ -473,7 +473,7 @@ static bool ParseDDSHeader(std::FILE* fp, DDSLoadInfo* info)
 			if (!features.dxt_textures)
 				return false;
 		}
-		else if (header.ddspf.dwFourCC == MAKEFOURCC('D', 'X', 'T', '2') || header.ddspf.dwFourCC == MAKEFOURCC('D', 'X', 'T', '3') || dxt10_format == 74)
+		else if (header.ddspf.dwFourCC == MAKEFOURCC('D', 'X', 'T', '2') || header.ddspf.dwFourCC == MAKEFOURCC('D', 'X', 'T', '3') || dxt10_format == 74 /*DXGI_FORMAT_BC2_UNORM*/)
 		{
 			info->format = GSTexture::Format::BC2;
 			info->block_size = 4;
@@ -481,7 +481,7 @@ static bool ParseDDSHeader(std::FILE* fp, DDSLoadInfo* info)
 			if (!features.dxt_textures)
 				return false;
 		}
-		else if (header.ddspf.dwFourCC == MAKEFOURCC('D', 'X', 'T', '4') || header.ddspf.dwFourCC == MAKEFOURCC('D', 'X', 'T', '5') || dxt10_format == 77)
+		else if (header.ddspf.dwFourCC == MAKEFOURCC('D', 'X', 'T', '4') || header.ddspf.dwFourCC == MAKEFOURCC('D', 'X', 'T', '5') || dxt10_format == 77 /*DXGI_FORMAT_BC3_UNORM*/)
 		{
 			info->format = GSTexture::Format::BC3;
 			info->block_size = 4;
@@ -489,7 +489,7 @@ static bool ParseDDSHeader(std::FILE* fp, DDSLoadInfo* info)
 			if (!features.dxt_textures)
 				return false;
 		}
-		else if (dxt10_format == 98)
+		else if (dxt10_format == 98 /*DXGI_FORMAT_BC7_UNORM*/)
 		{
 			info->format = GSTexture::Format::BC7;
 			info->block_size = 4;
--- a/pcsx2/GS/Renderers/Metal/GSDeviceMTL.h
+++ b/pcsx2/GS/Renderers/Metal/GSDeviceMTL.h
@@ -256,11 +256,9 @@ public:
 	MRCOwned<id<MTLRenderPipelineState>> m_clut_pipeline[2];
 	MRCOwned<id<MTLRenderPipelineState>> m_stencil_clear_pipeline;
 	MRCOwned<id<MTLRenderPipelineState>> m_primid_init_pipeline[2][4];
-	MRCOwned<id<MTLRenderPipelineState>> m_hdr_init_pipeline;
-	MRCOwned<id<MTLRenderPipelineState>> m_hdr_rta_init_pipeline;
-	MRCOwned<id<MTLRenderPipelineState>> m_hdr_clear_pipeline;
-	MRCOwned<id<MTLRenderPipelineState>> m_hdr_resolve_pipeline;
-	MRCOwned<id<MTLRenderPipelineState>> m_hdr_rta_resolve_pipeline;
+	MRCOwned<id<MTLRenderPipelineState>> m_colclip_init_pipeline;
+	MRCOwned<id<MTLRenderPipelineState>> m_colclip_clear_pipeline;
+	MRCOwned<id<MTLRenderPipelineState>> m_colclip_resolve_pipeline;
 	MRCOwned<id<MTLRenderPipelineState>> m_fxaa_pipeline;
 	MRCOwned<id<MTLRenderPipelineState>> m_shadeboost_pipeline;
 	MRCOwned<id<MTLRenderPipelineState>> m_imgui_pipeline;
--- a/pcsx2/GS/Renderers/Metal/GSDeviceMTL.mm
+++ b/pcsx2/GS/Renderers/Metal/GSDeviceMTL.mm
@@ -510,7 +510,9 @@ static constexpr MTLPixelFormat ConvertPixelFormat(GSTexture::Format format)
 		case GSTexture::Format::UInt16:       return MTLPixelFormatR16Uint;
 		case GSTexture::Format::UNorm8:       return MTLPixelFormatA8Unorm;
 		case GSTexture::Format::Color:        return MTLPixelFormatRGBA8Unorm;
-		case GSTexture::Format::HDRColor:     return MTLPixelFormatRGBA16Unorm;
+		case GSTexture::Format::ColorHQ:      return MTLPixelFormatRGB10A2Unorm;
+		case GSTexture::Format::ColorHDR:     return MTLPixelFormatRGBA16Float;
+		case GSTexture::Format::ColorClip:    return MTLPixelFormatRGBA16Unorm;
 		case GSTexture::Format::DepthStencil: return MTLPixelFormatDepth32Float_Stencil8;
 		case GSTexture::Format::Invalid:      return MTLPixelFormatInvalid;
 		case GSTexture::Format::BC1:          return MTLPixelFormatBC1_RGBA;
@@ -1065,14 +1067,14 @@ bool GSDeviceMTL::Create(GSVSyncMode vsync_mode, bool allow_present_throttle)
 	auto pdesc = [[MTLRenderPipelineDescriptor new] autorelease];
 	// FS Triangle Pipelines
 	pdesc.colorAttachments[0].pixelFormat = ConvertPixelFormat(GSTexture::Format::Color);
-	m_hdr_resolve_pipeline = MakePipeline(pdesc, fs_triangle, LoadShader(@"ps_hdr_resolve"), @"HDR Resolve");
+	m_colclip_resolve_pipeline = MakePipeline(pdesc, fs_triangle, LoadShader(@"ps_colclip_resolve"), @"ColorClip Resolve");
 	m_fxaa_pipeline = MakePipeline(pdesc, fs_triangle, LoadShader(@"ps_fxaa"), @"fxaa");
 	m_shadeboost_pipeline = MakePipeline(pdesc, fs_triangle, LoadShader(@"ps_shadeboost"), @"shadeboost");
 	m_clut_pipeline[0] = MakePipeline(pdesc, fs_triangle, LoadShader(@"ps_convert_clut_4"), @"4-bit CLUT Update");
 	m_clut_pipeline[1] = MakePipeline(pdesc, fs_triangle, LoadShader(@"ps_convert_clut_8"), @"8-bit CLUT Update");
-	pdesc.colorAttachments[0].pixelFormat = ConvertPixelFormat(GSTexture::Format::HDRColor);
-	m_hdr_init_pipeline = MakePipeline(pdesc, fs_triangle, LoadShader(@"ps_hdr_init"), @"HDR Init");
-	m_hdr_clear_pipeline = MakePipeline(pdesc, fs_triangle, LoadShader(@"ps_clear"), @"HDR Clear");
+	pdesc.colorAttachments[0].pixelFormat = ConvertPixelFormat(GSTexture::Format::ColorClip);
+	m_colclip_init_pipeline = MakePipeline(pdesc, fs_triangle, LoadShader(@"ps_colclip_init"), @"ColorClip Init");
+	m_colclip_clear_pipeline = MakePipeline(pdesc, fs_triangle, LoadShader(@"ps_clear"), @"ColorClip Clear");
 	pdesc.colorAttachments[0].pixelFormat = MTLPixelFormatInvalid;
 	pdesc.stencilAttachmentPixelFormat = MTLPixelFormatDepth32Float_Stencil8;
 	m_datm_pipeline[0] = MakePipeline(pdesc, fs_triangle, LoadShader(@"ps_datm0"), @"datm0");
@@ -1116,8 +1118,8 @@ bool GSDeviceMTL::Create(GSVSyncMode vsync_mode, bool allow_present_throttle)
 			case ShaderConvert::DATM_1_RTA_CORRECTION:
 			case ShaderConvert::CLUT_4:
 			case ShaderConvert::CLUT_8:
-			case ShaderConvert::HDR_INIT:
-			case ShaderConvert::HDR_RESOLVE:
+			case ShaderConvert::COLCLIP_INIT:
+			case ShaderConvert::COLCLIP_RESOLVE:
 				continue;
 			case ShaderConvert::FLOAT32_TO_32_BITS:
 				pdesc.colorAttachments[0].pixelFormat = ConvertPixelFormat(GSTexture::Format::UInt32);
@@ -1174,7 +1176,7 @@ bool GSDeviceMTL::Create(GSVSyncMode vsync_mode, bool allow_present_throttle)
 		m_present_pipeline[i] = MakePipeline(pdesc, vs_convert, LoadShader(name), [NSString stringWithFormat:@"present_%s", shaderName(conv) + 3]);
 	}

-	pdesc.colorAttachments[0].pixelFormat = MTLPixelFormatRGBA8Unorm;
+	pdesc.colorAttachments[0].pixelFormat = ConvertPixelFormat(GSTexture::Format::Color);
 	for (size_t i = 0; i < std::size(m_convert_pipeline_copy_mask); i++)
 	{
 		MTLColorWriteMask mask = MTLColorWriteMaskNone;
@@ -1852,7 +1854,7 @@ void GSDeviceMTL::MRESetHWPipelineState(GSHWDrawConfig::VSSelector vssel, GSHWDr
 		setFnConstantI(m_fn_constants, pssel.blend_d,               GSMTLConstantIndex_PS_BLEND_D);
 		setFnConstantI(m_fn_constants, pssel.blend_hw,              GSMTLConstantIndex_PS_BLEND_HW);
 		setFnConstantB(m_fn_constants, pssel.a_masked,              GSMTLConstantIndex_PS_A_MASKED);
-		setFnConstantB(m_fn_constants, pssel.hdr,                   GSMTLConstantIndex_PS_HDR);
+		setFnConstantB(m_fn_constants, pssel.colclip_hw,            GSMTLConstantIndex_PS_COLCLIP_HW);
 		setFnConstantB(m_fn_constants, pssel.rta_correction,        GSMTLConstantIndex_PS_RTA_CORRECTION);
 		setFnConstantB(m_fn_constants, pssel.rta_source_correction, GSMTLConstantIndex_PS_RTA_SRC_CORRECTION);
 		setFnConstantB(m_fn_constants, pssel.colclip,               GSMTLConstantIndex_PS_COLCLIP);
@@ -2142,53 +2144,53 @@ void GSDeviceMTL::RenderHW(GSHWDrawConfig& config)
 	GSTexture* stencil = nullptr;
 	GSTexture* primid_tex = nullptr;
 	GSTexture* rt = config.rt;
-	GSTexture* hdr_rt = g_gs_device->GetHDRTexture();
+	GSTexture* colclip_rt = g_gs_device->GetColorClipTexture();
 	
-	if (hdr_rt)
+	if (colclip_rt)
 	{
-		if (config.hdr_mode == GSHWDrawConfig::HDRMode::EarlyResolve)
+		if (config.colclip_mode == GSHWDrawConfig::ColClipMode::EarlyResolve)
 		{
-			BeginRenderPass(@"HDR Resolve", config.rt, MTLLoadActionLoad, nullptr, MTLLoadActionDontCare);
-			RenderCopy(hdr_rt, m_hdr_resolve_pipeline, config.hdr_update_area);
+			BeginRenderPass(@"ColorClip Resolve", config.rt, MTLLoadActionLoad, nullptr, MTLLoadActionDontCare);
+			RenderCopy(colclip_rt, m_colclip_resolve_pipeline, config.colclip_update_area);
 			g_perfmon.Put(GSPerfMon::TextureCopies, 1);

-			Recycle(hdr_rt);
+			Recycle(colclip_rt);
 			
-			g_gs_device->SetHDRTexture(nullptr);
+			g_gs_device->SetColorClipTexture(nullptr);
 			
-			hdr_rt = nullptr;
+			colclip_rt = nullptr;
 		}
 		else
-			config.ps.hdr = 1;
+			config.ps.colclip_hw = 1;
 	}
 	
-	if (config.ps.hdr)
+	if (config.ps.colclip_hw)
 	{
-		if (!hdr_rt)
+		if (!colclip_rt)
 		{
-			config.hdr_update_area = config.drawarea;
+			config.colclip_update_area = config.drawarea;
 			
 			GSVector2i size = config.rt->GetSize();
-			rt = hdr_rt = CreateRenderTarget(size.x, size.y, GSTexture::Format::HDRColor, false);
+			rt = colclip_rt = CreateRenderTarget(size.x, size.y, GSTexture::Format::ColorClip, false);
 			
-			g_gs_device->SetHDRTexture(hdr_rt);
+			g_gs_device->SetColorClipTexture(colclip_rt);
 			
-			const GSVector4i copy_rect = (config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertOnly) ? GSVector4i::loadh(size) : config.drawarea;
+			const GSVector4i copy_rect = (config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertOnly) ? GSVector4i::loadh(size) : config.drawarea;
 			
 			switch (config.rt->GetState())
 			{
 				case GSTexture::State::Dirty:
-					BeginRenderPass(@"HDR Init", hdr_rt, MTLLoadActionDontCare, nullptr, MTLLoadActionDontCare);
-					RenderCopy(config.rt, m_hdr_init_pipeline, copy_rect);
+					BeginRenderPass(@"ColorClip Init", colclip_rt, MTLLoadActionDontCare, nullptr, MTLLoadActionDontCare);
+					RenderCopy(config.rt, m_colclip_init_pipeline, copy_rect);
 					g_perfmon.Put(GSPerfMon::TextureCopies, 1);
 					break;

 				case GSTexture::State::Cleared:
 				{
-					BeginRenderPass(@"HDR Clear", hdr_rt, MTLLoadActionDontCare, nullptr, MTLLoadActionDontCare);
+					BeginRenderPass(@"ColorClip Clear", colclip_rt, MTLLoadActionDontCare, nullptr, MTLLoadActionDontCare);
 					GSVector4 color = GSVector4::rgba32(config.rt->GetClearColor()) / GSVector4::cxpr(65535, 65535, 65535, 255);
 					[m_current_render.encoder setFragmentBytes:&color length:sizeof(color) atIndex:GSMTLBufferIndexUniforms];
-					RenderCopy(nullptr, m_hdr_clear_pipeline, copy_rect);
+					RenderCopy(nullptr, m_colclip_clear_pipeline, copy_rect);
 					break;
 				}

@@ -2197,7 +2199,7 @@ void GSDeviceMTL::RenderHW(GSHWDrawConfig& config)
 			}
 		}

-		rt = hdr_rt;
+		rt = colclip_rt;
 	}
 	
 	switch (config.destination_alpha)
@@ -2284,19 +2286,19 @@ void GSDeviceMTL::RenderHW(GSHWDrawConfig& config)
 		SendHWDraw(config, mtlenc, index_buffer, index_buffer_offset);
 	}

-	if (hdr_rt)
+	if (colclip_rt)
 	{
-		config.hdr_update_area = config.hdr_update_area.runion(config.drawarea);
+		config.colclip_update_area = config.colclip_update_area.runion(config.drawarea);

-		if ((config.hdr_mode == GSHWDrawConfig::HDRMode::ResolveOnly || config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertAndResolve))
+		if ((config.colclip_mode == GSHWDrawConfig::ColClipMode::ResolveOnly || config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertAndResolve))
 		{
-			BeginRenderPass(@"HDR Resolve", config.rt, MTLLoadActionLoad, nullptr, MTLLoadActionDontCare);
-			RenderCopy(hdr_rt, m_hdr_resolve_pipeline, config.hdr_update_area);
+			BeginRenderPass(@"ColorClip Resolve", config.rt, MTLLoadActionLoad, nullptr, MTLLoadActionDontCare);
+			RenderCopy(colclip_rt, m_colclip_resolve_pipeline, config.colclip_update_area);
 			g_perfmon.Put(GSPerfMon::TextureCopies, 1);

-			Recycle(hdr_rt);
+			Recycle(colclip_rt);
 			
-			g_gs_device->SetHDRTexture(nullptr);
+			g_gs_device->SetColorClipTexture(nullptr);
 		}
 	}

--- a/pcsx2/GS/Renderers/Metal/GSMTLSharedHeader.h
+++ b/pcsx2/GS/Renderers/Metal/GSMTLSharedHeader.h
@@ -192,7 +192,7 @@ enum GSMTLFnConstants
 	GSMTLConstantIndex_PS_BLEND_D,
 	GSMTLConstantIndex_PS_BLEND_HW,
 	GSMTLConstantIndex_PS_A_MASKED,
-	GSMTLConstantIndex_PS_HDR,
+	GSMTLConstantIndex_PS_COLCLIP_HW,
 	GSMTLConstantIndex_PS_RTA_CORRECTION,
 	GSMTLConstantIndex_PS_RTA_SRC_CORRECTION,
 	GSMTLConstantIndex_PS_COLCLIP,
--- a/pcsx2/GS/Renderers/Metal/convert.metal
+++ b/pcsx2/GS/Renderers/Metal/convert.metal
@@ -138,13 +138,13 @@ fragment float4 ps_rta_decorrection(ConvertShaderData data [[stage_in]], Convert
 	return float4(in.rgb, in.a * (128.25f / 255.0f));
 }

-fragment float4 ps_hdr_init(float4 p [[position]], DirectReadTextureIn<float> tex)
+fragment float4 ps_colclip_init(float4 p [[position]], DirectReadTextureIn<float> tex)
 {
 	float4 in = tex.read(p);
 	return float4(round(in.rgb * 255.f) / 65535.f, in.a);
 }

-fragment float4 ps_hdr_resolve(float4 p [[position]], DirectReadTextureIn<float> tex)
+fragment float4 ps_colclip_resolve(float4 p [[position]], DirectReadTextureIn<float> tex)
 {
 	float4 in = tex.read(p);
 	return float4(float3(uint3(in.rgb * 65535.5f) & 255) / 255.f, in.a);
--- a/pcsx2/GS/Renderers/Metal/tfx.metal
+++ b/pcsx2/GS/Renderers/Metal/tfx.metal
@@ -47,7 +47,7 @@ constant uint PS_BLEND_C            [[function_constant(GSMTLConstantIndex_PS_BL
 constant uint PS_BLEND_D            [[function_constant(GSMTLConstantIndex_PS_BLEND_D)]];
 constant uint PS_BLEND_HW           [[function_constant(GSMTLConstantIndex_PS_BLEND_HW)]];
 constant bool PS_A_MASKED           [[function_constant(GSMTLConstantIndex_PS_A_MASKED)]];
-constant bool PS_HDR                [[function_constant(GSMTLConstantIndex_PS_HDR)]];
+constant bool PS_COLCLIP_HW         [[function_constant(GSMTLConstantIndex_PS_COLCLIP_HW)]];
 constant bool PS_RTA_CORRECTION     [[function_constant(GSMTLConstantIndex_PS_RTA_CORRECTION)]];
 constant bool PS_RTA_SRC_CORRECTION [[function_constant(GSMTLConstantIndex_PS_RTA_SRC_CORRECTION)]];
 constant bool PS_COLCLIP            [[function_constant(GSMTLConstantIndex_PS_COLCLIP)]];
@@ -858,7 +858,7 @@ struct PSMain
 	{
 		if (PS_FBMASK)
 		{
-			float multi = PS_HDR ? 65535.0 : 255.5;
+			float multi = PS_COLCLIP_HW ? 65535.0 : 255.5;
 			C = float4((uint4(int4(C)) & (cb.fbmask ^ 0xff)) | (uint4(current_color * float4(multi, multi, multi, 255)) & cb.fbmask));
 		}
 	}
@@ -898,7 +898,7 @@ struct PSMain
 				C.rgb += 7.f; // Need to round up, not down since the shader will invert

 			// Correct the Color value based on the output format
-			if (PS_COLCLIP == 0 && PS_HDR == 0)
+			if (PS_COLCLIP == 0 && PS_COLCLIP_HW == 0)
 				C.rgb = clamp(C.rgb, 0.f, 255.f); // Standard Clamp

 			// FIXME rouding of negative float?
@@ -910,7 +910,7 @@ struct PSMain
 			// In 16 bits format, only 5 bits of colors are used. It impacts shadows computation of Castlevania
 			if (PS_DST_FMT == FMT_16 && PS_DITHER != 3 && (PS_BLEND_MIX == 0 || PS_DITHER))
 				C.rgb = float3(short3(C.rgb) & 0xF8);
-			else if (PS_COLCLIP == 1 || PS_HDR == 1)
+			else if (PS_COLCLIP == 1 || PS_COLCLIP_HW == 1)
 				C.rgb = float3(short3(C.rgb) & 0xFF);
 		}
 		else if (PS_DST_FMT == FMT_16 && PS_DITHER != 3 && PS_BLEND_MIX == 0 && PS_BLEND_HW == 0)
@@ -963,7 +963,7 @@ struct PSMain
 					current_color.a = float(denorm_rt.g & 0x80);
 				}
 			}
-			float multi = PS_HDR ? 65535.0 : 255.5;
+			float multi = PS_COLCLIP_HW ? 65535.0 : 255.5;
 			float3 Cd = trunc(current_color.rgb * multi);
 			float3 Cs = Color.rgb;

@@ -1205,7 +1205,7 @@ struct PSMain
 		if (PS_COLOR0)
 		{
 			out.c0.a = PS_RTA_CORRECTION ? C.a / 128.f : C.a / 255.f;
-			out.c0.rgb = PS_HDR ? float3(C.rgb / 65535.f) : C.rgb / 255.f;
+			out.c0.rgb = PS_COLCLIP_HW ? float3(C.rgb / 65535.f) : C.rgb / 255.f;
 			if (PS_AFAIL == 3 && !PS_COLOR1 && !atst_pass) // Doing RGB_ONLY without COLOR1
 				out.c0.a = current_color.a;
 		}
--- a/pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp
+++ b/pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp
@@ -1394,7 +1394,7 @@ std::string GSDeviceOGL::GetPSSource(const PSSelector& sel)
 		+ fmt::format("#define PS_READ16_SRC {}\n", sel.real16src)
 		+ fmt::format("#define PS_WRITE_RG {}\n", sel.write_rg)
 		+ fmt::format("#define PS_FBMASK {}\n", sel.fbmask)
-		+ fmt::format("#define PS_HDR {}\n", sel.hdr)
+		+ fmt::format("#define PS_COLCLIP_HW {}\n", sel.colclip_hw)
 		+ fmt::format("#define PS_RTA_CORRECTION {}\n", sel.rta_correction)
 		+ fmt::format("#define PS_RTA_SRC_CORRECTION {}\n", sel.rta_source_correction)
 		+ fmt::format("#define PS_DITHER {}\n", sel.dither)
@@ -2414,43 +2414,43 @@ void GSDeviceOGL::RenderHW(GSHWDrawConfig& config)
 	GSVector2i rtsize = (config.rt ? config.rt : config.ds)->GetSize();

 	GSTexture* primid_texture = nullptr;
-	GSTexture* hdr_rt = g_gs_device->GetHDRTexture();
+	GSTexture* colclip_rt = g_gs_device->GetColorClipTexture();

-	if (hdr_rt)
+	if (colclip_rt)
 	{
-		if (config.hdr_mode == GSHWDrawConfig::HDRMode::EarlyResolve)
+		if (config.colclip_mode == GSHWDrawConfig::ColClipMode::EarlyResolve)
 		{
 			const GSVector2i size = config.rt->GetSize();
-			const GSVector4 dRect(config.hdr_update_area);
+			const GSVector4 dRect(config.colclip_update_area);
 			const GSVector4 sRect = dRect / GSVector4(size.x, size.y).xyxy();
-			StretchRect(hdr_rt, sRect, config.rt, dRect, ShaderConvert::HDR_RESOLVE, false);
+			StretchRect(colclip_rt, sRect, config.rt, dRect, ShaderConvert::COLCLIP_RESOLVE, false);

-			Recycle(hdr_rt);
+			Recycle(colclip_rt);

-			g_gs_device->SetHDRTexture(nullptr);
+			g_gs_device->SetColorClipTexture(nullptr);

-			hdr_rt = nullptr;
+			colclip_rt = nullptr;
 		}
 		else
 		{
-			config.ps.hdr = 1;
+			config.ps.colclip_hw = 1;
 		}
 	}

-	if (config.ps.hdr)
+	if (config.ps.colclip_hw)
 	{
-		if (!hdr_rt)
+		if (!colclip_rt)
 		{
-			config.hdr_update_area = config.drawarea;
+			config.colclip_update_area = config.drawarea;

-			hdr_rt = CreateRenderTarget(rtsize.x, rtsize.y, GSTexture::Format::HDRColor, false);
-			OMSetRenderTargets(hdr_rt, config.ds, nullptr);
+			colclip_rt = CreateRenderTarget(rtsize.x, rtsize.y, GSTexture::Format::ColorClip, false);
+			OMSetRenderTargets(colclip_rt, config.ds, nullptr);

-			g_gs_device->SetHDRTexture(hdr_rt);
+			g_gs_device->SetColorClipTexture(colclip_rt);

-			const GSVector4 dRect = GSVector4((config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertOnly) ? GSVector4i::loadh(rtsize) : config.drawarea);
+			const GSVector4 dRect = GSVector4((config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertOnly) ? GSVector4i::loadh(rtsize) : config.drawarea);
 			const GSVector4 sRect = dRect / GSVector4(rtsize.x, rtsize.y).xyxy();
-			StretchRect(config.rt, sRect, hdr_rt, dRect, ShaderConvert::HDR_INIT, false);
+			StretchRect(config.rt, sRect, colclip_rt, dRect, ShaderConvert::COLCLIP_INIT, false);
 		}
 	}

@@ -2461,7 +2461,7 @@ void GSDeviceOGL::RenderHW(GSHWDrawConfig& config)
 		case GSHWDrawConfig::DestinationAlphaMode::Full:
 			break; // No setup
 		case GSHWDrawConfig::DestinationAlphaMode::PrimIDTracking:
-			primid_texture = InitPrimDateTexture(hdr_rt ? hdr_rt : config.rt, config.drawarea, config.datm);
+			primid_texture = InitPrimDateTexture(colclip_rt ? colclip_rt : config.rt, config.drawarea, config.datm);
 			break;
 		case GSHWDrawConfig::DestinationAlphaMode::StencilOne:
 			if (m_features.texture_barrier)
@@ -2481,7 +2481,7 @@ void GSDeviceOGL::RenderHW(GSHWDrawConfig& config)
 				{GSVector4(dst.x, dst.w, 0.0f, 0.0f), GSVector2(src.x, src.w)},
 				{GSVector4(dst.z, dst.w, 0.0f, 0.0f), GSVector2(src.z, src.w)},
 			};
-			SetupDATE(hdr_rt ? hdr_rt : config.rt, config.ds, vertices, config.datm);
+			SetupDATE(colclip_rt ? colclip_rt : config.rt, config.ds, vertices, config.datm);
 		}
 	}

@@ -2490,11 +2490,11 @@ void GSDeviceOGL::RenderHW(GSHWDrawConfig& config)
 	if (config.require_one_barrier && !m_features.texture_barrier)
 	{
 		// Requires a copy of the RT
-		draw_rt_clone = CreateTexture(rtsize.x, rtsize.y, 1, hdr_rt ? GSTexture::Format::HDRColor : GSTexture::Format::Color, true);
+		draw_rt_clone = CreateTexture(rtsize.x, rtsize.y, 1, colclip_rt ? GSTexture::Format::ColorClip : GSTexture::Format::Color, true);
 		GL_PUSH("Copy RT to temp texture for fbmask {%d,%d %dx%d}",
 			config.drawarea.left, config.drawarea.top,
 			config.drawarea.width(), config.drawarea.height());
-		CopyRect(hdr_rt ? hdr_rt : config.rt, draw_rt_clone, config.drawarea, config.drawarea.left, config.drawarea.top);
+		CopyRect(colclip_rt ? colclip_rt : config.rt, draw_rt_clone, config.drawarea, config.drawarea.left, config.drawarea.top);
 	}

 	IASetVertexBuffer(config.verts, config.nverts);
@@ -2534,7 +2534,7 @@ void GSDeviceOGL::RenderHW(GSHWDrawConfig& config)
 	if (draw_rt_clone)
 		PSSetShaderResource(2, draw_rt_clone);
 	else if (config.require_one_barrier || config.require_full_barrier)
-		PSSetShaderResource(2, hdr_rt ? hdr_rt : config.rt);
+		PSSetShaderResource(2, colclip_rt ? colclip_rt : config.rt);

 	SetupSampler(config.sampler);

@@ -2622,7 +2622,7 @@ void GSDeviceOGL::RenderHW(GSHWDrawConfig& config)
 	}

 	// avoid changing framebuffer just to switch from rt+depth to rt and vice versa
-	GSTexture* draw_rt = hdr_rt ? hdr_rt : config.rt;
+	GSTexture* draw_rt = colclip_rt ? colclip_rt : config.rt;
 	GSTexture* draw_ds = config.ds;
 	if (!draw_rt && GLState::rt && GLState::ds == draw_ds && config.tex != GLState::rt &&
 		GLState::rt->GetSize() == draw_ds->GetSize())
@@ -2700,20 +2700,20 @@ void GSDeviceOGL::RenderHW(GSHWDrawConfig& config)
 	if (draw_rt_clone)
 		Recycle(draw_rt_clone);

-	if (hdr_rt)
+	if (colclip_rt)
 	{
-		config.hdr_update_area = config.hdr_update_area.runion(config.drawarea);
+		config.colclip_update_area = config.colclip_update_area.runion(config.drawarea);

-		if ((config.hdr_mode == GSHWDrawConfig::HDRMode::ResolveOnly || config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertAndResolve))
+		if ((config.colclip_mode == GSHWDrawConfig::ColClipMode::ResolveOnly || config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertAndResolve))
 		{
 			const GSVector2i size = config.rt->GetSize();
-			const GSVector4 dRect(config.hdr_update_area);
+			const GSVector4 dRect(config.colclip_update_area);
 			const GSVector4 sRect = dRect / GSVector4(size.x, size.y).xyxy();
-			StretchRect(hdr_rt, sRect, config.rt, dRect, ShaderConvert::HDR_RESOLVE, false);
+			StretchRect(colclip_rt, sRect, config.rt, dRect, ShaderConvert::COLCLIP_RESOLVE, false);

-			Recycle(hdr_rt);
+			Recycle(colclip_rt);

-			g_gs_device->SetHDRTexture(nullptr);
+			g_gs_device->SetColorClipTexture(nullptr);
 		}
 	}
 }
--- a/pcsx2/GS/Renderers/OpenGL/GSTextureOGL.cpp
+++ b/pcsx2/GS/Renderers/OpenGL/GSTextureOGL.cpp
@@ -65,6 +65,8 @@ GSTextureOGL::GSTextureOGL(Type type, int width, int height, int levels, Format

 		// 4 channel normalized
 		case Format::Color:
+		case Format::ColorHQ:
+		case Format::ColorHDR:
 			gl_fmt = GL_RGBA8;
 			m_int_format = GL_RGBA;
 			m_int_type = GL_UNSIGNED_BYTE;
@@ -72,7 +74,7 @@ GSTextureOGL::GSTextureOGL(Type type, int width, int height, int levels, Format
 			break;

 		// 4 channel float
-		case Format::HDRColor:
+		case Format::ColorClip:
 			gl_fmt = GL_RGBA16;
 			m_int_format = GL_RGBA;
 			m_int_type = GL_UNSIGNED_SHORT;
--- a/pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp
+++ b/pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp
@@ -2104,7 +2104,8 @@ bool GSDeviceVK::Create(GSVSyncMode vsync_mode, bool allow_present_throttle)
 		return false;
 	}

-	CompileCASPipelines();
+	if (!CompileCASPipelines())
+		return false;

 	if (!CompileImGuiPipeline())
 		return false;
@@ -2715,10 +2716,12 @@ void GSDeviceVK::DrawIndexedPrimitive(int offset, int count)

 VkFormat GSDeviceVK::LookupNativeFormat(GSTexture::Format format) const
 {
-	static constexpr std::array<VkFormat, static_cast<int>(GSTexture::Format::BC7) + 1> s_format_mapping = {{
+	static constexpr std::array<VkFormat, static_cast<int>(GSTexture::Format::Last) + 1> s_format_mapping = {{
 		VK_FORMAT_UNDEFINED, // Invalid
 		VK_FORMAT_R8G8B8A8_UNORM, // Color
-		VK_FORMAT_R16G16B16A16_UNORM, // HDRColor
+		VK_FORMAT_A2B10G10R10_UNORM_PACK32, // ColorHQ
+		VK_FORMAT_R16G16B16A16_SFLOAT, // ColorHDR
+		VK_FORMAT_R16G16B16A16_UNORM, // ColorClip
 		VK_FORMAT_D32_SFLOAT_S8_UINT, // DepthStencil
 		VK_FORMAT_R8_UNORM, // UNorm8
 		VK_FORMAT_R16_UINT, // UInt16
@@ -3764,7 +3767,7 @@ bool GSDeviceVK::CreatePipelineLayouts()
 	plb.AddDescriptorSet(m_utility_ds_layout);
 	if ((m_utility_pipeline_layout = plb.Create(dev)) == VK_NULL_HANDLE)
 		return false;
-	Vulkan::SetObjectName(dev, m_utility_ds_layout, "Convert pipeline layout");
+	Vulkan::SetObjectName(dev, m_utility_pipeline_layout, "Convert pipeline layout");

 	//////////////////////////////////////////////////////////////////////////
 	// Draw/TFX Pipeline Layout
@@ -3820,14 +3823,14 @@ bool GSDeviceVK::CreateRenderPasses()
 	} while (0)

 	const VkFormat rt_format = LookupNativeFormat(GSTexture::Format::Color);
-	const VkFormat hdr_rt_format = LookupNativeFormat(GSTexture::Format::HDRColor);
+	const VkFormat colclip_rt_format = LookupNativeFormat(GSTexture::Format::ColorClip);
 	const VkFormat depth_format = LookupNativeFormat(GSTexture::Format::DepthStencil);

 	for (u32 rt = 0; rt < 2; rt++)
 	{
 		for (u32 ds = 0; ds < 2; ds++)
 		{
-			for (u32 hdr = 0; hdr < 2; hdr++)
+			for (u32 colclip = 0; colclip < 2; colclip++)
 			{
 				for (u32 stencil = 0; stencil < 2; stencil++)
 				{
@@ -3841,12 +3844,12 @@ bool GSDeviceVK::CreateRenderPasses()
 									 opb++)
 								{
 									const VkFormat rp_rt_format =
-										(rt != 0) ? ((hdr != 0) ? hdr_rt_format : rt_format) : VK_FORMAT_UNDEFINED;
+										(rt != 0) ? ((colclip != 0) ? colclip_rt_format : rt_format) : VK_FORMAT_UNDEFINED;
 									const VkFormat rp_depth_format = (ds != 0) ? depth_format : VK_FORMAT_UNDEFINED;
 									const VkAttachmentLoadOp opc = (!stencil || !m_features.stencil_buffer) ?
 																	   VK_ATTACHMENT_LOAD_OP_DONT_CARE :
 																	   VK_ATTACHMENT_LOAD_OP_LOAD;
-									GET(m_tfx_render_pass[rt][ds][hdr][stencil][fbl][dsp][opa][opb], rp_rt_format,
+									GET(m_tfx_render_pass[rt][ds][colclip][stencil][fbl][dsp][opa][opb], rp_rt_format,
 										rp_depth_format, (fbl != 0), (dsp != 0), static_cast<VkAttachmentLoadOp>(opa),
 										static_cast<VkAttachmentLoadOp>(opb), static_cast<VkAttachmentLoadOp>(opc));
 								}
@@ -3999,15 +4002,7 @@ bool GSDeviceVK::CompileConvertPipelines()
 		}
 		else if (i == ShaderConvert::RTA_CORRECTION)
 		{
-			// compile color copy pipelines
 			gpb.SetRenderPass(m_utility_color_render_pass_discard, 0);
-			VkShaderModule ps = GetUtilityFragmentShader(*shader, shaderName(i));
-			if (ps == VK_NULL_HANDLE)
-				return false;
-
-			ScopedGuard ps_guard([this, &ps]() { vkDestroyShaderModule(m_device, ps, nullptr); });
-			gpb.SetFragmentShader(ps);
-
 			for (u32 j = 16; j < 32; j++)
 			{
 				pxAssert(!m_color_copy[j]);
@@ -4023,10 +4018,10 @@ bool GSDeviceVK::CompileConvertPipelines()
 					(j >> 1) & 1u, (j >> 2) & 1u, (j >> 3) & 1u);
 			}
 		}
-		else if (i == ShaderConvert::HDR_INIT || i == ShaderConvert::HDR_RESOLVE)
+		else if (i == ShaderConvert::COLCLIP_INIT || i == ShaderConvert::COLCLIP_RESOLVE)
 		{
-			const bool is_setup = i == ShaderConvert::HDR_INIT;
-			VkPipeline(&arr)[2][2] = *(is_setup ? &m_hdr_setup_pipelines : &m_hdr_finish_pipelines);
+			const bool is_setup = i == ShaderConvert::COLCLIP_INIT;
+			VkPipeline(&arr)[2][2] = *(is_setup ? &m_colclip_setup_pipelines : &m_colclip_finish_pipelines);
 			for (u32 ds = 0; ds < 2; ds++)
 			{
 				for (u32 fbl = 0; fbl < 2; fbl++)
@@ -4040,7 +4035,7 @@ bool GSDeviceVK::CompileConvertPipelines()
 					if (!arr[ds][fbl])
 						return false;

-					Vulkan::SetObjectName(m_device, arr[ds][fbl], "HDR %s/copy pipeline (ds=%u, fbl=%u)",
+					Vulkan::SetObjectName(m_device, arr[ds][fbl], "ColorClip %s/copy pipeline (ds=%u, fbl=%u)",
 						is_setup ? "setup" : "finish", i, ds, fbl);
 				}
 			}
@@ -4196,7 +4191,7 @@ bool GSDeviceVK::CompileInterlacePipelines()
 		if (!m_interlace[i])
 			return false;

-		Vulkan::SetObjectName(m_device, m_convert[i], "Interlace pipeline %d", i);
+		Vulkan::SetObjectName(m_device, m_interlace[i], "Interlace pipeline %d", i);
 	}

 	return true;
@@ -4248,7 +4243,7 @@ bool GSDeviceVK::CompileMergePipelines()
 		if (!m_merge[i])
 			return false;

-		Vulkan::SetObjectName(m_device, m_convert[i], "Merge pipeline %d", i);
+		Vulkan::SetObjectName(m_device, m_merge[i], "Merge pipeline %d", i);
 	}

 	return true;
@@ -4610,10 +4605,10 @@ void GSDeviceVK::DestroyResources()
 	{
 		for (u32 fbl = 0; fbl < 2; fbl++)
 		{
-			if (m_hdr_setup_pipelines[ds][fbl] != VK_NULL_HANDLE)
-				vkDestroyPipeline(m_device, m_hdr_setup_pipelines[ds][fbl], nullptr);
-			if (m_hdr_finish_pipelines[ds][fbl] != VK_NULL_HANDLE)
-				vkDestroyPipeline(m_device, m_hdr_finish_pipelines[ds][fbl], nullptr);
+			if (m_colclip_setup_pipelines[ds][fbl] != VK_NULL_HANDLE)
+				vkDestroyPipeline(m_device, m_colclip_setup_pipelines[ds][fbl], nullptr);
+			if (m_colclip_finish_pipelines[ds][fbl] != VK_NULL_HANDLE)
+				vkDestroyPipeline(m_device, m_colclip_finish_pipelines[ds][fbl], nullptr);
 		}
 	}
 	for (u32 ds = 0; ds < 2; ds++)
@@ -4782,7 +4777,7 @@ VkShaderModule GSDeviceVK::GetTFXFragmentShader(const GSHWDrawConfig::PSSelector
 	AddMacro(ss, "PS_READ16_SRC", sel.real16src);
 	AddMacro(ss, "PS_WRITE_RG", sel.write_rg);
 	AddMacro(ss, "PS_FBMASK", sel.fbmask);
-	AddMacro(ss, "PS_HDR", sel.hdr);
+	AddMacro(ss, "PS_COLCLIP_HW", sel.colclip_hw);
 	AddMacro(ss, "PS_RTA_CORRECTION", sel.rta_correction);
 	AddMacro(ss, "PS_RTA_SRC_CORRECTION", sel.rta_source_correction);
 	AddMacro(ss, "PS_DITHER", sel.dither);
@@ -4838,7 +4833,7 @@ VkPipeline GSDeviceVK::CreateTFXPipeline(const PipelineSelector& p)
 	else
 	{
 		gpb.SetRenderPass(
-			GetTFXRenderPass(p.rt, p.ds, p.ps.hdr, p.dss.date,
+			GetTFXRenderPass(p.rt, p.ds, p.ps.colclip_hw, p.dss.date,
 				p.IsRTFeedbackLoop(), p.IsTestingAndSamplingDepth(),
 				p.rt ? VK_ATTACHMENT_LOAD_OP_LOAD : VK_ATTACHMENT_LOAD_OP_DONT_CARE,
 				p.ds ? VK_ATTACHMENT_LOAD_OP_LOAD : VK_ATTACHMENT_LOAD_OP_DONT_CARE),
@@ -4967,7 +4962,7 @@ void GSDeviceVK::InitializeState()
 		Vulkan::SetObjectName(m_device, m_point_sampler, "Point sampler");
 	m_linear_sampler = GetSampler(GSHWDrawConfig::SamplerSelector::Linear());
 	if (m_linear_sampler)
-		Vulkan::SetObjectName(m_device, m_point_sampler, "Linear sampler");
+		Vulkan::SetObjectName(m_device, m_linear_sampler, "Linear sampler");

 	m_tfx_sampler_sel = GSHWDrawConfig::SamplerSelector::Point().key;
 	m_tfx_sampler = m_point_sampler;
@@ -5595,7 +5590,7 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 	GSTextureVK* draw_rt = static_cast<GSTextureVK*>(config.rt);
 	GSTextureVK* draw_ds = static_cast<GSTextureVK*>(config.ds);
 	GSTextureVK* draw_rt_clone = nullptr;
-	GSTextureVK* hdr_rt = static_cast<GSTextureVK*>(g_gs_device->GetHDRTexture());
+	GSTextureVK* colclip_rt = static_cast<GSTextureVK*>(g_gs_device->GetColorClipTexture());

 	// stream buffer in first, in case we need to exec
 	SetVSConstantBuffer(config.cb_vs);
@@ -5621,11 +5616,11 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 	GSTextureVK* date_image = nullptr;
 	if (config.destination_alpha == GSHWDrawConfig::DestinationAlphaMode::PrimIDTracking)
 	{
-		// If we have a HDR in progress, we need to use the HDR texture, but we can't check this later as there's a chicken/egg problem with the pipe setup.
+		// If we have a colclip in progress, we need to use the colclip texture, but we can't check this later as there's a chicken/egg problem with the pipe setup.
 		GSTexture* backup_rt = config.rt;

-		if(hdr_rt)
-			config.rt = hdr_rt;
+		if(colclip_rt)
+			config.rt = colclip_rt;

 		date_image = SetupPrimitiveTrackingDATE(config);
 		if (!date_image)
@@ -5645,15 +5640,15 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 	if (InRenderPass() && !pipe.IsRTFeedbackLoop() && (config.tex == m_current_render_target || config.tex == m_current_depth_target))
 		EndRenderPass();

-	// now blit the hdr texture back to the original target
-	if (hdr_rt)
+	// now blit the colclip texture back to the original target
+	if (colclip_rt)
 	{
-		if (config.hdr_mode == GSHWDrawConfig::HDRMode::EarlyResolve)
+		if (config.colclip_mode == GSHWDrawConfig::ColClipMode::EarlyResolve)
 		{
-			GL_PUSH("Blit HDR back to RT");
+			GL_PUSH("Blit ColorClip back to RT");

 			EndRenderPass();
-			hdr_rt->TransitionToLayout(GSTextureVK::Layout::ShaderReadOnly);
+			colclip_rt->TransitionToLayout(GSTextureVK::Layout::ShaderReadOnly);

 			draw_rt = static_cast<GSTextureVK*>(config.rt);
 			OMSetRenderTargets(draw_rt, draw_ds, GSVector4i::loadh(rtsize), static_cast<FeedbackLoopFlag>(pipe.feedback_loop_flags));
@@ -5681,22 +5676,22 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 					draw_rt->GetRect());
 			}

-			const GSVector4 drawareaf = GSVector4(config.hdr_update_area);
+			const GSVector4 drawareaf = GSVector4(config.colclip_update_area);
 			const GSVector4 sRect(drawareaf / GSVector4(rtsize).xyxy());
-			SetPipeline(m_hdr_finish_pipelines[pipe.ds][pipe.IsRTFeedbackLoop()]);
-			SetUtilityTexture(hdr_rt, m_point_sampler);
+			SetPipeline(m_colclip_finish_pipelines[pipe.ds][pipe.IsRTFeedbackLoop()]);
+			SetUtilityTexture(colclip_rt, m_point_sampler);
 			DrawStretchRect(sRect, drawareaf, rtsize);
 			g_perfmon.Put(GSPerfMon::TextureCopies, 1);

-			Recycle(hdr_rt);
-			g_gs_device->SetHDRTexture(nullptr);
+			Recycle(colclip_rt);
+			g_gs_device->SetColorClipTexture(nullptr);

-			hdr_rt = nullptr;
+			colclip_rt = nullptr;
 		}
 		else
 		{
-			pipe.ps.hdr = 1;
-			draw_rt = hdr_rt;
+			pipe.ps.colclip_hw = 1;
+			draw_rt = colclip_rt;
 		}
 	}

@@ -5726,7 +5721,7 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 	if (config.require_one_barrier && !m_features.texture_barrier)
 	{
 		// requires a copy of the RT
-		draw_rt_clone = static_cast<GSTextureVK*>(CreateTexture(rtsize.x, rtsize.y, 1, hdr_rt ? GSTexture::Format::HDRColor : GSTexture::Format::Color, true));
+		draw_rt_clone = static_cast<GSTextureVK*>(CreateTexture(rtsize.x, rtsize.y, 1, colclip_rt ? GSTexture::Format::ColorClip : GSTexture::Format::Color, true));
 		if (draw_rt_clone)
 		{
 			EndRenderPass();
@@ -5739,17 +5734,17 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 		}
 	}

-	// Switch to hdr target for colclip rendering
-	if (pipe.ps.hdr)
+	// Switch to colclip target for colclip hw rendering
+	if (pipe.ps.colclip_hw)
 	{
-		if (!hdr_rt)
+		if (!colclip_rt)
 		{
-			config.hdr_update_area = config.drawarea;
+			config.colclip_update_area = config.drawarea;
 			EndRenderPass();
-			hdr_rt = static_cast<GSTextureVK*>(CreateRenderTarget(rtsize.x, rtsize.y, GSTexture::Format::HDRColor, false));
-			if (!hdr_rt)
+			colclip_rt = static_cast<GSTextureVK*>(CreateRenderTarget(rtsize.x, rtsize.y, GSTexture::Format::ColorClip, false));
+			if (!colclip_rt)
 			{
-				Console.WriteLn("Failed to allocate HDR render target, aborting draw.");
+				Console.WriteLn("Failed to allocate ColorClip render target, aborting draw.");

 				if (date_image)
 					Recycle(date_image);
@@ -5757,13 +5752,13 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 				GL_POP();
 				return;
 			}
-			g_gs_device->SetHDRTexture(static_cast<GSTexture*>(hdr_rt));
+			g_gs_device->SetColorClipTexture(static_cast<GSTexture*>(colclip_rt));

-			// propagate clear value through if the hdr render is the first
+			// propagate clear value through if the colclip render is the first
 			if (draw_rt->GetState() == GSTexture::State::Cleared)
 			{
-				hdr_rt->SetState(GSTexture::State::Cleared);
-				hdr_rt->SetClearColor(draw_rt->GetClearColor());
+				colclip_rt->SetState(GSTexture::State::Cleared);
+				colclip_rt->SetClearColor(draw_rt->GetClearColor());

 				// If depth is cleared, we need to commit it, because we're only going to draw to the active part of the FB.
 				if (draw_ds && draw_ds->GetState() == GSTexture::State::Cleared && !config.drawarea.eq(GSVector4i::loadh(rtsize)))
@@ -5771,7 +5766,7 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 			}
 			else if (draw_rt->GetState() == GSTexture::State::Dirty)
 			{
-				GL_PUSH_("HDR Render Target Setup");
+				GL_PUSH_("ColorClip Render Target Setup");
 				draw_rt->TransitionToLayout(GSTextureVK::Layout::ShaderReadOnly);
 			}

@@ -5779,7 +5774,7 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 			if (config.require_one_barrier && !m_features.texture_barrier)
 				PSSetShaderResource(2, draw_rt, true);
 		}
-		draw_rt = hdr_rt;
+		draw_rt = colclip_rt;
 	}

 	// clear texture binding when it's bound to RT or DS.
@@ -5790,15 +5785,15 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 	}

 	// render pass restart optimizations
-	if (hdr_rt && (config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertAndResolve || config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertOnly))
+	if (colclip_rt && (config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertAndResolve || config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertOnly))
 	{
-		// HDR requires blitting.
+		// colclip hw requires blitting.
 		EndRenderPass();
 	}
 	else if (InRenderPass() && (m_current_render_target == draw_rt || m_current_depth_target == draw_ds))
 	{
 		// avoid restarting the render pass just to switch from rt+depth to rt and vice versa
-		// keep the depth even if doing HDR draws, because the next draw will probably re-enable depth
+		// keep the depth even if doing colclip hw draws, because the next draw will probably re-enable depth
 		if (!draw_rt && m_current_render_target && config.tex != m_current_render_target &&
 			m_current_render_target->GetSize() == draw_ds->GetSize())
 		{
@@ -5817,15 +5812,15 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 	}

 	// We don't need the very first barrier if this is the first draw after switching to feedback loop,
-	// because the layout change in itself enforces the execution dependency. HDR needs a barrier between
-	// setup and the first draw to read it. TODO: Make HDR use subpasses instead.
+	// because the layout change in itself enforces the execution dependency. colclip hw needs a barrier between
+	// setup and the first draw to read it. TODO: Make colclip hw use subpasses instead.

 	// However, it turns out *not* doing this causes GPU resets on RDNA3, specifically Windows drivers.
 	// Despite the layout changing enforcing the execution dependency between previous draws and the first
 	// input attachment read, it still wants the region/fragment-local barrier...

 	const bool skip_first_barrier =
-		(draw_rt && draw_rt->GetLayout() != GSTextureVK::Layout::FeedbackLoop && !pipe.ps.hdr && !IsDeviceAMD());
+		(draw_rt && draw_rt->GetLayout() != GSTextureVK::Layout::FeedbackLoop && !pipe.ps.colclip_hw && !IsDeviceAMD());

 	OMSetRenderTargets(draw_rt, draw_ds, config.scissor, static_cast<FeedbackLoopFlag>(pipe.feedback_loop_flags));
 	if (pipe.IsRTFeedbackLoop())
@@ -5843,14 +5838,14 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 	{
 		const VkAttachmentLoadOp rt_op = GetLoadOpForTexture(draw_rt);
 		const VkAttachmentLoadOp ds_op = GetLoadOpForTexture(draw_ds);
-		const VkRenderPass rp = GetTFXRenderPass(pipe.rt, pipe.ds, pipe.ps.hdr,
+		const VkRenderPass rp = GetTFXRenderPass(pipe.rt, pipe.ds, pipe.ps.colclip_hw,
 			config.destination_alpha == GSHWDrawConfig::DestinationAlphaMode::Stencil, pipe.IsRTFeedbackLoop(),
 			pipe.IsTestingAndSamplingDepth(), rt_op, ds_op);
 		const bool is_clearing_rt = (rt_op == VK_ATTACHMENT_LOAD_OP_CLEAR || ds_op == VK_ATTACHMENT_LOAD_OP_CLEAR);

-		// Only draw to the active area of the HDR target. Except when depth is cleared, we need to use the full
+		// Only draw to the active area of the colclip hw target. Except when depth is cleared, we need to use the full
 		// buffer size, otherwise it'll only clear the draw part of the depth buffer.
-		const GSVector4i render_area = (pipe.ps.hdr && (config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertAndResolve) && ds_op != VK_ATTACHMENT_LOAD_OP_CLEAR) ? config.drawarea :
+		const GSVector4i render_area = (pipe.ps.colclip_hw && (config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertAndResolve) && ds_op != VK_ATTACHMENT_LOAD_OP_CLEAR) ? config.drawarea :
 																							   GSVector4i::loadh(rtsize);

 		if (is_clearing_rt)
@@ -5861,9 +5856,9 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 			if (draw_rt)
 			{
 				GSVector4 clear_color = draw_rt->GetUNormClearColor();
-				if (pipe.ps.hdr)
+				if (pipe.ps.colclip_hw)
 				{
-					// Denormalize clear color for HDR.
+					// Denormalize clear color for hw colclip.
 					clear_color *= GSVector4::cxpr(255.0f / 65535.0f, 255.0f / 65535.0f, 255.0f / 65535.0f, 1.0f);
 				}
 				GSVector4::store<true>(&cvs[cv_count++].color, clear_color);
@@ -5888,14 +5883,14 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 		vkCmdClearAttachments(m_current_command_buffer, 1, &ca, 1, &rc);
 	}

-	// rt -> hdr blit if enabled
-	if (hdr_rt && (config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertOnly || config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertAndResolve) && config.rt->GetState() == GSTexture::State::Dirty)
+	// rt -> colclip hw blit if enabled
+	if (colclip_rt && (config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertOnly || config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertAndResolve) && config.rt->GetState() == GSTexture::State::Dirty)
 	{
 		OMSetRenderTargets(draw_rt, draw_ds, GSVector4i::loadh(rtsize), static_cast<FeedbackLoopFlag>(pipe.feedback_loop_flags));
 		SetUtilityTexture(static_cast<GSTextureVK*>(config.rt), m_point_sampler);
-		SetPipeline(m_hdr_setup_pipelines[pipe.ds][pipe.IsRTFeedbackLoop()]);
+		SetPipeline(m_colclip_setup_pipelines[pipe.ds][pipe.IsRTFeedbackLoop()]);

-		const GSVector4 drawareaf = GSVector4((config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertOnly) ? GSVector4i::loadh(rtsize) : config.drawarea);
+		const GSVector4 drawareaf = GSVector4((config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertOnly) ? GSVector4i::loadh(rtsize) : config.drawarea);
 		const GSVector4 sRect(drawareaf / GSVector4(rtsize).xyxy());
 		DrawStretchRect(sRect, drawareaf, rtsize);
 		g_perfmon.Put(GSPerfMon::TextureCopies, 1);
@@ -5904,8 +5899,8 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 		OMSetRenderTargets(draw_rt, draw_ds, config.scissor, static_cast<FeedbackLoopFlag>(pipe.feedback_loop_flags));
 	}

-	// VB/IB upload, if we did DATE setup and it's not HDR this has already been done
-	if (!date_image || hdr_rt)
+	// VB/IB upload, if we did DATE setup and it's not colclip hw this has already been done
+	if (!date_image || colclip_rt)
 		UploadHWDrawVerticesAndIndices(config);

 	// now we can do the actual draw
@@ -5955,21 +5950,21 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 	if (date_image)
 		Recycle(date_image);

-	// now blit the hdr texture back to the original target
-	if (hdr_rt)
+	// now blit the colclip texture back to the original target
+	if (colclip_rt)
 	{
-		config.hdr_update_area = config.hdr_update_area.runion(config.drawarea);
+		config.colclip_update_area = config.colclip_update_area.runion(config.drawarea);

-		if ((config.hdr_mode == GSHWDrawConfig::HDRMode::ResolveOnly || config.hdr_mode == GSHWDrawConfig::HDRMode::ConvertAndResolve))
+		if ((config.colclip_mode == GSHWDrawConfig::ColClipMode::ResolveOnly || config.colclip_mode == GSHWDrawConfig::ColClipMode::ConvertAndResolve))
 		{
-			GL_PUSH("Blit HDR back to RT");
+			GL_PUSH("Blit ColorClip back to RT");

 			EndRenderPass();

-			hdr_rt->TransitionToLayout(GSTextureVK::Layout::ShaderReadOnly);
+			colclip_rt->TransitionToLayout(GSTextureVK::Layout::ShaderReadOnly);

 			draw_rt = static_cast<GSTextureVK*>(config.rt);
-			OMSetRenderTargets(draw_rt, draw_ds, (config.hdr_mode == GSHWDrawConfig::HDRMode::ResolveOnly) ? GSVector4i::loadh(rtsize) : config.scissor, static_cast<FeedbackLoopFlag>(pipe.feedback_loop_flags));
+			OMSetRenderTargets(draw_rt, draw_ds, (config.colclip_mode == GSHWDrawConfig::ColClipMode::ResolveOnly) ? GSVector4i::loadh(rtsize) : config.scissor, static_cast<FeedbackLoopFlag>(pipe.feedback_loop_flags));

 			// if this target was cleared and never drawn to, perform the clear as part of the resolve here.
 			if (draw_rt->GetState() == GSTexture::State::Cleared)
@@ -5994,19 +5989,19 @@ void GSDeviceVK::RenderHW(GSHWDrawConfig& config)
 					draw_rt->GetRect());
 			}

-			const GSVector4 drawareaf = GSVector4(config.hdr_update_area);
+			const GSVector4 drawareaf = GSVector4(config.colclip_update_area);
 			const GSVector4 sRect(drawareaf / GSVector4(rtsize).xyxy());
-			SetPipeline(m_hdr_finish_pipelines[pipe.ds][pipe.IsRTFeedbackLoop()]);
-			SetUtilityTexture(hdr_rt, m_point_sampler);
+			SetPipeline(m_colclip_finish_pipelines[pipe.ds][pipe.IsRTFeedbackLoop()]);
+			SetUtilityTexture(colclip_rt, m_point_sampler);
 			DrawStretchRect(sRect, drawareaf, rtsize);
 			g_perfmon.Put(GSPerfMon::TextureCopies, 1);

-			Recycle(hdr_rt);
-			g_gs_device->SetHDRTexture(nullptr);
+			Recycle(colclip_rt);
+			g_gs_device->SetColorClipTexture(nullptr);
 		}
 	}

-	config.hdr_mode = GSHWDrawConfig::HDRMode::NoModify;
+	config.colclip_mode = GSHWDrawConfig::ColClipMode::NoModify;
 }

 void GSDeviceVK::UpdateHWPipelineSelector(GSHWDrawConfig& config, PipelineSelector& pipe)
--- a/pcsx2/GS/Renderers/Vulkan/GSDeviceVK.h
+++ b/pcsx2/GS/Renderers/Vulkan/GSDeviceVK.h
@@ -394,8 +394,8 @@ private:
 	std::array<VkPipeline, 32> m_color_copy{};
 	std::array<VkPipeline, 2> m_merge{};
 	std::array<VkPipeline, NUM_INTERLACE_SHADERS> m_interlace{};
-	VkPipeline m_hdr_setup_pipelines[2][2] = {}; // [depth][feedback_loop]
-	VkPipeline m_hdr_finish_pipelines[2][2] = {}; // [depth][feedback_loop]
+	VkPipeline m_colclip_setup_pipelines[2][2] = {}; // [depth][feedback_loop]
+	VkPipeline m_colclip_finish_pipelines[2][2] = {}; // [depth][feedback_loop]
 	VkRenderPass m_date_image_setup_render_passes[2][2] = {}; // [depth][clear]
 	VkPipeline m_date_image_setup_pipelines[2][4] = {}; // [depth][datm]
 	VkPipeline m_fxaa_pipeline = {};
@@ -415,7 +415,7 @@ private:
 	VkRenderPass m_date_setup_render_pass = VK_NULL_HANDLE;
 	VkRenderPass m_swap_chain_render_pass = VK_NULL_HANDLE;

-	VkRenderPass m_tfx_render_pass[2][2][2][3][2][2][3][3] = {}; // [rt][ds][hdr][date][fbl][dsp][rt_op][ds_op]
+	VkRenderPass m_tfx_render_pass[2][2][2][3][2][2][3][3] = {}; // [rt][ds][colclip][date][fbl][dsp][rt_op][ds_op]

 	VkDescriptorSetLayout m_cas_ds_layout = VK_NULL_HANDLE;
 	VkPipelineLayout m_cas_pipeline_layout = VK_NULL_HANDLE;
@@ -486,10 +486,10 @@ public:
 	/// Returns true if Vulkan is suitable as a default for the devices in the system.
 	static bool IsSuitableDefaultRenderer();

-	__fi VkRenderPass GetTFXRenderPass(bool rt, bool ds, bool hdr, bool stencil, bool fbl, bool dsp,
+	__fi VkRenderPass GetTFXRenderPass(bool rt, bool ds, bool colclip, bool stencil, bool fbl, bool dsp,
 		VkAttachmentLoadOp rt_op, VkAttachmentLoadOp ds_op) const
 	{
-		return m_tfx_render_pass[rt][ds][hdr][stencil][fbl][dsp][rt_op][ds_op];
+		return m_tfx_render_pass[rt][ds][colclip][stencil][fbl][dsp][rt_op][ds_op];
 	}
 	__fi VkSampler GetPointSampler() const { return m_point_sampler; }
 	__fi VkSampler GetLinearSampler() const { return m_linear_sampler; }
--- a/pcsx2/ShaderCacheVersion.h
+++ b/pcsx2/ShaderCacheVersion.h
@@ -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 = 62;
+static constexpr u32 SHADER_CACHE_VERSION = 63;
--- a/pcsx2/VMManager.cpp
+++ b/pcsx2/VMManager.cpp
@@ -2504,8 +2504,10 @@ void VMManager::LogCPUCapabilities()

 	Console.WriteLnFmt(
 		"  Operating System = {}\n"
-		"  Physical RAM     = {} MB",
+		"  Available RAM    = {} MB\n"
+		"  Physical RAM     = {} MB\n",
 		GetOSVersionString(),
+		GetAvailablePhysicalMemory() / _1mb,
 		GetPhysicalMemory() / _1mb);

 	Console.WriteLnFmt("  Processor        = {}", cpuinfo_get_package(0)->name);
--- a/tools/generate_redump_yaml.py
+++ b/tools/generate_redump_yaml.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python3 
+
 import sys
 import xml.etree.ElementTree as ET
 import re
Author	SHA1	Message	Date
Ty	9a6f878051	CI: Use the upstream Flatpak action https://github.com/flathub-infra/flatpak-github-actions/issues/17	2025-04-21 11:21:10 -04:00
PCSX2 Bot	50fc750154	[ci skip] Qt: Update Base Translation.	2025-04-20 09:37:04 -04:00
Mrlinkwii	9fe8235eda	tool : update generate_redump_yaml.py	2025-04-19 17:37:54 +02:00
Mrlinkwii	f7b9c48998	Deps: update redump database	2025-04-19 17:37:54 +02:00
lightningterror	17bf27c018	GS/DX12: Copy/bind rt when tex is fb on slot 0.	2025-04-19 17:05:22 +02:00
lightningterror	80ca5ea5fd	GS/HW: Rename GSC_Tekken5 to GSC_NamcoGames. Multiple games use it.	2025-04-19 16:52:26 +02:00
lightningterror	3afa9ca403	VMManager: Add available ram info in log.	2025-04-19 13:41:41 +02:00
lightningterror	842190e15e	CDVD: Adjust ram requirements when precaching on linux/Mac.	2025-04-19 13:41:41 +02:00
PCSX2 Bot	717775d9ab	[ci skip] Qt: Update Base Translation.	2025-04-19 05:39:57 +02:00
GregoireLD	a19bb91041	GameDB: Add a new Ico version (#11103 )	2025-04-18 13:33:51 -04:00
Filoppi	a545982a28	GS: Fix crash if CAS pipeline failed to compile (it'd crash when the user enables CAS, which is still enough of a good reason to make the whole rendering backend fail to initialize)	2025-04-18 19:11:11 +02:00
Filoppi	2109df04ca	GS: Remove duplicate shader creation for RTA correction. The same shader would have been created just above.	2025-04-18 19:11:11 +02:00
Filoppi	f485cf8ebc	GS: fix more badly named debug objects	2025-04-18 19:11:11 +02:00
Filoppi	bb48110f95	GS: Fix VK also naming the wrong pipelines	2025-04-18 19:11:11 +02:00
Filoppi	718adda749	GS: Fix DX12 setting the object names for the wrong pipelines (possibly causing random memory writes), also fix some bad naming	2025-04-18 19:11:11 +02:00
Filoppi	a170c7ccb1	GS: Fix DX12 m_color_copy shaders not applying the right RTA_CORRECTION offset (see the VK implementation, which is identical except for this issue)	2025-04-18 19:11:11 +02:00
Filoppi	fec3fe3b6b	GS: Add DX11 shaders debug names	2025-04-18 19:11:11 +02:00
Filoppi	00f19c9777	GS: Fix displays that are currently unplugged (disabled) from throwing unnecessary warnings	2025-04-18 19:11:11 +02:00
Filoppi	93aae28593	GS: Polish spacing and comments	2025-04-18 19:11:11 +02:00
Filoppi	8be2b907b3	GS: Add actual HDR and HQ textures and rename the "HDR" textures to colclip (hw) given that's actually what they are (HDR was a very loose term for it)	2025-04-18 19:11:11 +02:00
Filoppi	fcca07765b	GS: Clarify HW blends code a bit	2025-04-18 19:11:11 +02:00
EXtremeExploit	559e4e75eb	GameDB: Add memcard filters for Mortal Kombat Armageddon Premium	2025-04-18 10:10:16 -04:00