ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix tests. sdl init iisue on rpi3

This commit is contained in:
Flyinghead 2020-07-06 17:29:53 +02:00
parent fee28194fb
commit adf5a7e8e4
3 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/hw/pvr/pvr_regs.cpp
View File

@ -16,7 +16,7 @@ u32 pvr_ReadReg(u32 addr)
void pvr_WriteReg(u32 paddr,u32 data)
{
u32 addr=paddr&pvr_RegMask;
u32 addr = paddr & pvr_RegMask;
switch (addr)
{
@ -34,18 +34,14 @@ void pvr_WriteReg(u32 paddr,u32 data)
if (data >> 31)
{
ta_vtx_ListInit();
data=0;
TA_NEXT_OPB = TA_NEXT_OPB_INIT;
TA_ITP_CURRENT = TA_ISP_BASE;
}
break;
return;
case SOFTRESET_addr:
if (data != 0)
{
if (data & 1)
ta_vtx_SoftReset();
}
if (data & 1)
ta_vtx_SoftReset();
return;
case TA_LIST_CONT_addr:
@ -93,9 +89,7 @@ void pvr_WriteReg(u32 paddr,u32 data)
case FB_R_SOF1_addr:
data &= 0x00fffffc;
if (data == FB_W_SOF1)
{
rend_swap_frame();
}
break;
case FB_W_SOF1_addr:
@ -109,16 +103,12 @@ void pvr_WriteReg(u32 paddr,u32 data)
default:
if (addr >= PALETTE_RAM_START_addr && PvrReg(addr,u32) != data)
{
pal_needs_update = true;
}
else if (addr >= FOG_TABLE_START_addr && addr <= FOG_TABLE_END_addr && PvrReg(addr,u32) != data)
{
fog_needs_update = true;
}
break;
}
PvrReg(addr,u32)=data;
PvrReg(addr, u32) = data;
}
void Regs_Reset(bool hard)

3
core/linux-dist/main.cpp
View File

@ -313,7 +313,8 @@ int main(int argc, char* argv[])
INFO_LOG(BOOT, "Data dir is: %s", get_writable_data_path("/").c_str());
#if defined(USE_SDL)
if (SDL_Init(0) != 0)
// init video now: on rpi3 it installs a sigsegv handler(?)
if (SDL_Init(SDL_INIT_VIDEO) != 0)
{
die("SDL: Initialization failed!");
}

2
tests/src/serialize_test.cpp
View File

@ -28,7 +28,7 @@ TEST_F(SerializeTest, SizeTest)
unsigned int total_size = 0;
void *data = nullptr;
ASSERT_TRUE(dc_serialize(&data, &total_size));
ASSERT_EQ(28145195u, total_size);
ASSERT_EQ(28145458u, total_size);
}