RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix conflicts

Browse source
This commit is contained in:
Raul Tambre 2015-01-29 18:28:39 +02:00
commit a671c43862
59 changed files with 3754 additions and 372 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp
View file

@ -125,12 +125,8 @@ u32 cellGcmGetNotifyDataAddress(u32 index)
{
cellGcmSys->Warning("cellGcmGetNotifyDataAddress(index=%d)", index);
// Get address of 'IO table' and 'EA table'
vm::var<CellGcmOffsetTable> table;
cellGcmGetOffsetTable(table);
// If entry not in use, return NULL
u16 entry = table->eaAddress[241];
u16 entry = offsetTable.eaAddress[241];
if (entry == 0xFFFF) {
return 0;
}
@ -455,7 +451,7 @@ int cellGcmSetFlip(vm::ptr<CellGcmContextData> ctxt, u32 id)
return res < 0 ? CELL_GCM_ERROR_FAILURE : CELL_OK;
}
void cellGcmSetFlipHandler(vm::ptr<void(*)(const u32)> handler)
void cellGcmSetFlipHandler(vm::ptr<void(u32)> handler)
{
cellGcmSys->Warning("cellGcmSetFlipHandler(handler_addr=%d)", handler.addr());
@ -594,14 +590,14 @@ int cellGcmSetTileInfo(u8 index, u8 location, u32 offset, u32 size, u32 pitch, u
return CELL_OK;
}
void cellGcmSetUserHandler(vm::ptr<void(*)(const u32)> handler)
void cellGcmSetUserHandler(vm::ptr<void(u32)> handler)
{
cellGcmSys->Warning("cellGcmSetUserHandler(handler_addr=0x%x)", handler.addr());
Emu.GetGSManager().GetRender().m_user_handler = handler;
}
void cellGcmSetVBlankHandler(vm::ptr<void(*)(const u32)> handler)
void cellGcmSetVBlankHandler(vm::ptr<void(u32)> handler)
{
cellGcmSys->Warning("cellGcmSetVBlankHandler(handler_addr=0x%x)", handler.addr());
@ -1189,7 +1185,7 @@ s32 cellGcmCallback(vm::ptr<CellGcmContextData> context, u32 count)
//auto& ctrl = vm::get_ref<CellGcmControl>(gcm_info.control_addr);
// preparations for changing the place (for optimized FIFO mode)
//auto cmd = vm::ptr<u32>::make(context->current.ToLE());
//auto cmd = vm::ptr<u32>::make(context->current);
//cmd[0] = 0x41D6C;
//cmd[1] = 0x20;
//cmd[2] = 0x41D74;
@ -1205,7 +1201,7 @@ s32 cellGcmCallback(vm::ptr<CellGcmContextData> context, u32 count)
vm::write32(context->current, CELL_GCM_METHOD_FLAG_JUMP | offset); // set JUMP cmd
auto& ctrl = vm::get_ref<CellGcmControl>(gcm_info.control_addr);
ctrl.put.write_relaxed(be_t<u32>::make(offset));
ctrl.put.exchange(be_t<u32>::make(offset));
}
else
{