diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Formats.cpp b/rpcs3/Emu/RSX/D3D12/D3D12Formats.cpp
index 97300be2c9..710143ee9a 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12Formats.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12Formats.cpp
@@ -138,55 +138,30 @@ DXGI_FORMAT get_texture_format(int format) noexcept
 {
 	switch (format)
 	{
-	case CELL_GCM_TEXTURE_B8:
-		return DXGI_FORMAT_R8_UNORM;
-	case CELL_GCM_TEXTURE_A1R5G5B5:
-		return DXGI_FORMAT_B5G5R5A1_UNORM;
-	case CELL_GCM_TEXTURE_A4R4G4B4:
-		return DXGI_FORMAT_B4G4R4A4_UNORM;
-	case CELL_GCM_TEXTURE_R5G6B5:
-		return DXGI_FORMAT_B5G6R5_UNORM;
-	case CELL_GCM_TEXTURE_A8R8G8B8:
-		return DXGI_FORMAT_R8G8B8A8_UNORM;
-	case CELL_GCM_TEXTURE_COMPRESSED_DXT1:
-		return DXGI_FORMAT_BC1_UNORM;
-	case CELL_GCM_TEXTURE_COMPRESSED_DXT23:
-		return DXGI_FORMAT_BC2_UNORM;
-	case CELL_GCM_TEXTURE_COMPRESSED_DXT45:
-		return DXGI_FORMAT_BC3_UNORM;
-	case CELL_GCM_TEXTURE_G8B8:
-		return DXGI_FORMAT_G8R8_G8B8_UNORM;
-	case CELL_GCM_TEXTURE_R6G5B5:
-		/*Not native*/ 
-		return DXGI_FORMAT_R8G8B8A8_UNORM;
-	case CELL_GCM_TEXTURE_DEPTH24_D8:
-		return DXGI_FORMAT_R32_UINT;
-	case CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT:
-		return DXGI_FORMAT_R32_FLOAT;
-	case CELL_GCM_TEXTURE_DEPTH16:
-		return DXGI_FORMAT_R16_UNORM;
-	case CELL_GCM_TEXTURE_DEPTH16_FLOAT:
-		return DXGI_FORMAT_R16_FLOAT;
-	case CELL_GCM_TEXTURE_X16:
-		return DXGI_FORMAT_R16_UNORM;
-	case CELL_GCM_TEXTURE_Y16_X16:
-		return DXGI_FORMAT_R16G16_UNORM;
-	case CELL_GCM_TEXTURE_R5G5B5A1:
-		return DXGI_FORMAT_B5G5R5A1_UNORM;
-	case CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT:
-		return DXGI_FORMAT_R16G16B16A16_FLOAT;
-	case CELL_GCM_TEXTURE_W32_Z32_Y32_X32_FLOAT:
-		return DXGI_FORMAT_R32G32B32A32_FLOAT;
-	case CELL_GCM_TEXTURE_X32_FLOAT:
-		return DXGI_FORMAT_R32_FLOAT;
-	case CELL_GCM_TEXTURE_D1R5G5B5:
-		return DXGI_FORMAT_B5G5R5A1_UNORM;
-	case CELL_GCM_TEXTURE_D8R8G8B8:
-		return DXGI_FORMAT_R8G8B8A8_UNORM;
-	case CELL_GCM_TEXTURE_COMPRESSED_B8R8_G8R8:
-		return DXGI_FORMAT_G8R8_G8B8_UNORM;
-	case CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8:
-		return DXGI_FORMAT_R8G8_B8G8_UNORM;
+	case CELL_GCM_TEXTURE_B8: return DXGI_FORMAT_R8_UNORM;
+	case CELL_GCM_TEXTURE_A1R5G5B5: return DXGI_FORMAT_B5G5R5A1_UNORM;
+	case CELL_GCM_TEXTURE_A4R4G4B4: return DXGI_FORMAT_B4G4R4A4_UNORM;
+	case CELL_GCM_TEXTURE_R5G6B5: return DXGI_FORMAT_B5G6R5_UNORM;
+	case CELL_GCM_TEXTURE_A8R8G8B8: return DXGI_FORMAT_R8G8B8A8_UNORM;
+	case CELL_GCM_TEXTURE_COMPRESSED_DXT1: return DXGI_FORMAT_BC1_UNORM;
+	case CELL_GCM_TEXTURE_COMPRESSED_DXT23: return DXGI_FORMAT_BC2_UNORM;
+	case CELL_GCM_TEXTURE_COMPRESSED_DXT45: return DXGI_FORMAT_BC3_UNORM;
+	case CELL_GCM_TEXTURE_G8B8: return DXGI_FORMAT_G8R8_G8B8_UNORM;
+	case CELL_GCM_TEXTURE_R6G5B5: /*Not native*/ return DXGI_FORMAT_R8G8B8A8_UNORM;
+	case CELL_GCM_TEXTURE_DEPTH24_D8: return DXGI_FORMAT_R32_UINT;
+	case CELL_GCM_TEXTURE_DEPTH24_D8_FLOAT:	return DXGI_FORMAT_R32_FLOAT;
+	case CELL_GCM_TEXTURE_DEPTH16: return DXGI_FORMAT_R16_UNORM;
+	case CELL_GCM_TEXTURE_DEPTH16_FLOAT: return DXGI_FORMAT_R16_FLOAT;
+	case CELL_GCM_TEXTURE_X16: return DXGI_FORMAT_R16_UNORM;
+	case CELL_GCM_TEXTURE_Y16_X16: return DXGI_FORMAT_R16G16_UNORM;
+	case CELL_GCM_TEXTURE_R5G5B5A1: return DXGI_FORMAT_R8G8B8A8_UNORM;
+	case CELL_GCM_TEXTURE_W16_Z16_Y16_X16_FLOAT: return DXGI_FORMAT_R16G16B16A16_FLOAT;
+	case CELL_GCM_TEXTURE_W32_Z32_Y32_X32_FLOAT: return DXGI_FORMAT_R32G32B32A32_FLOAT;
+	case CELL_GCM_TEXTURE_X32_FLOAT: return DXGI_FORMAT_R32_FLOAT;
+	case CELL_GCM_TEXTURE_D1R5G5B5: return DXGI_FORMAT_B5G5R5A1_UNORM;
+	case CELL_GCM_TEXTURE_D8R8G8B8: return DXGI_FORMAT_R8G8B8A8_UNORM;
+	case CELL_GCM_TEXTURE_COMPRESSED_B8R8_G8R8: return DXGI_FORMAT_G8R8_G8B8_UNORM;
+	case CELL_GCM_TEXTURE_COMPRESSED_R8B8_R8G8: return DXGI_FORMAT_R8G8_B8G8_UNORM;
 	case CELL_GCM_TEXTURE_Y16_X16_FLOAT:
 	case CELL_GCM_TEXTURE_COMPRESSED_HILO8:
 	case CELL_GCM_TEXTURE_COMPRESSED_HILO_S8: