Merge pull request #12684 from Pokechu22/invalid-vertex-component

Fix out of bounds accesses for invalid vertex component formats
dolphin-emu · Apr 4, 2024 · ad33120 · ad33120
2 parents 4312840 + a3951dc
commit ad33120
Show file tree

Hide file tree

Showing 19 changed files with 367 additions and 91 deletions.
diff --git a/Source/Core/Core/DolphinAnalytics.cpp b/Source/Core/Core/DolphinAnalytics.cpp
@@ -137,7 +137,7 @@ void DolphinAnalytics::ReportGameStart()
 }
 
 // Keep in sync with enum class GameQuirk definition.
-constexpr std::array<const char*, 28> GAME_QUIRKS_NAMES{
+constexpr std::array<const char*, 32> GAME_QUIRKS_NAMES{
     "directly-reads-wiimote-input",
     "uses-DVDLowStopLaser",
     "uses-DVDLowOffset",
@@ -166,6 +166,10 @@ constexpr std::array<const char*, 28> GAME_QUIRKS_NAMES{
     "mismatched-gpu-tex-coords-between-cp-and-xf",
     "mismatched-gpu-matrix-indices-between-cp-and-xf",
     "reads-bounding-box",
+    "invalid-position-component-format",
+    "invalid-normal-component-format",
+    "invalid-texture-coordinate-component-format",
+    "invalid-color-component-format",
 };
 static_assert(GAME_QUIRKS_NAMES.size() == static_cast<u32>(GameQuirk::COUNT),
               "Game quirks names and enum definition are out of sync.");

diff --git a/Source/Core/Core/DolphinAnalytics.h b/Source/Core/Core/DolphinAnalytics.h
@@ -94,6 +94,15 @@ enum class GameQuirk
   // only a few read them (from PE_BBOX_LEFT etc.)
   READS_BOUNDING_BOX,
 
+  // A few games use invalid vertex component formats, but the two known cases (Fifa Street and
+  // Def Jam: Fight for New York, see https://bugs.dolphin-emu.org/issues/12719) only use invalid
+  // normal formats and lighting is disabled in those cases, so it doesn't end up mattering.
+  // It's possible other games use invalid formats, possibly on other vertex components.
+  INVALID_POSITION_COMPONENT_FORMAT,
+  INVALID_NORMAL_COMPONENT_FORMAT,
+  INVALID_TEXTURE_COORDINATE_COMPONENT_FORMAT,
+  INVALID_COLOR_COMPONENT_FORMAT,
+
   COUNT,
 };
 

diff --git a/Source/Core/VideoBackends/D3D/D3DNativeVertexFormat.cpp b/Source/Core/VideoBackends/D3D/D3DNativeVertexFormat.cpp
@@ -25,7 +25,7 @@ Gfx::CreateNativeVertexFormat(const PortableVertexDeclaration& vtx_decl)
 
 DXGI_FORMAT VarToD3D(ComponentFormat t, int size, bool integer)
 {
-  using FormatMap = Common::EnumMap<DXGI_FORMAT, ComponentFormat::Float>;
+  using FormatMap = Common::EnumMap<DXGI_FORMAT, ComponentFormat::InvalidFloat7>;
   static constexpr auto f = [](FormatMap a) { return a; };  // Deduction helper
 
   static constexpr std::array<FormatMap, 4> d3d_float_format_lookup = {
@@ -35,27 +35,39 @@ DXGI_FORMAT VarToD3D(ComponentFormat t, int size, bool integer)
           DXGI_FORMAT_R16_UNORM,
           DXGI_FORMAT_R16_SNORM,
           DXGI_FORMAT_R32_FLOAT,
+          DXGI_FORMAT_R32_FLOAT,
+          DXGI_FORMAT_R32_FLOAT,
+          DXGI_FORMAT_R32_FLOAT,
       }),
       f({
           DXGI_FORMAT_R8G8_UNORM,
           DXGI_FORMAT_R8G8_SNORM,
           DXGI_FORMAT_R16G16_UNORM,
           DXGI_FORMAT_R16G16_SNORM,
           DXGI_FORMAT_R32G32_FLOAT,
+          DXGI_FORMAT_R32G32_FLOAT,
+          DXGI_FORMAT_R32G32_FLOAT,
+          DXGI_FORMAT_R32G32_FLOAT,
       }),
       f({
           DXGI_FORMAT_UNKNOWN,
           DXGI_FORMAT_UNKNOWN,
           DXGI_FORMAT_UNKNOWN,
           DXGI_FORMAT_UNKNOWN,
           DXGI_FORMAT_R32G32B32_FLOAT,
+          DXGI_FORMAT_R32G32B32_FLOAT,
+          DXGI_FORMAT_R32G32B32_FLOAT,
+          DXGI_FORMAT_R32G32B32_FLOAT,
       }),
       f({
           DXGI_FORMAT_R8G8B8A8_UNORM,
           DXGI_FORMAT_R8G8B8A8_SNORM,
           DXGI_FORMAT_R16G16B16A16_UNORM,
           DXGI_FORMAT_R16G16B16A16_SNORM,
           DXGI_FORMAT_R32G32B32A32_FLOAT,
+          DXGI_FORMAT_R32G32B32A32_FLOAT,
+          DXGI_FORMAT_R32G32B32A32_FLOAT,
+          DXGI_FORMAT_R32G32B32A32_FLOAT,
       }),
   };
 
