archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 06:21:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

delete m_main_mem_addr

Browse source
This commit is contained in:
elisha464 2014-01-26 23:07:14 +02:00
parent e8d00e6bbd
commit 543ed01642
2 changed files with 1 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rpcs3/Emu/GS/RSXThread.h
View file

@ -265,7 +265,6 @@ public:
u32 m_report_main_addr; u32 m_report_main_addr;
u32 m_local_mem_addr, m_main_mem_addr; u32 m_local_mem_addr, m_main_mem_addr;
Array<MemInfo> m_main_mem_info;
public: public:
uint m_draw_mode; uint m_draw_mode;
@ -637,7 +636,7 @@ protected:
switch(location) switch(location)
{ {
case CELL_GCM_LOCATION_LOCAL: return m_local_mem_addr + offset; case CELL_GCM_LOCATION_LOCAL: return m_local_mem_addr + offset;
case CELL_GCM_LOCATION_MAIN: return m_main_mem_addr + offset; case CELL_GCM_LOCATION_MAIN: return Memory.RSXIOMem.getRealAddr(Memory.RSXIOMem.GetStartAddr() + offset);
} }
ConLog.Error("GetAddress(offset=0x%x, location=0x%x)", location); ConLog.Error("GetAddress(offset=0x%x, location=0x%x)", location);

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

@ -107,7 +107,6 @@ int cellGcmInit(u32 context_addr, u32 cmdSize, u32 ioSize, u32 ioAddress)
render.m_tiles_addr = Memory.Alloc(sizeof(CellGcmTileInfo) * 15, sizeof(CellGcmTileInfo)); render.m_tiles_addr = Memory.Alloc(sizeof(CellGcmTileInfo) * 15, sizeof(CellGcmTileInfo));
render.m_gcm_buffers_count = 0; render.m_gcm_buffers_count = 0;
render.m_gcm_current_buffer = 0; render.m_gcm_current_buffer = 0;
render.m_main_mem_info.Clear();
render.m_main_mem_addr = 0; render.m_main_mem_addr = 0;
render.Init(ctx_begin, ctx_size, gcm_info.control_addr, local_addr); render.Init(ctx_begin, ctx_size, gcm_info.control_addr, local_addr);
@ -725,7 +724,6 @@ int32_t cellGcmMapMainMemory(u64 ea, u32 size, mem32_t offset)
} }
Emu.GetGSManager().GetRender().m_main_mem_addr = Emu.GetGSManager().GetRender().m_ioAddress; Emu.GetGSManager().GetRender().m_main_mem_addr = Emu.GetGSManager().GetRender().m_ioAddress;
Emu.GetGSManager().GetRender().m_main_mem_info.AddCpy(MemInfo(ea, size));
return CELL_OK; return CELL_OK;
} }