VertexLoader: Inline GetSize

8 files changed, 302 insertions, 223 deletions

diff --git a/Source/Core/VideoCommon/VertexLoader_Color.cpp b/Source/Core/VideoCommon/VertexLoader_Color.cpp
index b41272cbf1..05a50d9660 100644
--- a/Source/Core/VideoCommon/VertexLoader_Color.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_Color.cpp
@@ -205,24 +205,8 @@ constexpr Table<TPipelineFunction> s_table_read_color = {
        Color_ReadIndex_32b_8888<u16>}),
 };
 
-constexpr Table<u32> s_table_read_color_vertex_size = {
-    g({0u, 0u, 0u, 0u, 0u, 0u}),
-    g({2u, 3u, 4u, 2u, 3u, 4u}),
-    g({1u, 1u, 1u, 1u, 1u, 1u}),
-    g({2u, 2u, 2u, 2u, 2u, 2u}),
-};
 }  // Anonymous namespace
 
-u32 VertexLoader_Color::GetSize(VertexComponentFormat type, ColorFormat format)
-{
-  if (format > ColorFormat::RGBA8888)
-  {
-    PanicAlertFmt("Invalid color format {}", format);
-    return 0;
-  }
-  return s_table_read_color_vertex_size[type][format];
-}
-
 TPipelineFunction VertexLoader_Color::GetFunction(VertexComponentFormat type, ColorFormat format)
 {
   if (format > ColorFormat::RGBA8888)
diff --git a/Source/Core/VideoCommon/VertexLoader_Color.h b/Source/Core/VideoCommon/VertexLoader_Color.h
index a3c631ff1f..0e66bfbf86 100644
--- a/Source/Core/VideoCommon/VertexLoader_Color.h
+++ b/Source/Core/VideoCommon/VertexLoader_Color.h
@@ -4,14 +4,44 @@
 #pragma once
 
 #include "Common/CommonTypes.h"
-#include "VideoCommon/VertexLoader.h"
+#include "Common/EnumMap.h"
+#include "Common/Inline.h"
 
-enum class VertexComponentFormat;
-enum class ColorFormat;
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/VertexLoader.h"
 
 class VertexLoader_Color
 {
 public:
-  static u32 GetSize(VertexComponentFormat type, ColorFormat format);
+  static DOLPHIN_FORCE_INLINE u32 GetSize(VertexComponentFormat type, ColorFormat format)
+  {
+    if (format > ColorFormat::RGBA8888)
+    {
+      PanicAlertFmt("Invalid color format {}", format);
+      return 0;
+    }
+    return s_table_size[type][format];
+  }
+
   static TPipelineFunction GetFunction(VertexComponentFormat type, ColorFormat format);
+
+private:
+  template <typename T, auto last_member>
+  using EnumMap = typename Common::EnumMap<T, last_member>;
+
+  using SizeTable = EnumMap<EnumMap<u32, ColorFormat::RGBA8888>, VertexComponentFormat::Index16>;
+
+  static constexpr SizeTable s_table_size = []() consteval
+  {
+    SizeTable table{};
+
+    using VCF = VertexComponentFormat;
+
+    table[VCF::Direct] = {2u, 3u, 4u, 2u, 3u, 4u};
+    table[VCF::Index8] = {1u, 1u, 1u, 1u, 1u, 1u};
+    table[VCF::Index16] = {2u, 2u, 2u, 2u, 2u, 2u};
+
+    return table;
+  }
+  ();
 };
diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.cpp b/Source/Core/VideoCommon/VertexLoader_Normal.cpp
index 6813e4128c..3b685e0ca4 100644
--- a/Source/Core/VideoCommon/VertexLoader_Normal.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_Normal.cpp
@@ -63,20 +63,15 @@ void ReadIndirect(VertexLoader* loader, const T* data)
 }
 
 template <typename T, u32 N>
-struct Normal_Direct
+void Normal_ReadDirect(VertexLoader* loader)
 {
-  static void function(VertexLoader* loader)
-  {
-    const auto source = reinterpret_cast<const T*>(DataGetPosition());
-    ReadIndirect<T, N * 3>(loader, source);
-    DataSkip<N * 3 * sizeof(T)>();
-  }
-
-  static constexpr u32 size = sizeof(T) * N * 3;
-};
+  const auto source = reinterpret_cast<const T*>(DataGetPosition());
+  ReadIndirect<T, N * 3>(loader, source);
+  DataSkip<N * 3 * sizeof(T)>();
+}
 
 template <typename I, typename T, u32 N, u32 Offset>
-void Normal_Index_Offset(VertexLoader* loader)
+void Normal_ReadIndex_Offset(VertexLoader* loader)
 {
   static_assert(std::is_unsigned_v<I>, "Only unsigned I is sane!");
 
@@ -88,46 +83,26 @@ void Normal_Index_Offset(VertexLoader* loader)
 }
 
 template <typename I, typename T, u32 N>
