From 5e00dfb5c32a0961071d45ccb9e7b0f6614f493c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandro=20S=C3=A1nchez=20Bach?= Date: Sat, 7 Jun 2014 04:22:29 +0200 Subject: [PATCH] GcmZcullInfo::Pack and removed 32-bit OAL dll --- OpenAL/Win32/libOpenAL32.dll.a | Bin 95688 -> 0 bytes rpcs3/Emu/GS/GCM.h | 18 ++++++++++++++++-- rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp | 7 +++---- rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp | 2 +- 4 files changed, 20 insertions(+), 7 deletions(-) delete mode 100644 OpenAL/Win32/libOpenAL32.dll.a diff --git a/OpenAL/Win32/libOpenAL32.dll.a b/OpenAL/Win32/libOpenAL32.dll.a deleted file mode 100644 index 6911f1b30800da43d9c59bdcc950271a9a292808..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95688 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 | ((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 diff --git a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp index 42645622bb..a7911d5d0f 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellGcmSys.cpp @@ -603,14 +603,13 @@ int cellGcmSetZcull(u8 index, u32 offset, u32 width, u32 height, u32 cullStart, zcull.m_cullStart = cullStart; zcull.m_zFormat = zFormat; zcull.m_aaFormat = aaFormat; - zcull.m_zCullDir = zCullDir; - zcull.m_zCullFormat = zCullFormat; + zcull.m_zcullDir = zCullDir; + zcull.m_zcullFormat = zCullFormat; zcull.m_sFunc = sFunc; zcull.m_sRef = sRef; 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; } diff --git a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp index f67f97a5d0..2c84fb61a6 100644 --- a/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp +++ b/rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp @@ -154,7 +154,7 @@ int cellSpursAttributeSetNamePrefix(mem_ptr_t attr, const me 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"); return CELL_SPURS_CORE_ERROR_INVAL;