diff --git a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h
index 17f55697c4..8d55102ae6 100644
--- a/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h
+++ b/Source/Core/VideoCommon/GraphicsModSystem/Runtime/GraphicsModActionData.h
@@ -15,34 +15,20 @@
 #include "VideoCommon/AbstractGfx.h"
 #include "VideoCommon/Assets/TextureAsset.h"
 #include "VideoCommon/ConstantManager.h"
+#include "VideoCommon/GraphicsModSystem/Types.h"
 #include "VideoCommon/PixelShaderGen.h"
 
 namespace GraphicsModActionData
 {
-struct MeshChunk
-{
-  std::span<u8> vertex_data;
-  std::span<u16> index_data;
-  u32 vertex_stride;
-  NativeVertexFormat* vertex_format;
-  PrimitiveType primitive_type;
-  u32 components_available;
-  Common::Matrix44 transform;
-  CullMode cull_mode = CullMode::Front;
-};
 struct DrawStarted
 {
-  const Common::SmallVector<u32, 8>& texture_units;
-  const NativeVertexFormat& current_vertex_format;
-  std::span<const u8> original_mesh_data;
+  const GraphicsModSystem::DrawDataView& draw_data_view;
   u32 current_components_available;
   bool* skip;
-  std::optional<CustomPixelShader>* custom_pixel_shader;
-  std::span<u8>* material_uniform_buffer;
+  GraphicsModSystem::MaterialResource** material;
+  GraphicsModSystem::MeshResource** mesh;
+  bool* ignore_mesh_transform;
   std::optional<Common::Matrix44>* transform;
-  std::optional<MeshChunk>* mesh_chunk;
-  u32* current_mesh_index;
-  bool* more_data;
 };
 
 struct EFB