-struct Normal_Index
+void Normal_ReadIndex(VertexLoader* loader)
 {
-  static void function(VertexLoader* loader) { Normal_Index_Offset<I, T, N, 0>(loader); }
-  static constexpr u32 size = sizeof(I);
-};
+  Normal_ReadIndex_Offset<I, T, N, 0>(loader);
+}
 
 template <typename I, typename T>
-struct Normal_Index_Indices3
+void Normal_ReadIndex_Indices3(VertexLoader* loader)
 {
-  static void function(VertexLoader* loader)
-  {
-    Normal_Index_Offset<I, T, 1, 0>(loader);
-    Normal_Index_Offset<I, T, 1, 1>(loader);
-    Normal_Index_Offset<I, T, 1, 2>(loader);
-  }
-
-  static constexpr u32 size = sizeof(I) * 3;
-};
-
-struct Set
-{
-  template <typename T>
-  constexpr Set& operator=(const T&)
-  {
-    gc_size = T::size;
-    function = T::function;
-    return *this;
-  }
-
-  u32 gc_size;
-  TPipelineFunction function;
-};
+  Normal_ReadIndex_Offset<I, T, 1, 0>(loader);
+  Normal_ReadIndex_Offset<I, T, 1, 1>(loader);
+  Normal_ReadIndex_Offset<I, T, 1, 2>(loader);
+}
 
 using Common::EnumMap;
-using Formats = EnumMap<Set, ComponentFormat::Float>;
+using Formats = EnumMap<TPipelineFunction, ComponentFormat::Float>;
 using Elements = EnumMap<Formats, NormalComponentCount::NTB>;
 using Indices = std::array<Elements, 2>;
 using Types = EnumMap<Indices, VertexComponentFormat::Index16>;
 
