piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

VertexLoaderX64: Fix direct normal+tangent+binormal with index3 set

Browse Source 
Fixes https://bugs.dolphin-emu.org/issues/12952
This commit is contained in:
Pokechu22
2022-07-04 11:21:38 -07:00
parent 5cc2f7729e
commit 200676f4e3
2 changed files with 40 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Source/Core/VideoCommon/VertexLoaderX64.cpp
View File

@ -79,9 +79,10 @@ OpArg VertexLoaderX64::GetVertexAddr(CPArray array, VertexComponentFormat attrib
} }
} }
int VertexLoaderX64::ReadVertex(OpArg data, VertexComponentFormat attribute, ComponentFormat format, void VertexLoaderX64::ReadVertex(OpArg data, VertexComponentFormat attribute,
int count_in, int count_out, bool dequantize, u8 scaling_exponent, ComponentFormat format, int count_in, int count_out,
AttributeFormat* native_format) bool dequantize, u8 scaling_exponent,
AttributeFormat* native_format)
{ {
static const __m128i shuffle_lut[5][3] = { static const __m128i shuffle_lut[5][3] = {
{_mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0xFFFFFFFFL, 0xFFFFFF00L), // 1x u8 {_mm_set_epi32(0xFFFFFFFFL, 0xFFFFFFFFL, 0xFFFFFFFFL, 0xFFFFFF00L), // 1x u8
@ -276,8 +277,6 @@ int VertexLoaderX64::ReadVertex(OpArg data, VertexComponentFormat attribute, Com
} }
write_zfreeze(); write_zfreeze();
return load_bytes;
} }
void VertexLoaderX64::ReadColor(OpArg data, VertexComponentFormat attribute, ColorFormat format) void VertexLoaderX64::ReadColor(OpArg data, VertexComponentFormat attribute, ColorFormat format)
@ -462,18 +461,42 @@ void VertexLoaderX64::GenerateVertexLoader()
static constexpr Common::EnumMap<u8, static_cast<ComponentFormat>(7)> SCALE_MAP = {7, 6, 15, 14, static constexpr Common::EnumMap<u8, static_cast<ComponentFormat>(7)> SCALE_MAP = {7, 6, 15, 14,
0, 0, 0, 0}; 0, 0, 0, 0};
const u8 scaling_exponent = SCALE_MAP[m_VtxAttr.g0.NormalFormat]; const u8 scaling_exponent = SCALE_MAP[m_VtxAttr.g0.NormalFormat];
const int limit = m_VtxAttr.g0.NormalElements == NormalComponentCount::NTB ? 3 : 1;
for (int i = 0; i < limit; i++) // Normal
data = GetVertexAddr(CPArray::Normal, m_VtxDesc.low.Normal);
ReadVertex(data, m_VtxDesc.low.Normal, m_VtxAttr.g0.NormalFormat, 3, 3, true, scaling_exponent,
&m_native_vtx_decl.normals[0]);
if (m_VtxAttr.g0.NormalElements == NormalComponentCount::NTB)
{ {
if (!i || m_VtxAttr.g0.NormalIndex3) const bool index3 = IsIndexed(m_VtxDesc.low.Normal) && m_VtxAttr.g0.NormalIndex3;
{ const int elem_size = GetElementSize(m_VtxAttr.g0.NormalFormat);
const int load_bytes = elem_size * 3;
// Tangent
// If in Index3 mode, and indexed components are used, replace the index with a new index.
if (index3)
data = GetVertexAddr(CPArray::Normal, m_VtxDesc.low.Normal); data = GetVertexAddr(CPArray::Normal, m_VtxDesc.low.Normal);
int elem_size = GetElementSize(m_VtxAttr.g0.NormalFormat); // The tangent comes after the normal; even in index3 mode, this offset is applied.
data.AddMemOffset(i * elem_size * 3); // Note that this is different from adding 1 to the index, as the stride for indices may be
} // different from the size of the tangent itself.
data.AddMemOffset(ReadVertex(data, m_VtxDesc.low.Normal, m_VtxAttr.g0.NormalFormat, 3, 3, data.AddMemOffset(load_bytes);
true, scaling_exponent, &m_native_vtx_decl.normals[i]));
ReadVertex(data, m_VtxDesc.low.Normal, m_VtxAttr.g0.NormalFormat, 3, 3, true,
scaling_exponent, &m_native_vtx_decl.normals[1]);
// Undo the offset above so that data points to the normal instead of the tangent.
// This way, we can add 2*elem_size below to always point to the binormal, even if we replace
// data with a new index (which would point to the normal).
data.AddMemOffset(-load_bytes);
// Binormal
if (index3)
data = GetVertexAddr(CPArray::Normal, m_VtxDesc.low.Normal);
data.AddMemOffset(load_bytes * 2);
ReadVertex(data, m_VtxDesc.low.Normal, m_VtxAttr.g0.NormalFormat, 3, 3, true,
scaling_exponent, &m_native_vtx_decl.normals[2]);
} }
} }

6
Source/Core/VideoCommon/VertexLoaderX64.h
View File

@ -25,9 +25,9 @@ private:
u32 m_dst_ofs = 0; u32 m_dst_ofs = 0;
Gen::FixupBranch m_skip_vertex; Gen::FixupBranch m_skip_vertex;
Gen::OpArg GetVertexAddr(CPArray array, VertexComponentFormat attribute); Gen::OpArg GetVertexAddr(CPArray array, VertexComponentFormat attribute);
int ReadVertex(Gen::OpArg data, VertexComponentFormat attribute, ComponentFormat format, void ReadVertex(Gen::OpArg data, VertexComponentFormat attribute, ComponentFormat format,
int count_in, int count_out, bool dequantize, u8 scaling_exponent, int count_in, int count_out, bool dequantize, u8 scaling_exponent,
AttributeFormat* native_format); AttributeFormat* native_format);
void ReadColor(Gen::OpArg data, VertexComponentFormat attribute, ColorFormat format); void ReadColor(Gen::OpArg data, VertexComponentFormat attribute, ColorFormat format);
void GenerateVertexLoader(); void GenerateVertexLoader();
}; };