Common/PointerWrap: Remove DoPOD

This was added in 385d8e2b15, but became somewhat redundant with Do in 4c7bbd96e4, and completely redundant now that std::is_trivially_copyable_v is well-supported.
This commit is contained in:
Pokechu22 2022-10-05 22:58:10 -07:00
parent 7498eb1e6c
commit e8221d7948
14 changed files with 30 additions and 36 deletions

View File

@ -257,12 +257,6 @@ public:
DoVoid((void*)&x, sizeof(x));
}
template <typename T>
void DoPOD(T& x)
{
DoVoid((void*)&x, sizeof(x));
}
void Do(bool& x)
{
// bool's size can vary depending on platform, which can

View File

@ -138,8 +138,8 @@ void DoState(PointerWrap& p)
auto& system = Core::System::GetInstance();
auto& state = system.GetAudioInterfaceState().GetData();
p.DoPOD(state.control);
p.DoPOD(state.volume);
p.Do(state.control);
p.Do(state.volume);
p.Do(state.sample_counter);
p.Do(state.interrupt_timing);
p.Do(state.last_cpu_time);

View File

@ -164,9 +164,9 @@ void DoState(PointerWrap& p)
if (!state.aram.wii_mode)
p.DoArray(state.aram.ptr, state.aram.size);
p.DoPOD(state.dsp_control);
p.DoPOD(state.audio_dma);
p.DoPOD(state.aram_dma);
p.Do(state.dsp_control);
p.Do(state.audio_dma);
p.Do(state.aram_dma);
p.Do(state.aram_info);
p.Do(state.aram_mode);
p.Do(state.aram_refresh);

View File

@ -105,9 +105,9 @@ void DSPHLE::DoState(PointerWrap& p)
return;
}
p.DoPOD(m_dsp_control);
p.Do(m_dsp_control);
p.Do(m_control_reg_init_code_clear_time);
p.DoPOD(m_dsp_state);
p.Do(m_dsp_state);
int ucode_crc = UCodeInterface::GetCRC(m_ucode.get());
int ucode_crc_before_load = ucode_crc;

View File

@ -211,14 +211,14 @@ void DoState(PointerWrap& p)
{
auto& state = Core::System::GetInstance().GetDVDInterfaceState().GetData();
p.DoPOD(state.DISR);
p.DoPOD(state.DICVR);
p.Do(state.DISR);
p.Do(state.DICVR);
p.DoArray(state.DICMDBUF);
p.Do(state.DIMAR);
p.Do(state.DILENGTH);
p.Do(state.DICR);
p.Do(state.DIIMMBUF);
p.DoPOD(state.DICFG);
p.Do(state.DICFG);
p.Do(state.stream);
p.Do(state.stop_at_track_end);

View File

@ -233,14 +233,14 @@ IEXIDevice* CEXIChannel::GetDevice(const u8 chip_select)
void CEXIChannel::DoState(PointerWrap& p)
{
p.DoPOD(m_status);
p.Do(m_status);
p.Do(m_dma_memory_address);
p.Do(m_dma_length);
p.Do(m_control);
p.Do(m_imm_data);
Memcard::HeaderData old_header_data = m_memcard_header_data;
p.DoPOD(m_memcard_header_data);
p.Do(m_memcard_header_data);
for (int device_index = 0; device_index < NUM_DEVICES; ++device_index)
{

View File

@ -87,7 +87,7 @@ int GCIFile::UsesBlock(u16 block_num)
void GCIFile::DoState(PointerWrap& p)
{
p.DoPOD<DEntry>(m_gci_header);
p.Do(m_gci_header);
p.Do(m_dirty);
p.Do(m_filename);
int num_blocks = (int)m_save_data.size();
@ -95,7 +95,7 @@ void GCIFile::DoState(PointerWrap& p)
m_save_data.resize(num_blocks);
for (auto itr = m_save_data.begin(); itr != m_save_data.end(); ++itr)
{
p.DoPOD<GCMBlock>(*itr);
p.Do(*itr);
}
p.Do(m_used_blocks);
}

View File

@ -696,11 +696,11 @@ void GCMemcardDirectory::DoState(PointerWrap& p)
m_last_block = -1;
m_last_block_address = nullptr;
p.Do(m_save_directory);
p.DoPOD<Memcard::Header>(m_hdr);
p.DoPOD<Memcard::Directory>(m_dir1);
p.DoPOD<Memcard::Directory>(m_dir2);
p.DoPOD<Memcard::BlockAlloc>(m_bat1);
p.DoPOD<Memcard::BlockAlloc>(m_bat2);
p.Do(m_hdr);
p.Do(m_dir1);
p.Do(m_dir2);
p.Do(m_bat1);
p.Do(m_bat2);
int num_saves = (int)m_saves.size();
p.Do(num_saves);
m_saves.resize(num_saves);

View File

@ -351,8 +351,8 @@ void DoState(PointerWrap& p)
}
p.Do(s_poll);
p.DoPOD(s_com_csr);
p.DoPOD(s_status_reg);
p.Do(s_com_csr);
p.Do(s_status_reg);
p.Do(s_exi_clock_count);
p.Do(s_si_buffer);
}

View File

@ -93,8 +93,8 @@ static constexpr u32 NUM_HALF_LINES_FOR_SI_POLL = (7 * 2) + 1; // this is how l
void DoState(PointerWrap& p)
{
auto& state = Core::System::GetInstance().GetVideoInterfaceState().GetData();
p.DoPOD(state.vertical_timing_register);
p.DoPOD(state.display_control_register);
p.Do(state.vertical_timing_register);
p.Do(state.display_control_register);
p.Do(state.h_timing_0);
p.Do(state.h_timing_1);
p.Do(state.vblank_timing_odd);
@ -108,7 +108,7 @@ void DoState(PointerWrap& p)
p.DoArray(state.interrupt_register);
p.DoArray(state.latch_register);
p.Do(state.picture_configuration);
p.DoPOD(state.horizontal_scaling);
p.Do(state.horizontal_scaling);
p.Do(state.filter_coef_tables);
p.Do(state.unknown_aa_register);
p.Do(state.clock);

View File

@ -118,7 +118,7 @@ void DoState(PointerWrap& p)
{
p.Do(ppc_msg);
p.Do(arm_msg);
p.DoPOD(ctrl);
p.Do(ctrl);
p.Do(ppc_irq_flags);
p.Do(ppc_irq_masks);
p.Do(arm_irq_flags);

View File

@ -107,9 +107,9 @@ void SCPFifoStruct::DoState(PointerWrap& p)
void DoState(PointerWrap& p)
{
p.DoPOD(m_CPStatusReg);
p.DoPOD(m_CPCtrlReg);
p.DoPOD(m_CPClearReg);
p.Do(m_CPStatusReg);
p.Do(m_CPCtrlReg);
p.Do(m_CPClearReg);
p.Do(m_bboxleft);
p.Do(m_bboxtop);
p.Do(m_bboxright);

View File

@ -169,7 +169,7 @@ void DoState(PointerWrap& p)
p.Do(m_DstAlphaConf);
p.Do(m_AlphaModeConf);
p.Do(m_AlphaRead);
p.DoPOD(m_Control);
p.Do(m_Control);
p.Do(s_token);
p.Do(s_token_pending);

View File

@ -440,7 +440,7 @@ void TextureCacheBase::SerializeTexture(AbstractTexture* tex, const TextureConfi
{
// If we're in measure mode, skip the actual readback to save some time.
const bool skip_readback = p.IsMeasureMode();
p.DoPOD(config);
p.Do(config);
if (skip_readback || CheckReadbackTexture(config.width, config.height, config.format))
{