-constexpr Types InitializeTable()
+consteval Types InitializeTable()
 {
   Types table{};
 
@@ -135,90 +110,84 @@ constexpr Types InitializeTable()
   using NCC = NormalComponentCount;
   using FMT = ComponentFormat;
 
-  table[VCF::Direct][false][NCC::N][FMT::UByte] = Normal_Direct<u8, 1>();
-  table[VCF::Direct][false][NCC::N][FMT::Byte] = Normal_Direct<s8, 1>();
-  table[VCF::Direct][false][NCC::N][FMT::UShort] = Normal_Direct<u16, 1>();
-  table[VCF::Direct][false][NCC::N][FMT::Short] = Normal_Direct<s16, 1>();
-  table[VCF::Direct][false][NCC::N][FMT::Float] = Normal_Direct<float, 1>();
-  table[VCF::Direct][false][NCC::NTB][FMT::UByte] = Normal_Direct<u8, 3>();
-  table[VCF::Direct][false][NCC::NTB][FMT::Byte] = Normal_Direct<s8, 3>();
-  table[VCF::Direct][false][NCC::NTB][FMT::UShort] = Normal_Direct<u16, 3>();
-  table[VCF::Direct][false][NCC::NTB][FMT::Short] = Normal_Direct<s16, 3>();
-  table[VCF::Direct][false][NCC::NTB][FMT::Float] = Normal_Direct<float, 3>();
+  table[VCF::Direct][false][NCC::N][FMT::UByte] = Normal_ReadDirect<u8, 1>;
+  table[VCF::Direct][false][NCC::N][FMT::Byte] = Normal_ReadDirect<s8, 1>;
+  table[VCF::Direct][false][NCC::N][FMT::UShort] = Normal_ReadDirect<u16, 1>;
+  table[VCF::Direct][false][NCC::N][FMT::Short] = Normal_ReadDirect<s16, 1>;
+  table[VCF::Direct][false][NCC::N][FMT::Float] = Normal_ReadDirect<float, 1>;
+  table[VCF::Direct][false][NCC::NTB][FMT::UByte] = Normal_ReadDirect<u8, 3>;
+  table[VCF::Direct][false][NCC::NTB][FMT::Byte] = Normal_ReadDirect<s8, 3>;
+  table[VCF::Direct][false][NCC::NTB][FMT::UShort] = Normal_ReadDirect<u16, 3>;
+  table[VCF::Direct][false][NCC::NTB][FMT::Short] = Normal_ReadDirect<s16, 3>;
+  table[VCF::Direct][false][NCC::NTB][FMT::Float] = Normal_ReadDirect<float, 3>;
 
   // Same as above, since there are no indices
-  table[VCF::Direct][true][NCC::N][FMT::UByte] = Normal_Direct<u8, 1>();
-  table[VCF::Direct][true][NCC::N][FMT::Byte] = Normal_Direct<s8, 1>();
-  table[VCF::Direct][true][NCC::N][FMT::UShort] = Normal_Direct<u16, 1>();
-  table[VCF::Direct][true][NCC::N][FMT::Short] = Normal_Direct<s16, 1>();
-  table[VCF::Direct][true][NCC::N][FMT::Float] = Normal_Direct<float, 1>();
-  table[VCF::Direct][true][NCC::NTB][FMT::UByte] = Normal_Direct<u8, 3>();
-  table[VCF::Direct][true][NCC::NTB][FMT::Byte] = Normal_Direct<s8, 3>();
-  table[VCF::Direct][true][NCC::NTB][FMT::UShort] = Normal_Direct<u16, 3>();
-  table[VCF::Direct][true][NCC::NTB][FMT::Short] = Normal_Direct<s16, 3>();
-  table[VCF::Direct][true][NCC::NTB][FMT::Float] = Normal_Direct<float, 3>();
-
-  table[VCF::Index8][false][NCC::N][FMT::UByte] = Normal_Index<u8, u8, 1>();
-  table[VCF::Index8][false][NCC::N][FMT::Byte] = Normal_Index<u8, s8, 1>();
-  table[VCF::Index8][false][NCC::N][FMT::UShort] = Normal_Index<u8, u16, 1>();
-  table[VCF::Index8][false][NCC::N][FMT::Short] = Normal_Index<u8, s16, 1>();
-  table[VCF::Index8][false][NCC::N][FMT::Float] = Normal_Index<u8, float, 1>();
-  table[VCF::Index8][false][NCC::NTB][FMT::UByte] = Normal_Index<u8, u8, 3>();
-  table[VCF::Index8][false][NCC::NTB][FMT::Byte] = Normal_Index<u8, s8, 3>();
-  table[VCF::Index8][false][NCC::NTB][FMT::UShort] = Normal_Index<u8, u16, 3>();
-  table[VCF::Index8][false][NCC::NTB][FMT::Short] = Normal_Index<u8, s16, 3>();
-  table[VCF::Index8][false][NCC::NTB][FMT::Float] = Normal_Index<u8, float, 3>();
+  table[VCF::Direct][true][NCC::N][FMT::UByte] = Normal_ReadDirect<u8, 1>;
+  table[VCF::Direct][true][NCC::N][FMT::Byte] = Normal_ReadDirect<s8, 1>;
+  table[VCF::Direct][true][NCC::N][FMT::UShort] = Normal_ReadDirect<u16, 1>;
+  table[VCF::Direct][true][NCC::N][FMT::Short] = Normal_ReadDirect<s16, 1>;
+  table[VCF::Direct][true][NCC::N][FMT::Float] = Normal_ReadDirect<float, 1>;
+  table[VCF::Direct][true][NCC::NTB][FMT::UByte] = Normal_ReadDirect<u8, 3>;
+  table[VCF::Direct][true][NCC::NTB][FMT::Byte] = Normal_ReadDirect<s8, 3>;
+  table[VCF::Direct][true][NCC::NTB][FMT::UShort] = Normal_ReadDirect<u16, 3>;
+  table[VCF::Direct][true][NCC::NTB][FMT::Short] = Normal_ReadDirect<s16, 3>;
+  table[VCF::Direct][true][NCC::NTB][FMT::Float] = Normal_ReadDirect<float, 3>;
+
+  table[VCF::Index8][false][NCC::N][FMT::UByte] = Normal_ReadIndex<u8, u8, 1>;
+  table[VCF::Index8][false][NCC::N][FMT::Byte] = Normal_ReadIndex<u8, s8, 1>;
+  table[VCF::Index8][false][NCC::N][FMT::UShort] = Normal_ReadIndex<u8, u16, 1>;
+  table[VCF::Index8][false][NCC::N][FMT::Short] = Normal_ReadIndex<u8, s16, 1>;
+  table[VCF::Index8][false][NCC::N][FMT::Float] = Normal_ReadIndex<u8, float, 1>;
+  table[VCF::Index8][false][NCC::NTB][FMT::UByte] = Normal_ReadIndex<u8, u8, 3>;
+  table[VCF::Index8][false][NCC::NTB][FMT::Byte] = Normal_ReadIndex<u8, s8, 3>;
+  table[VCF::Index8][false][NCC::NTB][FMT::UShort] = Normal_ReadIndex<u8, u16, 3>;
+  table[VCF::Index8][false][NCC::NTB][FMT::Short] = Normal_ReadIndex<u8, s16, 3>;
+  table[VCF::Index8][false][NCC::NTB][FMT::Float] = Normal_ReadIndex<u8, float, 3>;
 
   // Same for NormalComponentCount::N; differs for NTB
-  table[VCF::Index8][true][NCC::N][FMT::UByte] = Normal_Index<u8, u8, 1>();
-  table[VCF::Index8][true][NCC::N][FMT::Byte] = Normal_Index<u8, s8, 1>();
-  table[VCF::Index8][true][NCC::N][FMT::UShort] = Normal_Index<u8, u16, 1>();
-  table[VCF::Index8][true][NCC::N][FMT::Short] = Normal_Index<u8, s16, 1>();
-  table[VCF::Index8][true][NCC::N][FMT::Float] = Normal_Index<u8, float, 1>();
-  table[VCF::Index8][true][NCC::NTB][FMT::UByte] = Normal_Index_Indices3<u8, u8>();
-  table[VCF::Index8][true][NCC::NTB][FMT::Byte] = Normal_Index_Indices3<u8, s8>();
-  table[VCF::Index8][true][NCC::NTB][FMT::UShort] = Normal_Index_Indices3<u8, u16>();
-  table[VCF::Index8][true][NCC::NTB][FMT::Short] = Normal_Index_Indices3<u8, s16>();
-  table[VCF::Index8][true][NCC::NTB][FMT::Float] = Normal_Index_Indices3<u8, float>();
-
-  table[VCF::Index16][false][NCC::N][FMT::UByte] = Normal_Index<u16, u8, 1>();
-  table[VCF::Index16][false][NCC::N][FMT::Byte] = Normal_Index<u16, s8, 1>();
-  table[VCF::Index16][false][NCC::N][FMT::UShort] = Normal_Index<u16, u16, 1>();
-  table[VCF::Index16][false][NCC::N][FMT::Short] = Normal_Index<u16, s16, 1>();
-  table[VCF::Index16][false][NCC::N][FMT::Float] = Normal_Index<u16, float, 1>();
-  table[VCF::Index16][false][NCC::NTB][FMT::UByte] = Normal_Index<u16, u8, 3>();
-  table[VCF::Index16][false][NCC::NTB][FMT::Byte] = Normal_Index<u16, s8, 3>();
-  table[VCF::Index16][false][NCC::NTB][FMT::UShort] = Normal_Index<u16, u16, 3>();
-  table[VCF::Index16][false][NCC::NTB][FMT::Short] = Normal_Index<u16, s16, 3>();
-  table[VCF::Index16][false][NCC::NTB][FMT::Float] = Normal_Index<u16, float, 3>();
+  table[VCF::Index8][true][NCC::N][FMT::UByte] = Normal_ReadIndex<u8, u8, 1>;
+  table[VCF::Index8][true][NCC::N][FMT::Byte] = Normal_ReadIndex<u8, s8, 1>;
+  table[VCF::Index8][true][NCC::N][FMT::UShort] = Normal_ReadIndex<u8, u16, 1>;
+  table[VCF::Index8][true][NCC::N][FMT::Short] = Normal_ReadIndex<u8, s16, 1>;
+  table[VCF::Index8][true][NCC::N][FMT::Float] = Normal_ReadIndex<u8, float, 1>;
+  table[VCF::Index8][true][NCC::NTB][FMT::UByte] = Normal_ReadIndex_Indices3<u8, u8>;
+  table[VCF::Index8][true][NCC::NTB][FMT::Byte] = Normal_ReadIndex_Indices3<u8, s8>;
+  table[VCF::Index8][true][NCC::NTB][FMT::UShort] = Normal_ReadIndex_Indices3<u8, u16>;
+  table[VCF::Index8][true][NCC::NTB][FMT::Short] = Normal_ReadIndex_Indices3<u8, s16>;
+  table[VCF::Index8][true][NCC::NTB][FMT::Float] = Normal_ReadIndex_Indices3<u8, float>;
+
+  table[VCF::Index16][false][NCC::N][FMT::UByte] = Normal_ReadIndex<u16, u8, 1>;
+  table[VCF::Index16][false][NCC::N][FMT::Byte] = Normal_ReadIndex<u16, s8, 1>;
+  table[VCF::Index16][false][NCC::N][FMT::UShort] = Normal_ReadIndex<u16, u16, 1>;
+  table[VCF::Index16][false][NCC::N][FMT::Short] = Normal_ReadIndex<u16, s16, 1>;
+  table[VCF::Index16][false][NCC::N][FMT::Float] = Normal_ReadIndex<u16, float, 1>;
+  table[VCF::Index16][false][NCC::NTB][FMT::UByte] = Normal_ReadIndex<u16, u8, 3>;
+  table[VCF::Index16][false][NCC::NTB][FMT::Byte] = Normal_ReadIndex<u16, s8, 3>;
+  table[VCF::Index16][false][NCC::NTB][FMT::UShort] = Normal_ReadIndex<u16, u16, 3>;
+  table[VCF::Index16][false][NCC::NTB][FMT::Short] = Normal_ReadIndex<u16, s16, 3>;
+  table[VCF::Index16][false][NCC::NTB][FMT::Float] = Normal_ReadIndex<u16, float, 3>;
 
   // Same for NormalComponentCount::N; differs for NTB
-  table[VCF::Index16][true][NCC::N][FMT::UByte] = Normal_Index<u16, u8, 1>();
-  table[VCF::Index16][true][NCC::N][FMT::Byte] = Normal_Index<u16, s8, 1>();
-  table[VCF::Index16][true][NCC::N][FMT::UShort] = Normal_Index<u16, u16, 1>();
-  table[VCF::Index16][true][NCC::N][FMT::Short] = Normal_Index<u16, s16, 1>();
-  table[VCF::Index16][true][NCC::N][FMT::Float] = Normal_Index<u16, float, 1>();
-  table[VCF::Index16][true][NCC::NTB][FMT::UByte] = Normal_Index_Indices3<u16, u8>();
-  table[VCF::Index16][true][NCC::NTB][FMT::Byte] = Normal_Index_Indices3<u16, s8>();
-  table[VCF::Index16][true][NCC::NTB][FMT::UShort] = Normal_Index_Indices3<u16, u16>();
-  table[VCF::Index16][true][NCC::NTB][FMT::Short] = Normal_Index_Indices3<u16, s16>();
-  table[VCF::Index16][true][NCC::NTB][FMT::Float] = Normal_Index_Indices3<u16, float>();
+  table[VCF::Index16][true][NCC::N][FMT::UByte] = Normal_ReadIndex<u16, u8, 1>;
+  table[VCF::Index16][true][NCC::N][FMT::Byte] = Normal_ReadIndex<u16, s8, 1>;
+  table[VCF::Index16][true][NCC::N][FMT::UShort] = Normal_ReadIndex<u16, u16, 1>;
+  table[VCF::Index16][true][NCC::N][FMT::Short] = Normal_ReadIndex<u16, s16, 1>;
+  table[VCF::Index16][true][NCC::N][FMT::Float] = Normal_ReadIndex<u16, float, 1>;
+  table[VCF::Index16][true][NCC::NTB][FMT::UByte] = Normal_ReadIndex_Indices3<u16, u8>;
+  table[VCF::Index16][true][NCC::NTB][FMT::Byte] = Normal_ReadIndex_Indices3<u16, s8>;
+  table[VCF::Index16][true][NCC::NTB][FMT::UShort] = Normal_ReadIndex_Indices3<u16, u16>;
+  table[VCF::Index16][true][NCC::NTB][FMT::Short] = Normal_ReadIndex_Indices3<u16, s16>;
+  table[VCF::Index16][true][NCC::NTB][FMT::Float] = Normal_ReadIndex_Indices3<u16, float>;
 
   return table;
 }
 
