Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

GcmZcullInfo::Pack and removed 32-bit OAL dll

commit 5e00dfb5c32a0961071d45ccb9e7b0f6614f493c 1 parent 4ac8061
@AlexAltea AlexAltea authored
View
BIN  OpenAL/Win32/libOpenAL32.dll.a
Binary file not shown
View
18 rpcs3/Emu/GS/GCM.h
@@ -220,8 +220,8 @@ struct GcmZcullInfo
u32 m_cullStart;
u32 m_zFormat;
u32 m_aaFormat;
- u32 m_zCullDir;
- u32 m_zCullFormat;
+ u32 m_zcullDir;
+ u32 m_zcullFormat;
u32 m_sFunc;
u32 m_sRef;
u32 m_sMask;
@@ -231,6 +231,20 @@ struct GcmZcullInfo
{
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
View
7 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;
}
View
2  rpcs3/Emu/SysCalls/Modules/cellSpurs.cpp
@@ -154,7 +154,7 @@ int cellSpursAttributeSetNamePrefix(mem_ptr_t<CellSpursAttribute> 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;
Please sign in to comment.
Something went wrong with that request. Please try again.