@@ -66,27 +78,39 @@ DXGI_FORMAT VarToD3D(ComponentFormat t, int size, bool integer)
           DXGI_FORMAT_R16_UINT,
           DXGI_FORMAT_R16_SINT,
           DXGI_FORMAT_UNKNOWN,
+          DXGI_FORMAT_UNKNOWN,
+          DXGI_FORMAT_UNKNOWN,
+          DXGI_FORMAT_UNKNOWN,
       }),
       f({
           DXGI_FORMAT_R8G8_UINT,
           DXGI_FORMAT_R8G8_SINT,
           DXGI_FORMAT_R16G16_UINT,
           DXGI_FORMAT_R16G16_SINT,
           DXGI_FORMAT_UNKNOWN,
+          DXGI_FORMAT_UNKNOWN,
+          DXGI_FORMAT_UNKNOWN,
+          DXGI_FORMAT_UNKNOWN,
       }),
       f({
           DXGI_FORMAT_UNKNOWN,
           DXGI_FORMAT_UNKNOWN,
           DXGI_FORMAT_UNKNOWN,
           DXGI_FORMAT_UNKNOWN,
           DXGI_FORMAT_UNKNOWN,
+          DXGI_FORMAT_UNKNOWN,
+          DXGI_FORMAT_UNKNOWN,
+          DXGI_FORMAT_UNKNOWN,
       }),
       f({
           DXGI_FORMAT_R8G8B8A8_UINT,
           DXGI_FORMAT_R8G8B8A8_SINT,
           DXGI_FORMAT_R16G16B16A16_UINT,
           DXGI_FORMAT_R16G16B16A16_SINT,
           DXGI_FORMAT_UNKNOWN,
+          DXGI_FORMAT_UNKNOWN,
+          DXGI_FORMAT_UNKNOWN,
+          DXGI_FORMAT_UNKNOWN,
       }),
   };
 

