piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3108 from lioncash/cstyle-array

Browse Source 
ChunkFile: Provide additional helpers for C-style arrays
This commit is contained in:
flacs 2015-10-01 01:55:54 +02:00
commit 696d6eae09
12 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Common/ChunkFile.h
View File

@ -174,6 +174,12 @@ public:
DoVoid(x, count * sizeof(T)); DoVoid(x, count * sizeof(T));
} }
template <typename T, std::size_t N>
void DoArray(T (&arr)[N])
{
DoArray(arr, static_cast<u32>(N));
}
void Do(Common::Flag& flag) void Do(Common::Flag& flag)
{ {
bool s = flag.IsSet(); bool s = flag.IsSet();

2
Source/Core/Core/HW/DVDInterface.cpp
View File

@ -293,7 +293,7 @@ void DoState(PointerWrap &p)
{ {
p.DoPOD(m_DISR); p.DoPOD(m_DISR);
p.DoPOD(m_DICVR); p.DoPOD(m_DICVR);
p.DoArray(m_DICMDBUF, 3); p.DoArray(m_DICMDBUF);
p.Do(m_DIMAR); p.Do(m_DIMAR);
p.Do(m_DILENGTH); p.Do(m_DILENGTH);
p.Do(m_DICR); p.Do(m_DICR);

4
Source/Core/Core/HW/VideoInterface.cpp
View File

@ -85,8 +85,8 @@ void DoState(PointerWrap &p)
p.Do(m_XFBInfoBottom); p.Do(m_XFBInfoBottom);
p.Do(m_3DFBInfoTop); p.Do(m_3DFBInfoTop);
p.Do(m_3DFBInfoBottom); p.Do(m_3DFBInfoBottom);
p.DoArray(m_InterruptRegister, 4); p.DoArray(m_InterruptRegister);
p.DoArray(m_LatchRegister, 2); p.DoArray(m_LatchRegister);
p.Do(m_PictureConfiguration); p.Do(m_PictureConfiguration);
p.DoPOD(m_HorizontalScaling); p.DoPOD(m_HorizontalScaling);
p.Do(m_FilterCoefTables); p.Do(m_FilterCoefTables);

2
Source/Core/Core/HW/WiimoteEmu/EmuSubroutines.cpp
View File

@ -591,7 +591,7 @@ void Wiimote::DoState(PointerWrap& p)
p.Do(m_status); p.Do(m_status);
p.Do(m_adpcm_state); p.Do(m_adpcm_state);
p.Do(m_ext_key); p.Do(m_ext_key);
p.DoArray(m_eeprom, sizeof(m_eeprom)); p.DoArray(m_eeprom);
p.Do(m_reg_motion_plus); p.Do(m_reg_motion_plus);
p.Do(m_reg_ir); p.Do(m_reg_ir);
p.Do(m_reg_ext); p.Do(m_reg_ext);

4
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
View File

@ -518,7 +518,7 @@ void CWII_IPC_HLE_Device_fs::DoState(PointerWrap& p)
u32 count = size; u32 count = size;
while (count > 65536) while (count > 65536)
{ {
p.DoArray(&buf[0], 65536); p.DoArray(buf);
handle.WriteArray(&buf[0], 65536); handle.WriteArray(&buf[0], 65536);
count -= 65536; count -= 65536;
} }
@ -562,7 +562,7 @@ void CWII_IPC_HLE_Device_fs::DoState(PointerWrap& p)
while (count > 65536) while (count > 65536)
{ {
handle.ReadArray(&buf[0], 65536); handle.ReadArray(&buf[0], 65536);
p.DoArray(&buf[0], 65536); p.DoArray(buf);
count -= 65536; count -= 65536;
} }
handle.ReadArray(&buf[0], count); handle.ReadArray(&buf[0], count);

2
Source/Core/Core/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
View File

@ -131,7 +131,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::DoState(PointerWrap &p)
p.DoPOD(m_HCIEndpoint); p.DoPOD(m_HCIEndpoint);
p.DoPOD(m_ACLEndpoint); p.DoPOD(m_ACLEndpoint);
p.Do(m_last_ticks); p.Do(m_last_ticks);
p.DoArray(m_PacketCount,MAX_BBMOTES); p.DoArray(m_PacketCount);
p.Do(m_ScanEnable); p.Do(m_ScanEnable);
p.Do(m_EventQueue); p.Do(m_EventQueue);
m_acl_pool.DoState(p); m_acl_pool.DoState(p);

2
Source/Core/Core/State.cpp
View File

@ -66,7 +66,7 @@ static Common::Event g_compressAndDumpStateSyncEvent;
static std::thread g_save_thread; static std::thread g_save_thread;
// Don't forget to increase this after doing changes on the savestate system // Don't forget to increase this after doing changes on the savestate system
static const u32 STATE_VERSION = 47; // Last changed in PR 3045 static const u32 STATE_VERSION = 48; // Last changed in PR 3108
// Maps savestate versions to Dolphin versions. // Maps savestate versions to Dolphin versions.
// Versions after 42 don't need to be added to this list, // Versions after 42 don't need to be added to this list,

2
Source/Core/VideoBackends/Software/Clipper.cpp
View File

@ -58,7 +58,7 @@ namespace Clipper
void DoState(PointerWrap &p) void DoState(PointerWrap &p)
{ {
p.DoArray(m_ViewOffset,2); p.DoArray(m_ViewOffset);
for (auto& ClippedVertice : ClippedVertices) for (auto& ClippedVertice : ClippedVertices)
ClippedVertice.DoState(p); ClippedVertice.DoState(p);
} }

2
Source/Core/VideoBackends/Software/EfbInterface.cpp
View File

@ -33,7 +33,7 @@ namespace EfbInterface
void DoState(PointerWrap &p) void DoState(PointerWrap &p)
{ {
p.DoArray(efb, EFB_WIDTH*EFB_HEIGHT*6); p.DoArray(efb);
} }
static void SetPixelAlphaOnly(u32 offset, u8 a) static void SetPixelAlphaOnly(u32 offset, u8 a)

35
Source/Core/VideoBackends/Software/Tev.cpp
View File

@ -812,28 +812,27 @@ void Tev::SetRegColor(int reg, int comp, bool konst, s16 color)
void Tev::DoState(PointerWrap &p) void Tev::DoState(PointerWrap &p)
{ {
p.DoArray(Reg, sizeof(Reg)); p.DoArray(Reg);
p.DoArray(KonstantColors, sizeof(KonstantColors)); p.DoArray(KonstantColors);
p.DoArray(TexColor,4); p.DoArray(TexColor);
p.DoArray(RasColor,4); p.DoArray(RasColor);
p.DoArray(StageKonst,4); p.DoArray(StageKonst);
p.DoArray(Zero16,4);
p.DoArray(FixedConstants,9); p.DoArray(FixedConstants);
p.Do(AlphaBump); p.Do(AlphaBump);
p.DoArray(IndirectTex, sizeof(IndirectTex)); p.DoArray(IndirectTex);
p.Do(TexCoord); p.Do(TexCoord);
p.DoArray(m_BiasLUT,4); p.DoArray(m_BiasLUT);
p.DoArray(m_ScaleLShiftLUT,4); p.DoArray(m_ScaleLShiftLUT);
p.DoArray(m_ScaleRShiftLUT,4); p.DoArray(m_ScaleRShiftLUT);
p.DoArray(Position,3); p.DoArray(Position);
p.DoArray(Color, sizeof(Color)); p.DoArray(Color);
p.DoArray(Uv, 8); p.DoArray(Uv);
p.DoArray(IndirectLod,4); p.DoArray(IndirectLod);
p.DoArray(IndirectLinear,4); p.DoArray(IndirectLinear);
p.DoArray(TextureLod,16); p.DoArray(TextureLod);
p.DoArray(TextureLinear,16); p.DoArray(TextureLinear);
} }

6
Source/Core/VideoCommon/CPMemory.cpp
View File

@ -14,12 +14,12 @@ void DoCPState(PointerWrap& p)
{ {
// We don't save g_preprocess_cp_state separately because the GPU should be // We don't save g_preprocess_cp_state separately because the GPU should be
// synced around state save/load. // synced around state save/load.
p.DoArray(g_main_cp_state.array_bases, 16); p.DoArray(g_main_cp_state.array_bases);
p.DoArray(g_main_cp_state.array_strides, 16); p.DoArray(g_main_cp_state.array_strides);
p.Do(g_main_cp_state.matrix_index_a); p.Do(g_main_cp_state.matrix_index_a);
p.Do(g_main_cp_state.matrix_index_b); p.Do(g_main_cp_state.matrix_index_b);
p.Do(g_main_cp_state.vtx_desc.Hex); p.Do(g_main_cp_state.vtx_desc.Hex);
p.DoArray(g_main_cp_state.vtx_attr, 8); p.DoArray(g_main_cp_state.vtx_attr);
p.DoMarker("CP Memory"); p.DoMarker("CP Memory");
if (p.mode == PointerWrap::MODE_READ) if (p.mode == PointerWrap::MODE_READ)
{ {

2
Source/Core/VideoCommon/VideoState.cpp
View File

@ -31,7 +31,7 @@ static void DoState(PointerWrap &p)
p.DoMarker("XF Memory"); p.DoMarker("XF Memory");
// Texture decoder // Texture decoder
p.DoArray(texMem, TMEM_SIZE); p.DoArray(texMem);
p.DoMarker("texMem"); p.DoMarker("texMem");
// FIFO // FIFO