-constexpr Types s_table = InitializeTable();
+constexpr Types s_table_read_normal = InitializeTable();
 }  // Anonymous namespace
 
-u32 VertexLoader_Normal::GetSize(VertexComponentFormat type, ComponentFormat format,
-                                 NormalComponentCount elements, bool index3)
-{
-  return s_table[type][index3][elements][format].gc_size;
-}
-
 TPipelineFunction VertexLoader_Normal::GetFunction(VertexComponentFormat type,
                                                    ComponentFormat format,
                                                    NormalComponentCount elements, bool index3)
 {
-  return s_table[type][index3][elements][format].function;
+  return s_table_read_normal[type][index3][elements][format];
 }
diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.h b/Source/Core/VideoCommon/VertexLoader_Normal.h
index 30674159fb..b5200dc875 100644
--- a/Source/Core/VideoCommon/VertexLoader_Normal.h
+++ b/Source/Core/VideoCommon/VertexLoader_Normal.h
@@ -4,18 +4,110 @@
 #pragma once
 
 #include "Common/CommonTypes.h"
-#include "VideoCommon/VertexLoader.h"
+#include "Common/EnumMap.h"
+#include "Common/Inline.h"
 
-enum class VertexComponentFormat;
-enum class ComponentFormat;
-enum class NormalComponentCount;
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/VertexLoader.h"
 
 class VertexLoader_Normal
 {
 public:
-  static u32 GetSize(VertexComponentFormat type, ComponentFormat format,
-                     NormalComponentCount elements, bool index3);
+  static DOLPHIN_FORCE_INLINE u32 GetSize(VertexComponentFormat type, ComponentFormat format,
+                                          NormalComponentCount elements, bool index3)
+  {
+    return s_table_size[type][index3][elements][format];
+  }
 
   static TPipelineFunction GetFunction(VertexComponentFormat type, ComponentFormat format,
                                        NormalComponentCount elements, bool index3);
+
+private:
+  template <typename T, auto last_member>
+  using EnumMap = typename Common::EnumMap<T, last_member>;
+
+  using SizeTable = EnumMap<
+      std::array<EnumMap<EnumMap<u32, ComponentFormat::Float>, NormalComponentCount::NTB>, 2>,
+      VertexComponentFormat::Index16>;
+
+  static constexpr SizeTable s_table_size = []() consteval
+  {
+    SizeTable table{};
+
+    using VCF = VertexComponentFormat;
+    using NCC = NormalComponentCount;
+    using FMT = ComponentFormat;
+
+    table[VCF::Direct][false][NCC::N][FMT::UByte] = 3;
+    table[VCF::Direct][false][NCC::N][FMT::Byte] = 3;
+    table[VCF::Direct][false][NCC::N][FMT::UShort] = 6;
+    table[VCF::Direct][false][NCC::N][FMT::Short] = 6;
+    table[VCF::Direct][false][NCC::N][FMT::Float] = 12;
+    table[VCF::Direct][false][NCC::NTB][FMT::UByte] = 9;
+    table[VCF::Direct][false][NCC::NTB][FMT::Byte] = 9;
+    table[VCF::Direct][false][NCC::NTB][FMT::UShort] = 18;
+    table[VCF::Direct][false][NCC::NTB][FMT::Short] = 18;
+    table[VCF::Direct][false][NCC::NTB][FMT::Float] = 36;
+
+    // Same as above, since there are no indices
+    table[VCF::Direct][true][NCC::N][FMT::UByte] = 3;
+    table[VCF::Direct][true][NCC::N][FMT::Byte] = 3;
+    table[VCF::Direct][true][NCC::N][FMT::UShort] = 6;
+    table[VCF::Direct][true][NCC::N][FMT::Short] = 6;
+    table[VCF::Direct][true][NCC::N][FMT::Float] = 12;
+    table[VCF::Direct][true][NCC::NTB][FMT::UByte] = 9;
+    table[VCF::Direct][true][NCC::NTB][FMT::Byte] = 9;
+    table[VCF::Direct][true][NCC::NTB][FMT::UShort] = 18;
+    table[VCF::Direct][true][NCC::NTB][FMT::Short] = 18;
+    table[VCF::Direct][true][NCC::NTB][FMT::Float] = 36;
+
+    table[VCF::Index8][false][NCC::N][FMT::UByte] = 1;
+    table[VCF::Index8][false][NCC::N][FMT::Byte] = 1;
+    table[VCF::Index8][false][NCC::N][FMT::UShort] = 1;
+    table[VCF::Index8][false][NCC::N][FMT::Short] = 1;
+    table[VCF::Index8][false][NCC::N][FMT::Float] = 1;
+    table[VCF::Index8][false][NCC::NTB][FMT::UByte] = 1;
+    table[VCF::Index8][false][NCC::NTB][FMT::Byte] = 1;
+    table[VCF::Index8][false][NCC::NTB][FMT::UShort] = 1;
+    table[VCF::Index8][false][NCC::NTB][FMT::Short] = 1;
+    table[VCF::Index8][false][NCC::NTB][FMT::Float] = 1;
+
+    // Same for NormalComponentCount::N; differs for NTB
+    table[VCF::Index8][true][NCC::N][FMT::UByte] = 1;
+    table[VCF::Index8][true][NCC::N][FMT::Byte] = 1;
+    table[VCF::Index8][true][NCC::N][FMT::UShort] = 1;
+    table[VCF::Index8][true][NCC::N][FMT::Short] = 1;
+    table[VCF::Index8][true][NCC::N][FMT::Float] = 1;
+    table[VCF::Index8][true][NCC::NTB][FMT::UByte] = 3;
+    table[VCF::Index8][true][NCC::NTB][FMT::Byte] = 3;
+    table[VCF::Index8][true][NCC::NTB][FMT::UShort] = 3;
+    table[VCF::Index8][true][NCC::NTB][FMT::Short] = 3;
+    table[VCF::Index8][true][NCC::NTB][FMT::Float] = 3;
+
+    table[VCF::Index16][false][NCC::N][FMT::UByte] = 2;
+    table[VCF::Index16][false][NCC::N][FMT::Byte] = 2;
+    table[VCF::Index16][false][NCC::N][FMT::UShort] = 2;
+    table[VCF::Index16][false][NCC::N][FMT::Short] = 2;
+    table[VCF::Index16][false][NCC::N][FMT::Float] = 2;
+    table[VCF::Index16][false][NCC::NTB][FMT::UByte] = 2;
+    table[VCF::Index16][false][NCC::NTB][FMT::Byte] = 2;
+    table[VCF::Index16][false][NCC::NTB][FMT::UShort] = 2;
+    table[VCF::Index16][false][NCC::NTB][FMT::Short] = 2;
+    table[VCF::Index16][false][NCC::NTB][FMT::Float] = 2;
+
+    // Same for NormalComponentCount::N; differs for NTB
+    table[VCF::Index16][true][NCC::N][FMT::UByte] = 2;
+    table[VCF::Index16][true][NCC::N][FMT::Byte] = 2;
+    table[VCF::Index16][true][NCC::N][FMT::UShort] = 2;
+    table[VCF::Index16][true][NCC::N][FMT::Short] = 2;
+    table[VCF::Index16][true][NCC::N][FMT::Float] = 2;
+    table[VCF::Index16][true][NCC::NTB][FMT::UByte] = 6;
+    table[VCF::Index16][true][NCC::NTB][FMT::Byte] = 6;
+    table[VCF::Index16][true][NCC::NTB][FMT::UShort] = 6;
+    table[VCF::Index16][true][NCC::NTB][FMT::Short] = 6;
+    table[VCF::Index16][true][NCC::NTB][FMT::Float] = 6;
+
+    return table;
+  }
+  ();
 };
