1 files changed, 15 insertions, 8 deletions
diff --git a/src/video_core/vertex_loader.h b/src/video_core/vertex_loader.h
index becf5a403..ac162c254 100644
--- a/src/video_core/vertex_loader.h
+++ b/src/video_core/vertex_loader.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "common/common_types.h"
+#include <array>
 
+#include "common/common_types.h"
 #include "video_core/pica.h"
 
 namespace Pica {
@@ -11,23 +12,29 @@ class MemoryAccessTracker;
 }
 
 namespace Shader {
-class InputVertex;
+struct InputVertex;
 }
 
 class VertexLoader {
 public:
+    VertexLoader() = default;
+    explicit VertexLoader(const Pica::Regs& regs) {
+        Setup(regs);
+    }
+
     void Setup(const Pica::Regs& regs);
     void LoadVertex(u32 base_address, int index, int vertex, Shader::InputVertex& input, DebugUtils::MemoryAccessTracker& memory_accesses);
 
     int GetNumTotalAttributes() const { return num_total_attributes; }
 
 private:
-    u32 vertex_attribute_sources[16];
-    u32 vertex_attribute_strides[16] = {};
-    Regs::VertexAttributeFormat vertex_attribute_formats[16] = {};
-    u32 vertex_attribute_elements[16] = {};
-    bool vertex_attribute_is_default[16];
-    int num_total_attributes;
+    std::array<u32, 16> vertex_attribute_sources;
+    std::array<u32, 16> vertex_attribute_strides{};
+    std::array<Regs::VertexAttributeFormat, 16> vertex_attribute_formats;
+    std::array<u32, 16> vertex_attribute_elements{};
+    std::array<bool, 16> vertex_attribute_is_default;
+    int num_total_attributes = 0;
+    bool is_setup = false;
 };
 
 }  // namespace Pica