diff --git a/Source/Core/VideoBackends/D3D12/DX12VertexFormat.cpp b/Source/Core/VideoBackends/D3D12/DX12VertexFormat.cpp
@@ -17,31 +17,45 @@ static DXGI_FORMAT VarToDXGIFormat(ComponentFormat t, u32 components, bool integ
   static constexpr auto f = [](ComponentArray a) { return a; };  // Deduction helper
 
   // NOTE: 3-component formats are not valid.
-  static constexpr Common::EnumMap<ComponentArray, ComponentFormat::Float> float_type_lookup = {
-      f({DXGI_FORMAT_R8_UNORM, DXGI_FORMAT_R8G8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM,
-         DXGI_FORMAT_R8G8B8A8_UNORM}),  // UByte
-      f({DXGI_FORMAT_R8_SNORM, DXGI_FORMAT_R8G8_SNORM, DXGI_FORMAT_R8G8B8A8_SNORM,
-         DXGI_FORMAT_R8G8B8A8_SNORM}),  // Byte
-      f({DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_R16G16_UNORM, DXGI_FORMAT_R16G16B16A16_UNORM,
-         DXGI_FORMAT_R16G16B16A16_UNORM}),  // UShort
-      f({DXGI_FORMAT_R16_SNORM, DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16B16A16_SNORM,
-         DXGI_FORMAT_R16G16B16A16_SNORM}),  // Short
-      f({DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32B32_FLOAT,
-         DXGI_FORMAT_R32G32B32A32_FLOAT}),  // Float
-  };
-
-  static constexpr Common::EnumMap<ComponentArray, ComponentFormat::Float> integer_type_lookup = {
-      f({DXGI_FORMAT_R8_UINT, DXGI_FORMAT_R8G8_UINT, DXGI_FORMAT_R8G8B8A8_UINT,
-         DXGI_FORMAT_R8G8B8A8_UINT}),  // UByte
-      f({DXGI_FORMAT_R8_SINT, DXGI_FORMAT_R8G8_SINT, DXGI_FORMAT_R8G8B8A8_SINT,
-         DXGI_FORMAT_R8G8B8A8_SINT}),  // Byte
-      f({DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16B16A16_UINT,
-         DXGI_FORMAT_R16G16B16A16_UINT}),  // UShort
-      f({DXGI_FORMAT_R16_SINT, DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16B16A16_SINT,
-         DXGI_FORMAT_R16G16B16A16_SINT}),  // Short
-      f({DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32B32_FLOAT,
-         DXGI_FORMAT_R32G32B32A32_FLOAT}),  // Float
-  };
+  static constexpr Common::EnumMap<ComponentArray, ComponentFormat::InvalidFloat7>
+      float_type_lookup = {
+          f({DXGI_FORMAT_R8_UNORM, DXGI_FORMAT_R8G8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM,
+             DXGI_FORMAT_R8G8B8A8_UNORM}),  // UByte
+          f({DXGI_FORMAT_R8_SNORM, DXGI_FORMAT_R8G8_SNORM, DXGI_FORMAT_R8G8B8A8_SNORM,
+             DXGI_FORMAT_R8G8B8A8_SNORM}),  // Byte
+          f({DXGI_FORMAT_R16_UNORM, DXGI_FORMAT_R16G16_UNORM, DXGI_FORMAT_R16G16B16A16_UNORM,
+             DXGI_FORMAT_R16G16B16A16_UNORM}),  // UShort
+          f({DXGI_FORMAT_R16_SNORM, DXGI_FORMAT_R16G16_SNORM, DXGI_FORMAT_R16G16B16A16_SNORM,
+             DXGI_FORMAT_R16G16B16A16_SNORM}),  // Short
+          f({DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32B32_FLOAT,
+             DXGI_FORMAT_R32G32B32A32_FLOAT}),  // Float
+          f({DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32B32_FLOAT,
+             DXGI_FORMAT_R32G32B32A32_FLOAT}),  // Invalid
+          f({DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32B32_FLOAT,
+             DXGI_FORMAT_R32G32B32A32_FLOAT}),  // Invalid
+          f({DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32B32_FLOAT,
+             DXGI_FORMAT_R32G32B32A32_FLOAT}),  // Invalid
+      };
+
+  static constexpr Common::EnumMap<ComponentArray, ComponentFormat::InvalidFloat7>
+      integer_type_lookup = {
+          f({DXGI_FORMAT_R8_UINT, DXGI_FORMAT_R8G8_UINT, DXGI_FORMAT_R8G8B8A8_UINT,
+             DXGI_FORMAT_R8G8B8A8_UINT}),  // UByte
+          f({DXGI_FORMAT_R8_SINT, DXGI_FORMAT_R8G8_SINT, DXGI_FORMAT_R8G8B8A8_SINT,
+             DXGI_FORMAT_R8G8B8A8_SINT}),  // Byte
+          f({DXGI_FORMAT_R16_UINT, DXGI_FORMAT_R16G16_UINT, DXGI_FORMAT_R16G16B16A16_UINT,
+             DXGI_FORMAT_R16G16B16A16_UINT}),  // UShort
+          f({DXGI_FORMAT_R16_SINT, DXGI_FORMAT_R16G16_SINT, DXGI_FORMAT_R16G16B16A16_SINT,
+             DXGI_FORMAT_R16G16B16A16_SINT}),  // Short
+          f({DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32B32_FLOAT,
+             DXGI_FORMAT_R32G32B32A32_FLOAT}),  // Float
+          f({DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32B32_FLOAT,
+             DXGI_FORMAT_R32G32B32A32_FLOAT}),  // Invalid
+          f({DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32B32_FLOAT,
+             DXGI_FORMAT_R32G32B32A32_FLOAT}),  // Invalid
+          f({DXGI_FORMAT_R32_FLOAT, DXGI_FORMAT_R32G32_FLOAT, DXGI_FORMAT_R32G32B32_FLOAT,
+             DXGI_FORMAT_R32G32B32A32_FLOAT}),  // Invalid
+      };
 
   ASSERT(components > 0 && components <= 4);
   return integer ? integer_type_lookup[t][components - 1] : float_type_lookup[t][components - 1];

diff --git a/Source/Core/VideoBackends/Metal/MTLVertexFormat.mm b/Source/Core/VideoBackends/Metal/MTLVertexFormat.mm
@@ -49,6 +49,9 @@ static MTLVertexFormat ConvertFormat(ComponentFormat format, int count, bool int
       default: return MTLVertexFormatInvalid;
       }
     case ComponentFormat::Float:
+    case ComponentFormat::InvalidFloat5:
+    case ComponentFormat::InvalidFloat6:
+    case ComponentFormat::InvalidFloat7:
       switch (count)
       {
       case 1: return MTLVertexFormatFloat;
@@ -100,6 +103,9 @@ static MTLVertexFormat ConvertFormat(ComponentFormat format, int count, bool int
       default: return MTLVertexFormatInvalid;
       }
     case ComponentFormat::Float:
+    case ComponentFormat::InvalidFloat5:
+    case ComponentFormat::InvalidFloat6:
+    case ComponentFormat::InvalidFloat7:
       switch (count)
       {
       case 1: return MTLVertexFormatFloat;

diff --git a/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp
@@ -26,8 +26,9 @@ OGLGfx::CreateNativeVertexFormat(const PortableVertexDeclaration& vtx_decl)
 
 static inline GLuint VarToGL(ComponentFormat t)
 {
-  static constexpr Common::EnumMap<GLuint, ComponentFormat::Float> lookup = {
-      GL_UNSIGNED_BYTE, GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_FLOAT,
+  static constexpr Common::EnumMap<GLuint, ComponentFormat::InvalidFloat7> lookup = {
+      GL_UNSIGNED_BYTE, GL_BYTE,  GL_UNSIGNED_SHORT, GL_SHORT,
+      GL_FLOAT,         GL_FLOAT, GL_FLOAT,          GL_FLOAT,
   };
   return lookup[t];
 }

diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp
@@ -149,11 +149,14 @@ static void ReadVertexAttribute(T* dst, DataReader src, const AttributeFormat& f
         dst[i_dst] = ReadNormalized<T, s16>(src.Read<s16, swap>());
         break;
       case ComponentFormat::Float:
+      case ComponentFormat::InvalidFloat5:
+      case ComponentFormat::InvalidFloat6:
+      case ComponentFormat::InvalidFloat7:
         dst[i_dst] = ReadNormalized<T, float>(src.Read<float, swap>());
         break;
       }
 
-      ASSERT_MSG(VIDEO, !format.integer || format.type != ComponentFormat::Float,
+      ASSERT_MSG(VIDEO, !format.integer || (format.type < ComponentFormat::Float),
                  "only non-float values are allowed to be streamed as integer");
     }
     for (; i < components; i++)

diff --git a/Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp b/Source/Core/VideoBackends/Vulkan/VKVertexFormat.cpp
@@ -19,31 +19,45 @@ static VkFormat VarToVkFormat(ComponentFormat t, uint32_t components, bool integ
   using ComponentArray = std::array<VkFormat, 4>;
   static constexpr auto f = [](ComponentArray a) { return a; };  // Deduction helper
 
-  static constexpr Common::EnumMap<ComponentArray, ComponentFormat::Float> float_type_lookup = {
-      f({VK_FORMAT_R8_UNORM, VK_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8B8_UNORM,
-         VK_FORMAT_R8G8B8A8_UNORM}),  // UByte
-      f({VK_FORMAT_R8_SNORM, VK_FORMAT_R8G8_SNORM, VK_FORMAT_R8G8B8_SNORM,
-         VK_FORMAT_R8G8B8A8_SNORM}),  // Byte
-      f({VK_FORMAT_R16_UNORM, VK_FORMAT_R16G16_UNORM, VK_FORMAT_R16G16B16_UNORM,
-         VK_FORMAT_R16G16B16A16_UNORM}),  // UShort
-      f({VK_FORMAT_R16_SNORM, VK_FORMAT_R16G16_SNORM, VK_FORMAT_R16G16B16_SNORM,
-         VK_FORMAT_R16G16B16A16_SNORM}),  // Short
-      f({VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32B32_SFLOAT,
-         VK_FORMAT_R32G32B32A32_SFLOAT}),  // Float
-  };
-
-  static constexpr Common::EnumMap<ComponentArray, ComponentFormat::Float> integer_type_lookup = {
-      f({VK_FORMAT_R8_UINT, VK_FORMAT_R8G8_UINT, VK_FORMAT_R8G8B8_UINT,
-         VK_FORMAT_R8G8B8A8_UINT}),  // UByte
-      f({VK_FORMAT_R8_SINT, VK_FORMAT_R8G8_SINT, VK_FORMAT_R8G8B8_SINT,
-         VK_FORMAT_R8G8B8A8_SINT}),  // Byte
-      f({VK_FORMAT_R16_UINT, VK_FORMAT_R16G16_UINT, VK_FORMAT_R16G16B16_UINT,
-         VK_FORMAT_R16G16B16A16_UINT}),  // UShort
-      f({VK_FORMAT_R16_SINT, VK_FORMAT_R16G16_SINT, VK_FORMAT_R16G16B16_SINT,
-         VK_FORMAT_R16G16B16A16_SINT}),  // Short
-      f({VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32B32_SFLOAT,
-         VK_FORMAT_R32G32B32A32_SFLOAT}),  // Float
-  };
+  static constexpr Common::EnumMap<ComponentArray, ComponentFormat::InvalidFloat7>
+      float_type_lookup = {
+          f({VK_FORMAT_R8_UNORM, VK_FORMAT_R8G8_UNORM, VK_FORMAT_R8G8B8_UNORM,
+             VK_FORMAT_R8G8B8A8_UNORM}),  // UByte
+          f({VK_FORMAT_R8_SNORM, VK_FORMAT_R8G8_SNORM, VK_FORMAT_R8G8B8_SNORM,
+             VK_FORMAT_R8G8B8A8_SNORM}),  // Byte
+          f({VK_FORMAT_R16_UNORM, VK_FORMAT_R16G16_UNORM, VK_FORMAT_R16G16B16_UNORM,
+             VK_FORMAT_R16G16B16A16_UNORM}),  // UShort
+          f({VK_FORMAT_R16_SNORM, VK_FORMAT_R16G16_SNORM, VK_FORMAT_R16G16B16_SNORM,
+             VK_FORMAT_R16G16B16A16_SNORM}),  // Short
+          f({VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32B32_SFLOAT,
+             VK_FORMAT_R32G32B32A32_SFLOAT}),  // Float
+          f({VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32B32_SFLOAT,
+             VK_FORMAT_R32G32B32A32_SFLOAT}),  // Invalid
+          f({VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32B32_SFLOAT,
+             VK_FORMAT_R32G32B32A32_SFLOAT}),  // Invalid
+          f({VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32B32_SFLOAT,
+             VK_FORMAT_R32G32B32A32_SFLOAT}),  // Invalid
+      };
+
+  static constexpr Common::EnumMap<ComponentArray, ComponentFormat::InvalidFloat7>
+      integer_type_lookup = {
+          f({VK_FORMAT_R8_UINT, VK_FORMAT_R8G8_UINT, VK_FORMAT_R8G8B8_UINT,
+             VK_FORMAT_R8G8B8A8_UINT}),  // UByte
+          f({VK_FORMAT_R8_SINT, VK_FORMAT_R8G8_SINT, VK_FORMAT_R8G8B8_SINT,
+             VK_FORMAT_R8G8B8A8_SINT}),  // Byte
+          f({VK_FORMAT_R16_UINT, VK_FORMAT_R16G16_UINT, VK_FORMAT_R16G16B16_UINT,
+             VK_FORMAT_R16G16B16A16_UINT}),  // UShort
+          f({VK_FORMAT_R16_SINT, VK_FORMAT_R16G16_SINT, VK_FORMAT_R16G16B16_SINT,
+             VK_FORMAT_R16G16B16A16_SINT}),  // Short
+          f({VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32B32_SFLOAT,
+             VK_FORMAT_R32G32B32A32_SFLOAT}),  // Float
+          f({VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32B32_SFLOAT,
+             VK_FORMAT_R32G32B32A32_SFLOAT}),  // Invalid
+          f({VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32B32_SFLOAT,
+             VK_FORMAT_R32G32B32A32_SFLOAT}),  // Invalid
+          f({VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32G32_SFLOAT, VK_FORMAT_R32G32B32_SFLOAT,
+             VK_FORMAT_R32G32B32A32_SFLOAT}),  // Invalid
+      };
 
   ASSERT(components > 0 && components <= 4);
   return integer ? integer_type_lookup[t][components - 1] : float_type_lookup[t][components - 1];

diff --git a/Source/Core/VideoCommon/CPMemory.h b/Source/Core/VideoCommon/CPMemory.h
@@ -122,7 +122,16 @@ enum class ComponentFormat
   UShort = 2,  // Invalid for normals
   Short = 3,
   Float = 4,
-};
+  // Known to be used by Fifa Street and Def Jam: Fight for New York
+  // See https://bugs.dolphin-emu.org/issues/12719
+  // Assumed to behave the same as float, but further testing is needed
+  InvalidFloat5 = 5,
+  // Not known to be used
+  InvalidFloat6 = 6,
+  InvalidFloat7 = 7,
+};
+// NOTE: don't include the invalid formats here, so that EnumFormatter marks them as invalid
+// (EnumFormatter also handles bounds-checking).
 template <>
 struct fmt::formatter<ComponentFormat> : EnumFormatter<ComponentFormat::Float>
 {
@@ -141,6 +150,9 @@ constexpr u32 GetElementSize(ComponentFormat format)
   case ComponentFormat::Short:
     return 2;
   case ComponentFormat::Float:
+  case ComponentFormat::InvalidFloat5:
+  case ComponentFormat::InvalidFloat6:
+  case ComponentFormat::InvalidFloat7:
     return 4;
   default:
     PanicAlertFmt("Unknown format {}", format);

diff --git a/Source/Core/VideoCommon/VertexLoaderARM64.cpp b/Source/Core/VideoCommon/VertexLoaderARM64.cpp
@@ -116,7 +116,7 @@ void VertexLoaderARM64::ReadVertex(VertexComponentFormat attribute, ComponentFor
 
   m_float_emit.LDUR(load_size, coords, reg, offset);
 
-  if (format != ComponentFormat::Float)
+  if (format < ComponentFormat::Float)
   {
     // Extend and convert to float
     switch (format)
@@ -394,8 +394,8 @@ void VertexLoaderARM64::GenerateVertexLoader()
 
   if (m_VtxDesc.low.Normal != VertexComponentFormat::NotPresent)
   {
-    static constexpr Common::EnumMap<u8, static_cast<ComponentFormat>(7)> SCALE_MAP = {7, 6, 15, 14,
-                                                                                       0, 0, 0,  0};
+    static constexpr Common::EnumMap<u8, ComponentFormat::InvalidFloat7> SCALE_MAP = {7, 6, 15, 14,
+                                                                                      0, 0, 0,  0};
     const u8 scaling_exponent = SCALE_MAP[m_VtxAttr.g0.NormalFormat];
 
     // Normal