diff --git a/Source/Core/VideoCommon/VertexLoader_Position.cpp b/Source/Core/VideoCommon/VertexLoader_Position.cpp
index 15d2f6d94e..a568518798 100644
--- a/Source/Core/VideoCommon/VertexLoader_Position.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_Position.cpp
@@ -138,45 +138,8 @@ constexpr Table<TPipelineFunction> s_table_read_position = {
         e(Pos_ReadIndex<u16, float, 2>, Pos_ReadIndex<u16, float, 3>),
     }),
 };
-
-constexpr Table<u32> s_table_read_position_vertex_size = {
-    g({
-        e(0u, 0u),
-        e(0u, 0u),
-        e(0u, 0u),
-        e(0u, 0u),
-        e(0u, 0u),
-    }),
-    g({
-        e(2, 3),
-        e(2, 3),
-        e(4, 6),
-        e(4, 6),
-        e(8, 12),
-    }),
-    g({
-        e(1, 1),
-        e(1, 1),
-        e(1, 1),
-        e(1, 1),
-        e(1, 1),
-    }),
-    g({
-        e(2, 2),
-        e(2, 2),
-        e(2, 2),
-        e(2, 2),
-        e(2, 2),
-    }),
-};
 }  // Anonymous namespace
 
-u32 VertexLoader_Position::GetSize(VertexComponentFormat type, ComponentFormat format,
-                                   CoordComponentCount elements)
-{
-  return s_table_read_position_vertex_size[type][format][elements];
-}
-
 TPipelineFunction VertexLoader_Position::GetFunction(VertexComponentFormat type,
                                                      ComponentFormat format,
                                                      CoordComponentCount elements)
