From 5d140f7db3b639f4fa20adcb709937490b66ecaf Mon Sep 17 00:00:00 2001
From: refractionpcsx2 <refraction@gmail.com>
Date: Tue, 4 Apr 2023 17:32:59 +0100
Subject: [PATCH] GS: Fix missing PSM references.

---
 pcsx2/GS/GSClut.cpp                      | 24 ++++++++++++------------
 pcsx2/GS/GSState.cpp                     | 10 +++++-----
 pcsx2/GS/Renderers/HW/GSTextureCache.cpp |  2 +-
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pcsx2/GS/GSClut.cpp b/pcsx2/GS/GSClut.cpp
index cc7fb5388d..e4e06f7eb0 100644
--- a/pcsx2/GS/GSClut.cpp
+++ b/pcsx2/GS/GSClut.cpp
@@ -311,35 +311,35 @@ void GSClut::Read(const GIFRegTEX0& TEX0)
 
 		u16* clut = m_clut;
 
-		if(TEX0.CPSM == PSM_PSMCT32 || TEX0.CPSM == PSM_PSMCT24)
+		if(TEX0.CPSM == PSMCT32 || TEX0.CPSM == PSMCT24)
 		{
 			switch(TEX0.PSM)
 			{
-			case PSM_PSMT8:
-			case PSM_PSMT8H:
+			case PSMT8:
+			case PSMT8H:
 				clut += (TEX0.CSA & 15) << 4;
 				ReadCLUT_T32_I8(clut, m_buff32);
 				break;
-			case PSM_PSMT4:
-			case PSM_PSMT4HL:
-			case PSM_PSMT4HH:
+			case PSMT4:
+			case PSMT4HL:
+			case PSMT4HH:
 				clut += (TEX0.CSA & 15) << 4;
 				ReadCLUT_T32_I4(clut, m_buff32, m_buff64);
 				break;
 			}
 		}
-		else if(TEX0.CPSM == PSM_PSMCT16 || TEX0.CPSM == PSM_PSMCT16S)
+		else if(TEX0.CPSM == PSMCT16 || TEX0.CPSM == PSMCT16S)
 		{
 			switch(TEX0.PSM)
 			{
-			case PSM_PSMT8:
-			case PSM_PSMT8H:
+			case PSMT8:
+			case PSMT8H:
 				clut += TEX0.CSA << 4;
 				ReadCLUT_T16_I8(clut, m_buff32);
 				break;
-			case PSM_PSMT4:
-			case PSM_PSMT4HL:
-			case PSM_PSMT4HH:
+			case PSMT4:
+			case PSMT4HL:
+			case PSMT4HH:
 				clut += TEX0.CSA << 4;
 				ReadCLUT_T16_I4(clut, m_buff32, m_buff64);
 				break;
diff --git a/pcsx2/GS/GSState.cpp b/pcsx2/GS/GSState.cpp
index 3a6da89d06..8c661faa57 100644
--- a/pcsx2/GS/GSState.cpp
+++ b/pcsx2/GS/GSState.cpp
@@ -1296,17 +1296,17 @@ void GSState::GIFRegHandlerFRAME(const GIFReg* RESTRICT r)
 	{
 		case PSMT8H:
 			// Berserk uses the format to only update the alpha channel
-			GL_INS("CORRECT FRAME FORMAT replaces PSM_PSMT8H by PSM_PSMCT32/0x00FF_FFFF");
+			GL_INS("CORRECT FRAME FORMAT replaces PSMT8H by PSMCT32/0x00FF_FFFF");
 			m_env.CTXT[i].FRAME.PSM = PSMCT32;
 			m_env.CTXT[i].FRAME.FBMSK = 0x00FFFFFF;
 			break;
-		case PSMT4HH: // Not tested. Based on PSM_PSMT8H behavior
-			GL_INS("CORRECT FRAME FORMAT replaces PSM_PSMT4HH by PSM_PSMCT32/0x0FFF_FFFF");
+		case PSMT4HH: // Not tested. Based on PSMT8H behavior
+			GL_INS("CORRECT FRAME FORMAT replaces PSMT4HH by PSMCT32/0x0FFF_FFFF");
 			m_env.CTXT[i].FRAME.PSM = PSMCT32;
 			m_env.CTXT[i].FRAME.FBMSK = 0x0FFFFFFF;
 			break;
-		case PSMT4HL: // Not tested. Based on PSM_PSMT8H behavior
-			GL_INS("CORRECT FRAME FORMAT replaces PSM_PSMT4HL by PSM_PSMCT32/0xF0FF_FFFF");
+		case PSMT4HL: // Not tested. Based on PSMT8H behavior
+			GL_INS("CORRECT FRAME FORMAT replaces PSMT4HL by PSMCT32/0xF0FF_FFFF");
 			m_env.CTXT[i].FRAME.PSM = PSMCT32;
 			m_env.CTXT[i].FRAME.FBMSK = 0xF0FFFFFF;
 			break;
diff --git a/pcsx2/GS/Renderers/HW/GSTextureCache.cpp b/pcsx2/GS/Renderers/HW/GSTextureCache.cpp
index 026b105979..345c8fb5ec 100644
--- a/pcsx2/GS/Renderers/HW/GSTextureCache.cpp
+++ b/pcsx2/GS/Renderers/HW/GSTextureCache.cpp
@@ -2963,7 +2963,7 @@ GSTextureCache::Source* GSTextureCache::CreateSource(const GIFRegTEX0& TEX0, con
 			//GSVector4 scale = GSVector4(dst->m_texture->GetScale()).xyxy();
 
 			//int blockWidth  = 64;
-			//int blockHeight = TEX0.PSM == PSM_PSMCT32 || TEX0.PSM == PSM_PSMCT24 ? 32 : 64;
+			//int blockHeight = TEX0.PSM == PSMCT32 || TEX0.PSM == PSMCT24 ? 32 : 64;
 
 			//GSVector4i br(0, 0, blockWidth, blockHeight);