ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #913 from raven02/patch-3 

RSX: vertex data regression fix
This commit is contained in:
B1ackDaemon 2014-12-20 22:51:21 +02:00
parent 5d6fb5a56b 7c9062fd3d
commit 7a61fd3055
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/RSX/GL/GLGSRender.cpp
View File

@ -984,7 +984,7 @@ void GLGSRender::EnableVertexData(bool indexed_draw)
LOG_ERROR(RSX, "GLGSRender::EnableVertexData: Bad vertex data type (%d)!", m_vertex_data[i].type);
}
if(0 && !m_vertex_data[i].addr)
if(!m_vertex_data[i].addr)
{
switch(m_vertex_data[i].type)
{

18
rpcs3/Emu/RSX/RSXThread.cpp
View File

@ -95,11 +95,11 @@ RSXVertexData::RSXVertexData()
void RSXVertexData::Reset()
{
//frequency = 0;
//stride = 0;
//size = 0;
//type = 0;
//addr = 0;
frequency = 0;
stride = 0;
size = 0;
type = 0;
addr = 0;
data.clear();
}
@ -428,7 +428,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
u8 v2 = a0 >> 16;
u8 v3 = a0 >> 24;
//m_vertex_data[index].Reset();
m_vertex_data[index].Reset();
m_vertex_data[index].size = 4;
m_vertex_data[index].type = CELL_GCM_VERTEX_UB;
m_vertex_data[index].data.push_back(v0);
@ -447,7 +447,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
float v0 = (float&)a0;
float v1 = (float&)a1;
//m_vertex_data[index].Reset();
m_vertex_data[index].Reset();
m_vertex_data[index].type = CELL_GCM_VERTEX_F;
m_vertex_data[index].size = 2;
u32 pos = m_vertex_data[index].data.size();
@ -471,7 +471,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
float v2 = (float&)a2;
float v3 = (float&)a3;
//m_vertex_data[index].Reset();
m_vertex_data[index].Reset();
m_vertex_data[index].type = CELL_GCM_VERTEX_F;
m_vertex_data[index].size = 4;
u32 pos = m_vertex_data[index].data.size();
@ -2418,4 +2418,4 @@ void RSXThread::WriteIO32(u32 addr, u32 value)
{
throw fmt::Format("%s(rsxio_addr=0x%x): RSXIO memory not mapped", __FUNCTION__, addr);
}
}
}