diff --git a/Source/Core/VideoCommon/VertexLoader_Position.h b/Source/Core/VideoCommon/VertexLoader_Position.h
index 59bfe99da4..da095419fd 100644
--- a/Source/Core/VideoCommon/VertexLoader_Position.h
+++ b/Source/Core/VideoCommon/VertexLoader_Position.h
@@ -4,18 +4,57 @@
 #pragma once
 
 #include "Common/CommonTypes.h"
-#include "VideoCommon/VertexLoader.h"
+#include "Common/EnumMap.h"
+#include "Common/Inline.h"
 
-enum class VertexComponentFormat;
-enum class ComponentFormat;
-enum class CoordComponentCount;
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/VertexLoader.h"
 
 class VertexLoader_Position
 {
 public:
-  static u32 GetSize(VertexComponentFormat type, ComponentFormat format,
-                     CoordComponentCount elements);
+  static DOLPHIN_FORCE_INLINE u32 GetSize(VertexComponentFormat type, ComponentFormat format,
+                                          CoordComponentCount elements)
+  {
+    return s_table_size[type][format][elements];
+  }
 
   static TPipelineFunction GetFunction(VertexComponentFormat type, ComponentFormat format,
                                        CoordComponentCount elements);
+
+private:
+  template <typename T, auto last_member>
+  using EnumMap = typename Common::EnumMap<T, last_member>;
+
+  using SizeTable = EnumMap<EnumMap<EnumMap<u32, CoordComponentCount::XYZ>, ComponentFormat::Float>,
+                            VertexComponentFormat::Index16>;
+
+  static constexpr SizeTable s_table_size = []() consteval
+  {
+    SizeTable table{};
+
+    using VCF = VertexComponentFormat;
+    using FMT = ComponentFormat;
+
+    table[VCF::Direct][FMT::UByte] = {2, 3};
+    table[VCF::Direct][FMT::Byte] = {2, 3};
+    table[VCF::Direct][FMT::UShort] = {4, 6};
+    table[VCF::Direct][FMT::Short] = {4, 6};
+    table[VCF::Direct][FMT::Float] = {8, 12};
+
+    table[VCF::Index8][FMT::UByte] = {1, 1};
+    table[VCF::Index8][FMT::Byte] = {1, 1};
+    table[VCF::Index8][FMT::UShort] = {1, 1};
+    table[VCF::Index8][FMT::Short] = {1, 1};
+    table[VCF::Index8][FMT::Float] = {1, 1};
+
+    table[VCF::Index16][FMT::UByte] = {2, 2};
+    table[VCF::Index16][FMT::Byte] = {2, 2};
+    table[VCF::Index16][FMT::UShort] = {2, 2};
+    table[VCF::Index16][FMT::Short] = {2, 2};
+    table[VCF::Index16][FMT::Float] = {2, 2};
+
+    return table;
+  }
+  ();
 };
diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
index 89891df5a8..8b2bbf5560 100644
--- a/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
@@ -127,45 +127,8 @@ constexpr Table<TPipelineFunction> s_table_read_tex_coord = {
         e(TexCoord_ReadIndex<u16, float, 1>, TexCoord_ReadIndex<u16, float, 2>),
     }),
 };
-
-constexpr Table<u32> s_table_read_tex_coord_vertex_size = {
-    g({
-        e(0u, 0u),
-        e(0u, 0u),
-        e(0u, 0u),
-        e(0u, 0u),
-        e(0u, 0u),
-    }),
-    g({
-        e(1, 2),
-        e(1, 2),
-        e(2, 4),
-        e(2, 4),
-        e(4, 8),
-    }),
-    g({
-        e(1, 1),
-        e(1, 1),
-        e(1, 1),
-        e(1, 1),
-        e(1, 1),
-    }),
-    g({
-        e(2, 2),
-        e(2, 2),
-        e(2, 2),
-        e(2, 2),
-        e(2, 2),
-    }),
-};
 }  // Anonymous namespace
 
-u32 VertexLoader_TextCoord::GetSize(VertexComponentFormat type, ComponentFormat format,
-                                    TexComponentCount elements)
-{
-  return s_table_read_tex_coord_vertex_size[type][format][elements];
-}
-
 TPipelineFunction VertexLoader_TextCoord::GetFunction(VertexComponentFormat type,
                                                       ComponentFormat format,
                                                       TexComponentCount elements)
