archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 03:41:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #10676 from Pokechu22/fifo-recorder-indices

Browse source 
Fifo recorder: Fix various indexed vertex component bugs
This commit is contained in:
JMC47 2022-10-23 01:16:57 -04:00 committed by GitHub
commit 8ec1bb6be5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
Source/Core/Core/FifoPlayer/FifoRecorder.cpp
View file

@ -52,8 +52,8 @@ public:
private:
void ProcessVertexComponent(CPArray array_index, VertexComponentFormat array_type,
u32 component_offset, u32 vertex_size, u16 num_vertices,
const u8* vertex_data);
u32 component_offset, u32 component_size, u32 vertex_size,
u16 num_vertices, const u8* vertex_data, u32 byte_offset = 0);
FifoRecorder* const m_owner;
CPState m_cpmem;
@ -91,31 +91,67 @@ void FifoRecorder::FifoRecordAnalyzer::OnPrimitiveCommand(OpcodeDecoder::Primiti
}
const u32 pos_size = VertexLoader_Position::GetSize(vtx_desc.low.Position, vtx_attr.g0.PosFormat,
vtx_attr.g0.PosElements);
ProcessVertexComponent(CPArray::Position, vtx_desc.low.Position, offset, vertex_size,
num_vertices, vertex_data);
const u32 pos_direct_size = VertexLoader_Position::GetSize(
VertexComponentFormat::Direct, vtx_attr.g0.PosFormat, vtx_attr.g0.PosElements);
ProcessVertexComponent(CPArray::Position, vtx_desc.low.Position, offset, pos_direct_size,
vertex_size, num_vertices, vertex_data);
offset += pos_size;
const u32 norm_size =
VertexLoader_Normal::GetSize(vtx_desc.low.Normal, vtx_attr.g0.NormalFormat,
vtx_attr.g0.NormalElements, vtx_attr.g0.NormalIndex3);
ProcessVertexComponent(CPArray::Normal, vtx_desc.low.Position, offset, vertex_size, num_vertices,
vertex_data);
const u32 norm_direct_size =
VertexLoader_Normal::GetSize(VertexComponentFormat::Direct, vtx_attr.g0.NormalFormat,
vtx_attr.g0.NormalElements, vtx_attr.g0.NormalIndex3);
if (vtx_attr.g0.NormalIndex3 && IsIndexed(vtx_desc.low.Normal) &&
vtx_attr.g0.NormalElements == NormalComponentCount::NTB)
{
// We're in 3-index mode, and we're using an indexed format and have the
// normal/tangent/binormal, so we actually need to deal with 3-index mode.
const u32 index_size = vtx_desc.low.Normal == VertexComponentFormat::Index16 ? 2 : 1;
ASSERT(norm_size == index_size * 3);
// 3-index mode uses one index each for the normal, tangent and binormal;
// the tangent and binormal are internally offset.
// The offset is based on the component size, not to the index itself;
// for instance, with 32-bit float normals, each normal vector is 3*sizeof(float) = 12 bytes,
// so the normal vector is offset by 0 bytes, the tangent by 12, and the binormal by 24.
// Using a byte offset instead of increasing the index means that using the same index for all
// elements is the same as not using the 3-index mode (increasing the index would give differing
// results if the normal array's stride was something other than 12, for instance if vertices
// were contiguous in main memory instead of individual components being used).
const u32 element_size = GetElementSize(vtx_attr.g0.NormalFormat) * 3;
ProcessVertexComponent(CPArray::Normal, vtx_desc.low.Normal, offset, element_size, vertex_size,
num_vertices, vertex_data);
ProcessVertexComponent(CPArray::Normal, vtx_desc.low.Normal, offset + index_size, element_size,
vertex_size, num_vertices, vertex_data, element_size);
ProcessVertexComponent(CPArray::Normal, vtx_desc.low.Normal, offset + 2 * index_size,
element_size, vertex_size, num_vertices, vertex_data, 2 * element_size);
}
else
{
ProcessVertexComponent(CPArray::Normal, vtx_desc.low.Normal, offset, norm_direct_size,
vertex_size, num_vertices, vertex_data);
}
offset += norm_size;
for (u32 i = 0; i < vtx_desc.low.Color.Size(); i++)
{
const u32 color_size =
VertexLoader_Color::GetSize(vtx_desc.low.Color[i], vtx_attr.GetColorFormat(i));
ProcessVertexComponent(CPArray::Color0 + i, vtx_desc.low.Position, offset, vertex_size,
num_vertices, vertex_data);
const u32 color_direct_size =
VertexLoader_Color::GetSize(VertexComponentFormat::Direct, vtx_attr.GetColorFormat(i));
ProcessVertexComponent(CPArray::Color0 + i, vtx_desc.low.Color[i], offset, color_direct_size,
vertex_size, num_vertices, vertex_data);
offset += color_size;
}
for (u32 i = 0; i < vtx_desc.high.TexCoord.Size(); i++)
{
const u32 tc_size = VertexLoader_TextCoord::GetSize(
vtx_desc.high.TexCoord[i], vtx_attr.GetTexFormat(i), vtx_attr.GetTexElements(i));
ProcessVertexComponent(CPArray::TexCoord0 + i, vtx_desc.low.Position, offset, vertex_size,
num_vertices, vertex_data);
const u32 tc_direct_size = VertexLoader_TextCoord::GetSize(
VertexComponentFormat::Direct, vtx_attr.GetTexFormat(i), vtx_attr.GetTexElements(i));
ProcessVertexComponent(CPArray::TexCoord0 + i, vtx_desc.high.TexCoord[i], offset,
tc_direct_size, vertex_size, num_vertices, vertex_data);
offset += tc_size;
}
@ -123,11 +159,9 @@ void FifoRecorder::FifoRecordAnalyzer::OnPrimitiveCommand(OpcodeDecoder::Primiti
}
// If a component is indexed, the array it indexes into for data must be saved.
void FifoRecorder::FifoRecordAnalyzer::ProcessVertexComponent(CPArray array_index,
VertexComponentFormat array_type,
u32 component_offset, u32 vertex_size,
u16 num_vertices,
const u8* vertex_data)
void FifoRecorder::FifoRecordAnalyzer::ProcessVertexComponent(
CPArray array_index, VertexComponentFormat array_type, u32 component_offset, u32 component_size,
u32 vertex_size, u16 num_vertices, const u8* vertex_data, u32 byte_offset)
{
// Skip if not indexed array
if (!IsIndexed(array_type))
@ -167,8 +201,8 @@ void FifoRecorder::FifoRecordAnalyzer::ProcessVertexComponent(CPArray array_inde
}
}
const u32 array_start = m_cpmem.array_bases[array_index];
const u32 array_size = m_cpmem.array_strides[array_index] * (max_index + 1);
const u32 array_start = m_cpmem.array_bases[array_index] + byte_offset;
const u32 array_size = m_cpmem.array_strides[array_index] * max_index + component_size;
m_owner->UseMemory(array_start, array_size, MemoryUpdate::VERTEX_STREAM);
}