From cc411c4e415025d7bfe5c5be41b914850d39f2a1 Mon Sep 17 00:00:00 2001
From: Pokechu22 <Pokechu022@gmail.com>
Date: Sun, 12 Feb 2023 19:47:51 -0800
Subject: [PATCH] VertexLoader: Add more info to m_vertex_size == m_src_ofs
assertion
---
Source/Core/VideoCommon/VertexLoaderARM64.cpp | 6 +++++-
Source/Core/VideoCommon/VertexLoaderX64.cpp | 6 +++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Source/Core/VideoCommon/VertexLoaderARM64.cpp b/Source/Core/VideoCommon/VertexLoaderARM64.cpp
index b65425c451..03bb82d5c2 100644
--- a/Source/Core/VideoCommon/VertexLoaderARM64.cpp
+++ b/Source/Core/VideoCommon/VertexLoaderARM64.cpp
@@ -512,7 +512,11 @@ void VertexLoaderARM64::GenerateVertexLoader()
FlushIcache();
- ASSERT(m_vertex_size == m_src_ofs);
+ ASSERT_MSG(VIDEO, m_vertex_size == m_src_ofs,
+ "Vertex size from vertex loader ({}) does not match expected vertex size ({})!\nVtx "
+ "desc: {:08x} {:08x}\nVtx attr: {:08x} {:08x} {:08x}",
+ m_src_ofs, m_vertex_size, m_VtxDesc.low.Hex, m_VtxDesc.high.Hex, m_VtxAttr.g0.Hex,
+ m_VtxAttr.g1.Hex, m_VtxAttr.g2.Hex);
m_native_vtx_decl.stride = m_dst_ofs;
}
diff --git a/Source/Core/VideoCommon/VertexLoaderX64.cpp b/Source/Core/VideoCommon/VertexLoaderX64.cpp
index aec42a41a6..ee03d8d582 100644
--- a/Source/Core/VideoCommon/VertexLoaderX64.cpp
+++ b/Source/Core/VideoCommon/VertexLoaderX64.cpp
@@ -577,7 +577,11 @@ void VertexLoaderX64::GenerateVertexLoader()
RET();
}
- ASSERT(m_vertex_size == m_src_ofs);
+ ASSERT_MSG(VIDEO, m_vertex_size == m_src_ofs,
+ "Vertex size from vertex loader ({}) does not match expected vertex size ({})!\nVtx "
+ "desc: {:08x} {:08x}\nVtx attr: {:08x} {:08x} {:08x}",
+ m_src_ofs, m_vertex_size, m_VtxDesc.low.Hex, m_VtxDesc.high.Hex, m_VtxAttr.g0.Hex,
+ m_VtxAttr.g1.Hex, m_VtxAttr.g2.Hex);
m_native_vtx_decl.stride = m_dst_ofs;
}