diff --git a/Source/Core/VideoCommon/VertexLoader_TextCoord.h b/Source/Core/VideoCommon/VertexLoader_TextCoord.h
index e2dac72021..9041185490 100644
--- a/Source/Core/VideoCommon/VertexLoader_TextCoord.h
+++ b/Source/Core/VideoCommon/VertexLoader_TextCoord.h
@@ -4,21 +4,60 @@
 #pragma once
 
 #include "Common/CommonTypes.h"
-#include "VideoCommon/VertexLoader.h"
+#include "Common/EnumMap.h"
+#include "Common/Inline.h"
 
-enum class VertexComponentFormat;
-enum class ComponentFormat;
-enum class TexComponentCount;
+#include "VideoCommon/CPMemory.h"
+#include "VideoCommon/VertexLoader.h"
 
 class VertexLoader_TextCoord
 {
 public:
-  static u32 GetSize(VertexComponentFormat type, ComponentFormat format,
-                     TexComponentCount elements);
+  static DOLPHIN_FORCE_INLINE u32 GetSize(VertexComponentFormat type, ComponentFormat format,
+                                          TexComponentCount elements)
+  {
+    return s_table_size[type][format][elements];
+  }
 
   static TPipelineFunction GetFunction(VertexComponentFormat type, ComponentFormat format,
                                        TexComponentCount elements);
 
   // It is important to synchronize tcIndex.
   static TPipelineFunction GetDummyFunction();
+
+private:
+  template <typename T, auto last_member>
+  using EnumMap = typename Common::EnumMap<T, last_member>;
+
+  using SizeTable = EnumMap<EnumMap<EnumMap<u32, TexComponentCount::ST>, ComponentFormat::Float>,
+                            VertexComponentFormat::Index16>;
+
+  static constexpr SizeTable s_table_size = []() consteval
+  {
+    SizeTable table{};
+
+    using VCF = VertexComponentFormat;
+    using FMT = ComponentFormat;
+
+    table[VCF::Direct][FMT::UByte] = {1, 2};
+    table[VCF::Direct][FMT::Byte] = {1, 2};
+    table[VCF::Direct][FMT::UShort] = {2, 4};
+    table[VCF::Direct][FMT::Short] = {2, 4};
+    table[VCF::Direct][FMT::Float] = {4, 8};
+
+    table[VCF::Index8][FMT::UByte] = {1, 1};
+    table[VCF::Index8][FMT::Byte] = {1, 1};
+    table[VCF::Index8][FMT::UShort] = {1, 1};
+    table[VCF::Index8][FMT::Short] = {1, 1};
+    table[VCF::Index8][FMT::Float] = {1, 1};
+
+    table[VCF::Index16][FMT::UByte] = {2, 2};
+    table[VCF::Index16][FMT::Byte] = {2, 2};
+    table[VCF::Index16][FMT::UShort] = {2, 2};
+    table[VCF::Index16][FMT::Short] = {2, 2};
+    table[VCF::Index16][FMT::Float] = {2, 2};
+
+    return table;
+  }
+  ();
 };