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

Merge pull request #12148 from Dentomologist/fifo_convert_memoryupdate_type_to_enum_class

Browse Source 
Fifo: Convert MemoryUpdate::Type to enum class
This commit is contained in:
Admiral H. Curtiss
2023-09-03 03:34:35 +02:00
committed by GitHub
parent 6d04618921 9cabf20aaa
commit 46a596c0d3
5 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/FifoPlayer/FifoDataFile.cpp
View File

@ -385,7 +385,7 @@ u64 FifoDataFile::WriteMemoryUpdates(const std::vector<MemoryUpdate>& memUpdates
dstUpdate.dataOffset = dataOffset;
dstUpdate.dataSize = static_cast<u32>(srcUpdate.data.size());
dstUpdate.fifoPosition = srcUpdate.fifoPosition;
dstUpdate.type = srcUpdate.type;
dstUpdate.type = static_cast<u8>(srcUpdate.type);
u64 updateOffset = updateListOffset + (i * sizeof(FileMemoryUpdate));
file.Seek(updateOffset, File::SeekOrigin::Begin);

8
Source/Core/Core/FifoPlayer/FifoDataFile.h
View File

@ -18,11 +18,11 @@ class IOFile;
struct MemoryUpdate
{
enum Type
enum class Type : u8
{
TEXTURE_MAP = 0x01,
XF_DATA = 0x02,
VERTEX_STREAM = 0x04,
TextureMap = 0x01,
XFData = 0x02,
VertexStream = 0x04,
TMEM = 0x08,
};

4
Source/Core/Core/FifoPlayer/FifoRecorder.cpp
View File

@ -69,7 +69,7 @@ void FifoRecorder::FifoRecordAnalyzer::OnIndexedLoad(CPArray array, u32 index, u
{
const u32 load_address = m_cpmem.array_bases[array] + m_cpmem.array_strides[array] * index;
m_owner->UseMemory(load_address, size * sizeof(u32), MemoryUpdate::XF_DATA);
m_owner->UseMemory(load_address, size * sizeof(u32), MemoryUpdate::Type::XFData);
}
// TODO: The following code is copied with modifications from VertexLoaderBase.
@ -210,7 +210,7 @@ void FifoRecorder::FifoRecordAnalyzer::ProcessVertexComponent(
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);
m_owner->UseMemory(array_start, array_size, MemoryUpdate::Type::VertexStream);
}
static FifoRecorder instance;