libretro: savestate compatibility. B1/D1 vmus now visible
This commit is contained in:
Flyinghead
parent
ec7968b2f4
commit
57874a9bcb
|
|
@ -679,7 +679,7 @@ void dc_step()
|
|||
dc_stop();
|
||||
}
|
||||
|
||||
bool dc_loadstate(const void **data, u32 *size)
|
||||
bool dc_loadstate(const void **data, u32 size)
|
||||
{
|
||||
custom_texture.Terminate();
|
||||
#if FEAT_AREC == DYNAREC_JIT
|
||||
|
|
@ -690,9 +690,13 @@ bool dc_loadstate(const void **data, u32 *size)
|
|||
bm_Reset();
|
||||
#endif
|
||||
|
||||
if (!dc_unserialize((void **)data, size))
|
||||
u32 usedSize = 0;
|
||||
if (!dc_unserialize((void **)data, &usedSize))
|
||||
return false;
|
||||
|
||||
if (size != usedSize)
|
||||
WARN_LOG(SAVESTATE, "Savestate: loaded %d bytes but used %d", size, usedSize);
|
||||
|
||||
mmu_set_state();
|
||||
sh4_cpu.ResetCache();
|
||||
dsp.dyndirty = true;
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ void dc_resume();
|
|||
void dc_step();
|
||||
void dc_savestate(int index = 0);
|
||||
void dc_loadstate(int index = 0);
|
||||
bool dc_loadstate(const void **data, unsigned *size);
|
||||
bool dc_loadstate(const void **data, unsigned size);
|
||||
void dc_load_game(const char *path);
|
||||
void dc_start_game(const char *path);
|
||||
bool dc_is_load_done();
|
||||
|
|
|
|||
|
|
@ -1580,7 +1580,7 @@ bool channel_unserialize(void **data, unsigned int *total_size, serialize_versio
|
|||
int i = 0 ;
|
||||
int addr = 0 ;
|
||||
u32 dum;
|
||||
bool old_format = ver < V7 && ver != VCUR_LIBRETRO;
|
||||
bool old_format = (ver >= V5 && ver < V7) || ver < V8_LIBRETRO;
|
||||
|
||||
for ( i = 0 ; i < 64 ; i++)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -330,7 +330,7 @@ void spg_Unserialize(void **data, unsigned int *total_size, serialize_version_en
|
|||
{
|
||||
REICAST_US(in_vblank);
|
||||
REICAST_US(clc_pvr_scanline);
|
||||
if (version != VCUR_LIBRETRO && version < V5)
|
||||
if (version < V9_LIBRETRO)
|
||||
{
|
||||
u32 i;
|
||||
REICAST_US(pvr_numscanlines);
|
||||
|
|
@ -341,6 +341,7 @@ void spg_Unserialize(void **data, unsigned int *total_size, serialize_version_en
|
|||
REICAST_SKIP(8); // speed_load_mspdf
|
||||
REICAST_US(i); // mips_counter
|
||||
REICAST_SKIP(8); // full_rps
|
||||
if (version <= V4)
|
||||
REICAST_US(i); // fskip
|
||||
}
|
||||
else if (version >= V12)
|
||||
|
|
|
|||
|
|
@ -280,7 +280,7 @@ void UnserializeTAContext(void **data, unsigned int *total_size, serialize_versi
|
|||
REICAST_US(size);
|
||||
REICAST_USA(ta_tad.thd_root, size);
|
||||
ta_tad.thd_data = ta_tad.thd_root + size;
|
||||
if (version >= V12)
|
||||
if (version >= V12 || (version >= V12_LIBRETRO && version < V5))
|
||||
{
|
||||
REICAST_US(ta_tad.render_pass_count);
|
||||
for (u32 i = 0; i < ta_tad.render_pass_count; i++)
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ void dc_loadstate(int index)
|
|||
}
|
||||
|
||||
const void *data_ptr = data;
|
||||
dc_loadstate(&data_ptr, &total_size);
|
||||
dc_loadstate(&data_ptr, total_size);
|
||||
|
||||
free(data);
|
||||
EventManager::event(Event::LoadState);
|
||||
|
|
|
|||
|
|
@ -473,7 +473,7 @@ bool dc_serialize(void **data, unsigned int *total_size)
|
|||
return true ;
|
||||
}
|
||||
|
||||
static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
|
||||
static bool dc_unserialize_libretro(void **data, unsigned int *total_size, serialize_version_enum version)
|
||||
{
|
||||
int i = 0;
|
||||
|
||||
|
|
@ -488,6 +488,13 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
|
|||
REICAST_US(armFiqEnable);
|
||||
REICAST_US(armMode);
|
||||
REICAST_US(Arm7Enabled);
|
||||
if (version < V9_LIBRETRO)
|
||||
{
|
||||
REICAST_SKIP(256); // cpuBitsSet
|
||||
REICAST_SKIP(1); // intState
|
||||
REICAST_SKIP(1); // stopState
|
||||
REICAST_SKIP(1); // holdState
|
||||
}
|
||||
|
||||
REICAST_US(dsp);
|
||||
|
||||
|
|
@ -504,12 +511,26 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
|
|||
|
||||
REICAST_USA(aica_reg,0x8000);
|
||||
|
||||
channel_unserialize(data, total_size, VCUR_LIBRETRO);
|
||||
if (version < V7_LIBRETRO)
|
||||
{
|
||||
REICAST_SKIP(4 * 16); // volume_lut
|
||||
REICAST_SKIP(4 * 256 + 768); // tl_lut. Due to a previous bug this is not 4 * (256 + 768)
|
||||
REICAST_SKIP(4 * 64); // AEG_ATT_SPS
|
||||
REICAST_SKIP(4 * 64); // AEG_DSR_SPS
|
||||
REICAST_SKIP(2); // pl
|
||||
REICAST_SKIP(2); // pr
|
||||
}
|
||||
channel_unserialize(data, total_size, version);
|
||||
|
||||
REICAST_USA(cdda_sector,CDDA_SIZE);
|
||||
REICAST_US(cdda_index);
|
||||
if (version < V9_LIBRETRO)
|
||||
{
|
||||
REICAST_SKIP(4 * 64); // mxlr
|
||||
REICAST_SKIP(4); // samples_gen
|
||||
}
|
||||
|
||||
register_unserialize(sb_regs, data, total_size, VCUR_LIBRETRO) ;
|
||||
register_unserialize(sb_regs, data, total_size, version);
|
||||
REICAST_US(SB_ISTNRM);
|
||||
REICAST_US(SB_FFST_rc);
|
||||
REICAST_US(SB_FFST);
|
||||
|
|
@ -558,7 +579,10 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
|
|||
REICAST_US(set_mode_offset);
|
||||
REICAST_US(read_params);
|
||||
REICAST_US(packet_cmd);
|
||||
// read_buff
|
||||
read_buff.cache_size = 0;
|
||||
if (version < V9_LIBRETRO)
|
||||
REICAST_SKIP(4 + 4 + 2352 * 8192);
|
||||
REICAST_US(pio_buff);
|
||||
REICAST_US(set_mode_offset);
|
||||
REICAST_US(ata_cmd);
|
||||
|
|
@ -580,43 +604,90 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
|
|||
REICAST_US(EEPROM_loaded);
|
||||
|
||||
REICAST_US(maple_ddt_pending_reset);
|
||||
mcfg_UnserializeDevices(data, total_size, VCUR_LIBRETRO);
|
||||
mcfg_UnserializeDevices(data, total_size, version);
|
||||
|
||||
if (version < V9_LIBRETRO)
|
||||
{
|
||||
REICAST_SKIP(4); // FrameCOunt
|
||||
REICAST_SKIP(1); // pend_rend
|
||||
}
|
||||
pend_rend = false;
|
||||
|
||||
YUV_unserialize(data, total_size, VCUR_LIBRETRO);
|
||||
YUV_unserialize(data, total_size, version);
|
||||
|
||||
REICAST_USA(pvr_regs,pvr_RegSize);
|
||||
if (version < V9_LIBRETRO)
|
||||
REICAST_SKIP(1); // fog_needs_update
|
||||
REICAST_USA(pvr_regs, pvr_RegSize);
|
||||
fog_needs_update = true ;
|
||||
|
||||
spg_Unserialize(data, total_size, VCUR_LIBRETRO);
|
||||
spg_Unserialize(data, total_size, version);
|
||||
|
||||
if (version < V9_LIBRETRO)
|
||||
{
|
||||
REICAST_SKIP(4 * 256); // ta_type_lut
|
||||
REICAST_SKIP(2048); // ta_fsm
|
||||
}
|
||||
if (version >= V12_LIBRETRO)
|
||||
REICAST_US(fb_w_cur);
|
||||
else
|
||||
fb_w_cur = 1;
|
||||
|
||||
REICAST_US(ta_fsm[2048]);
|
||||
REICAST_US(ta_fsm_cl);
|
||||
pal_needs_update = true;
|
||||
if (version < V9_LIBRETRO)
|
||||
{
|
||||
REICAST_SKIP(1); // pal_needs_update
|
||||
REICAST_SKIP(4 * 4); // _pal_rev_256
|
||||
REICAST_SKIP(4 * 64); // _pal_rev_16
|
||||
REICAST_SKIP(4 * 4); // pal_rev_256
|
||||
REICAST_SKIP(4 * 64); // pal_rev_16
|
||||
REICAST_SKIP(4 * 65536 * 3); // decoded_colors
|
||||
REICAST_US(i); // tileclip_val
|
||||
REICAST_SKIP(65536); // f32_su8_tbl
|
||||
REICAST_US(i); // FaceBaseColor
|
||||
REICAST_US(i); // FaceOffsColor
|
||||
REICAST_US(i); // SFaceBaseColor
|
||||
REICAST_US(i); // SFaceOffsColor
|
||||
|
||||
UnserializeTAContext(data, total_size, VCUR_LIBRETRO);
|
||||
REICAST_US(i); // palette_index
|
||||
REICAST_SKIP(1); // KillTex
|
||||
REICAST_SKIP(4 * 1024); // palette16_ram
|
||||
REICAST_SKIP(4 * 1024); // palette32_ram
|
||||
REICAST_SKIP(4 * 1024 * 8 * 2); // detwiddle
|
||||
}
|
||||
|
||||
pal_needs_update = true;
|
||||
if (version >= V10_LIBRETRO)
|
||||
UnserializeTAContext(data, total_size, version);
|
||||
|
||||
REICAST_USA(vram.data, vram.size);
|
||||
|
||||
REICAST_USA(OnChipRAM.data(), OnChipRAM_SIZE);
|
||||
|
||||
register_unserialize(CCN, data, total_size, VCUR_LIBRETRO) ;
|
||||
register_unserialize(UBC, data, total_size, VCUR_LIBRETRO) ;
|
||||
register_unserialize(BSC, data, total_size, VCUR_LIBRETRO) ;
|
||||
register_unserialize(DMAC, data, total_size, VCUR_LIBRETRO) ;
|
||||
register_unserialize(CPG, data, total_size, VCUR_LIBRETRO) ;
|
||||
register_unserialize(RTC, data, total_size, VCUR_LIBRETRO) ;
|
||||
register_unserialize(INTC, data, total_size, VCUR_LIBRETRO) ;
|
||||
register_unserialize(TMU, data, total_size, VCUR_LIBRETRO) ;
|
||||
register_unserialize(SCI, data, total_size, VCUR_LIBRETRO) ;
|
||||
register_unserialize(SCIF, data, total_size, VCUR_LIBRETRO) ;
|
||||
register_unserialize(CCN, data, total_size, version);
|
||||
register_unserialize(UBC, data, total_size, version);
|
||||
register_unserialize(BSC, data, total_size, version);
|
||||
register_unserialize(DMAC, data, total_size, version);
|
||||
register_unserialize(CPG, data, total_size, version);
|
||||
register_unserialize(RTC, data, total_size, version);
|
||||
register_unserialize(INTC, data, total_size, version);
|
||||
register_unserialize(TMU, data, total_size, version);
|
||||
register_unserialize(SCI, data, total_size, version);
|
||||
register_unserialize(SCIF, data, total_size, version);
|
||||
if (version >= V11_LIBRETRO) // FIXME was added in V11 fa49de29 24/12/2020 but ver not updated until V12 (13/4/2021)
|
||||
icache.Unserialize(data, total_size);
|
||||
else
|
||||
icache.Reset(true);
|
||||
if (version >= V11_LIBRETRO) // FIXME was added in V11 2eb66879 27/12/2020 but ver not updated until V12 (13/4/2021)
|
||||
ocache.Unserialize(data, total_size);
|
||||
else
|
||||
ocache.Reset(true);
|
||||
|
||||
REICAST_USA(mem_b.data, mem_b.size);
|
||||
if (version < V9_LIBRETRO)
|
||||
{
|
||||
u16 dum16;
|
||||
REICAST_US(dum16); // IRLPriority
|
||||
}
|
||||
REICAST_USA(InterruptEnvId,32);
|
||||
REICAST_USA(InterruptBit,32);
|
||||
REICAST_USA(InterruptLevelBit,16);
|
||||
|
|
@ -638,33 +709,41 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
|
|||
|
||||
REICAST_US((*p_sh4rcb).cntx);
|
||||
|
||||
if (version < V9_LIBRETRO)
|
||||
{
|
||||
REICAST_SKIP(4); // old_rm
|
||||
REICAST_SKIP(4); // old_dn
|
||||
}
|
||||
|
||||
REICAST_US(sh4_sched_ffb);
|
||||
if (version < V9_LIBRETRO)
|
||||
REICAST_SKIP(4); // sh4_sched_intr
|
||||
|
||||
REICAST_US(sch_list[aica_schid].tag) ;
|
||||
REICAST_US(sch_list[aica_schid].start) ;
|
||||
REICAST_US(sch_list[aica_schid].end) ;
|
||||
REICAST_US(sch_list[aica_schid].tag);
|
||||
REICAST_US(sch_list[aica_schid].start);
|
||||
REICAST_US(sch_list[aica_schid].end);
|
||||
|
||||
REICAST_US(sch_list[rtc_schid].tag) ;
|
||||
REICAST_US(sch_list[rtc_schid].start) ;
|
||||
REICAST_US(sch_list[rtc_schid].end) ;
|
||||
REICAST_US(sch_list[rtc_schid].tag);
|
||||
REICAST_US(sch_list[rtc_schid].start);
|
||||
REICAST_US(sch_list[rtc_schid].end);
|
||||
|
||||
REICAST_US(sch_list[gdrom_schid].tag) ;
|
||||
REICAST_US(sch_list[gdrom_schid].start) ;
|
||||
REICAST_US(sch_list[gdrom_schid].end) ;
|
||||
REICAST_US(sch_list[gdrom_schid].tag);
|
||||
REICAST_US(sch_list[gdrom_schid].start);
|
||||
REICAST_US(sch_list[gdrom_schid].end);
|
||||
|
||||
REICAST_US(sch_list[maple_schid].tag) ;
|
||||
REICAST_US(sch_list[maple_schid].start) ;
|
||||
REICAST_US(sch_list[maple_schid].end) ;
|
||||
REICAST_US(sch_list[maple_schid].tag);
|
||||
REICAST_US(sch_list[maple_schid].start);
|
||||
REICAST_US(sch_list[maple_schid].end);
|
||||
|
||||
REICAST_US(sch_list[dma_sched_id].tag) ;
|
||||
REICAST_US(sch_list[dma_sched_id].start) ;
|
||||
REICAST_US(sch_list[dma_sched_id].end) ;
|
||||
REICAST_US(sch_list[dma_sched_id].tag);
|
||||
REICAST_US(sch_list[dma_sched_id].start);
|
||||
REICAST_US(sch_list[dma_sched_id].end);
|
||||
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
REICAST_US(sch_list[tmu_sched[i]].tag) ;
|
||||
REICAST_US(sch_list[tmu_sched[i]].start) ;
|
||||
REICAST_US(sch_list[tmu_sched[i]].end) ;
|
||||
REICAST_US(sch_list[tmu_sched[i]].tag);
|
||||
REICAST_US(sch_list[tmu_sched[i]].start);
|
||||
REICAST_US(sch_list[tmu_sched[i]].end);
|
||||
}
|
||||
|
||||
REICAST_US(sch_list[render_end_schid].tag) ;
|
||||
|
|
@ -675,11 +754,27 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
|
|||
REICAST_US(sch_list[vblank_schid].start) ;
|
||||
REICAST_US(sch_list[vblank_schid].end) ;
|
||||
|
||||
if (version < V9_LIBRETRO)
|
||||
{
|
||||
REICAST_SKIP(4); // sch_list[time_sync].tag
|
||||
REICAST_SKIP(4); // sch_list[time_sync].start
|
||||
REICAST_SKIP(4); // sch_list[time_sync].end
|
||||
}
|
||||
|
||||
if (version >= V13_LIBRETRO)
|
||||
REICAST_SKIP(1); // settings.network.EmulateBBA
|
||||
|
||||
REICAST_US(sch_list[modem_sched].tag) ;
|
||||
REICAST_US(sch_list[modem_sched].start) ;
|
||||
REICAST_US(sch_list[modem_sched].end) ;
|
||||
|
||||
REICAST_US(SCIF_SCFSR2);
|
||||
if (version < V9_LIBRETRO)
|
||||
{
|
||||
REICAST_SKIP(1); // SCIF_SCFRDR2
|
||||
REICAST_SKIP(4); // SCIF_SCFDR2
|
||||
}
|
||||
else if (version >= V11_LIBRETRO)
|
||||
REICAST_US(SCIF_SCSCR2);
|
||||
REICAST_US(BSC_PDTRA);
|
||||
|
||||
|
|
@ -692,8 +787,25 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
|
|||
|
||||
REICAST_USA(CCN_QACR_TR,2);
|
||||
|
||||
if (version < V6_LIBRETRO)
|
||||
{
|
||||
for (int i = 0; i < 64; i++)
|
||||
{
|
||||
REICAST_US(UTLB[i].Address);
|
||||
REICAST_US(UTLB[i].Data);
|
||||
}
|
||||
for (int i = 0; i < 4; i++)
|
||||
{
|
||||
REICAST_US(ITLB[i].Address);
|
||||
REICAST_US(ITLB[i].Data);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
REICAST_US(UTLB);
|
||||
REICAST_US(ITLB);
|
||||
}
|
||||
if (version >= V11_LIBRETRO)
|
||||
REICAST_US(sq_remap);
|
||||
REICAST_US(ITLB_LRU_USE);
|
||||
|
||||
|
|
@ -710,20 +822,49 @@ static bool dc_unserialize_libretro(void **data, unsigned int *total_size)
|
|||
REICAST_US(i); // ARAM_MASK
|
||||
REICAST_US(i); // VRAM_MASK
|
||||
|
||||
naomi_Unserialize(data, total_size, VCUR_LIBRETRO);
|
||||
if (version < V9_LIBRETRO)
|
||||
{
|
||||
REICAST_SKIP(4); // naomi_updates
|
||||
REICAST_SKIP(4); // BoardID
|
||||
}
|
||||
naomi_Unserialize(data, total_size, version);
|
||||
|
||||
if (version < V9_LIBRETRO)
|
||||
{
|
||||
REICAST_SKIP(4); // cycle_counter
|
||||
REICAST_SKIP(4); // idxnxx
|
||||
REICAST_SKIP(44); // sizeof(state_t)
|
||||
REICAST_SKIP(4); // div_som_reg1
|
||||
REICAST_SKIP(4); // div_som_reg2
|
||||
REICAST_SKIP(4); // div_som_reg3
|
||||
|
||||
REICAST_SKIP(4); // LastAddr
|
||||
REICAST_SKIP(4); // LastAddr_min
|
||||
REICAST_SKIP(1024); // block_hash
|
||||
|
||||
// RegisterRead, RegisterWrite
|
||||
for (int i = 0; i < 74; i++) // sh4_reg_count (changed to 75 on 9/6/2020 (V9), V10 on 22/6/2020)
|
||||
{
|
||||
REICAST_SKIP(4);
|
||||
REICAST_SKIP(4);
|
||||
}
|
||||
REICAST_SKIP(4); // fallback_blocks
|
||||
REICAST_SKIP(4); // total_blocks
|
||||
REICAST_SKIP(4); // REMOVED_OPS
|
||||
}
|
||||
REICAST_US(config::Broadcast.get());
|
||||
REICAST_US(config::Cable.get());
|
||||
REICAST_US(config::Region.get());
|
||||
|
||||
if (CurrentCartridge != NULL)
|
||||
if (CurrentCartridge != nullptr && (settings.platform.system != DC_PLATFORM_ATOMISWAVE || version >= V10_LIBRETRO))
|
||||
CurrentCartridge->Unserialize(data, total_size);
|
||||
if (version >= V7_LIBRETRO)
|
||||
gd_hle_state.Unserialize(data, total_size);
|
||||
config::EmulateBBA.override(false);
|
||||
|
||||
DEBUG_LOG(SAVESTATE, "Loaded %d bytes (libretro compat)", *total_size);
|
||||
|
||||
return true ;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool dc_unserialize(void **data, unsigned int *total_size)
|
||||
|
|
@ -735,8 +876,8 @@ bool dc_unserialize(void **data, unsigned int *total_size)
|
|||
*total_size = 0 ;
|
||||
|
||||
REICAST_US(version) ;
|
||||
if (version == VCUR_LIBRETRO)
|
||||
return dc_unserialize_libretro(data, total_size);
|
||||
if (version >= V5_LIBRETRO && version <= V13_LIBRETRO)
|
||||
return dc_unserialize_libretro(data, total_size, version);
|
||||
if (version != V4 && version < V5)
|
||||
{
|
||||
WARN_LOG(SAVESTATE, "Save State version not supported: %d", version);
|
||||
|
|
@ -760,7 +901,7 @@ bool dc_unserialize(void **data, unsigned int *total_size)
|
|||
REICAST_US(armFiqEnable);
|
||||
REICAST_US(armMode);
|
||||
REICAST_US(Arm7Enabled);
|
||||
if (version < 5)
|
||||
if (version < V5)
|
||||
REICAST_SKIP(256 + 3);
|
||||
|
||||
REICAST_US(dsp);
|
||||
|
|
@ -1030,7 +1171,7 @@ bool dc_unserialize(void **data, unsigned int *total_size)
|
|||
|
||||
REICAST_USA(UTLB,64);
|
||||
REICAST_USA(ITLB,4);
|
||||
if (version >= 11)
|
||||
if (version >= V11)
|
||||
REICAST_USA(sq_remap,64);
|
||||
REICAST_USA(ITLB_LRU_USE,64);
|
||||
|
||||
|
|
@ -1047,7 +1188,7 @@ bool dc_unserialize(void **data, unsigned int *total_size)
|
|||
if (version < V5)
|
||||
{
|
||||
REICAST_US(i); // idxnxx
|
||||
REICAST_SKIP(sizeof(state_t));
|
||||
REICAST_SKIP(44); // sizeof(state_t)
|
||||
REICAST_SKIP(4);
|
||||
REICAST_SKIP(4);
|
||||
REICAST_SKIP(4);
|
||||
|
|
@ -1055,7 +1196,7 @@ bool dc_unserialize(void **data, unsigned int *total_size)
|
|||
REICAST_SKIP(4);
|
||||
REICAST_SKIP(1024);
|
||||
|
||||
REICAST_SKIP(8 * sh4_reg_count);
|
||||
REICAST_SKIP(8 * 74); // sh4_reg_count
|
||||
REICAST_SKIP(4);
|
||||
REICAST_SKIP(4);
|
||||
REICAST_SKIP(4);
|
||||
|
|
|
|||
11
core/types.h
11
core/types.h
|
|
@ -441,8 +441,15 @@ enum serialize_version_enum {
|
|||
V2,
|
||||
V3,
|
||||
V4,
|
||||
V11_LIBRETRO = 10,
|
||||
VCUR_LIBRETRO = V11_LIBRETRO,
|
||||
V5_LIBRETRO,
|
||||
V6_LIBRETRO,
|
||||
V7_LIBRETRO,
|
||||
V8_LIBRETRO,
|
||||
V9_LIBRETRO,
|
||||
V10_LIBRETRO,
|
||||
V11_LIBRETRO,
|
||||
V12_LIBRETRO,
|
||||
V13_LIBRETRO,
|
||||
|
||||
V5 = 800,
|
||||
V6 = 801,
|
||||
|
|
|
|||
|
|
@ -649,8 +649,8 @@ static void update_variables(bool first_startup)
|
|||
| (lightgun_palette[lightgun_params[i].colour * 3 + 2] << 16)
|
||||
| 0xff000000;
|
||||
|
||||
vmu_lcd_status[i] = false;
|
||||
vmu_lcd_changed[i] = true;
|
||||
vmu_lcd_status[i * 2] = false;
|
||||
vmu_lcd_changed[i * 2] = true;
|
||||
vmu_screen_params[i].vmu_screen_position = UPPER_LEFT;
|
||||
vmu_screen_params[i].vmu_screen_size_mult = 1;
|
||||
vmu_screen_params[i].vmu_pixel_on_R = VMU_SCREEN_COLOR_MAP[VMU_DEFAULT_ON].r;
|
||||
|
|
@ -664,7 +664,7 @@ static void update_variables(bool first_startup)
|
|||
snprintf(key, sizeof(key), CORE_OPTION_NAME "_vmu%d_screen_display", i+1);
|
||||
|
||||
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value && !strcmp("enabled", var.value) )
|
||||
vmu_lcd_status[i] = true;
|
||||
vmu_lcd_status[i * 2] = true;
|
||||
|
||||
snprintf(key, sizeof(key), CORE_OPTION_NAME "_vmu%d_screen_position", i+1);
|
||||
|
||||
|
|
@ -787,7 +787,7 @@ void retro_run()
|
|||
|
||||
// Render
|
||||
is_dupe = true;
|
||||
for (int i = 0; i < 8 && is_dupe; i++)
|
||||
for (int i = 0; i < 5 && is_dupe; i++)
|
||||
is_dupe = !rend_single_frame(true);
|
||||
|
||||
if (config::RendererType == RenderType::OpenGL || config::RendererType == RenderType::OpenGL_OIT)
|
||||
|
|
@ -1697,13 +1697,12 @@ bool retro_unserialize(const void * data, size_t size)
|
|||
dc_stop();
|
||||
}
|
||||
|
||||
unsigned int total_size = size;
|
||||
bool result = dc_loadstate(&data, &total_size);
|
||||
bool result = dc_loadstate(&data, size);
|
||||
|
||||
for (int i = 0 ; i < 4 ; i++)
|
||||
{
|
||||
vmu_lcd_changed[i] = true;
|
||||
lightgun_params[i].dirty = true ;
|
||||
vmu_lcd_changed[i * 2] = true;
|
||||
lightgun_params[i].dirty = true;
|
||||
}
|
||||
|
||||
if (config::ThreadedRendering)
|
||||
|
|
|
|||
Loading…
Reference in New Issue