archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 13:31:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

GcmZcullInfo::Pack and removed 32-bit OAL dll

Browse source
This commit is contained in:
Alexandro Sánchez Bach 2014-06-07 04:22:29 +02:00
parent 4ac8061240
commit 5e00dfb5c3
4 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
OpenAL/Win32/libOpenAL32.dll.a
View file

Binary file not shown.

18
rpcs3/Emu/GS/GCM.h
View file

@ -220,8 +220,8 @@ struct GcmZcullInfo
u32 m_cullStart; u32 m_cullStart;
u32 m_zFormat; u32 m_zFormat;
u32 m_aaFormat; u32 m_aaFormat;
u32 m_zCullDir; u32 m_zcullDir;
u32 m_zCullFormat; u32 m_zcullFormat;
u32 m_sFunc; u32 m_sFunc;
u32 m_sRef; u32 m_sRef;
u32 m_sMask; u32 m_sMask;
@ -231,6 +231,20 @@ struct GcmZcullInfo
{ {
memset(this, 0, sizeof(*this)); memset(this, 0, sizeof(*this));
} }
CellGcmZcullInfo Pack()
{
CellGcmZcullInfo ret;
ret.region = (1<<0) | (m_zFormat<<4) | (m_aaFormat<<8);
ret.size = ((m_width>>6)<<22) | ((m_height>>6)<<6);
ret.start = m_cullStart&(~0xFFF);
ret.offset = m_offset;
ret.status0 = (m_zcullDir<<1) | (m_zcullFormat<<2) | ((m_sFunc&0xF)<<12) | (m_sRef<<16) | (m_sMask<<24);
ret.status1 = (0x2000<<0) | (0x20<<16);
return ret;
}
}; };
struct GcmTileInfo struct GcmTileInfo

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

@ -603,14 +603,13 @@ int cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart,
zcull.m_cullStart = cullStart; zcull.m_cullStart = cullStart;
zcull.m_zFormat = zFormat; zcull.m_zFormat = zFormat;
zcull.m_aaFormat = aaFormat; zcull.m_aaFormat = aaFormat;
zcull.m_zCullDir = zCullDir; zcull.m_zcullDir = zCullDir;
zcull.m_zCullFormat = zCullFormat; zcull.m_zcullFormat = zCullFormat;
zcull.m_sFunc = sFunc; zcull.m_sFunc = sFunc;
zcull.m_sRef = sRef; zcull.m_sRef = sRef;
zcull.m_sMask = sMask; zcull.m_sMask = sMask;
// TODO: Memory.WriteData(Emu.GetGSManager().GetRender().m_zculls_addr + sizeof(CellGcmZcullInfo)* index, zcull.Pack());
//Memory.WriteData(Emu.GetGSManager().GetRender().m_zculls_addr + sizeof(CellGcmZcullInfo)* index, zcull.Pack());
return CELL_OK; return CELL_OK;
} }

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

@ -154,7 +154,7 @@ int cellSpursAttributeSetNamePrefix(mem_ptr_t<CellSpursAttribute> attr, const me
return CELL_SPURS_CORE_ERROR_NULL_POINTER; return CELL_SPURS_CORE_ERROR_NULL_POINTER;
} }
if (size > 15) if (size > CELL_SPURS_NAME_MAX_LENGTH)
{ {
cellSpurs.Error("cellSpursAttributeSetNamePrefix : CELL_SPURS_CORE_ERROR_INVAL"); cellSpurs.Error("cellSpursAttributeSetNamePrefix : CELL_SPURS_CORE_ERROR_INVAL");
return CELL_SPURS_CORE_ERROR_INVAL; return CELL_SPURS_CORE_ERROR_INVAL;