mirrors/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-08-10 01:59:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #913 from raven02/patch-3

Browse source 
RSX: vertex data regression fix
This commit is contained in:
B1ackDaemon 2014-12-20 22:51:21 +02:00
commit 7a61fd3055
2 changed files with 10 additions and 10 deletions
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); 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) switch(m_vertex_data[i].type)
{ {

16
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -95,11 +95,11 @@ RSXVertexData::RSXVertexData()
void RSXVertexData::Reset() void RSXVertexData::Reset()
{ {
//frequency = 0; frequency = 0;
//stride = 0; stride = 0;
//size = 0; size = 0;
//type = 0; type = 0;
//addr = 0; addr = 0;
data.clear(); 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 v2 = a0 >> 16;
u8 v3 = a0 >> 24; u8 v3 = a0 >> 24;
//m_vertex_data[index].Reset(); m_vertex_data[index].Reset();
m_vertex_data[index].size = 4; m_vertex_data[index].size = 4;
m_vertex_data[index].type = CELL_GCM_VERTEX_UB; m_vertex_data[index].type = CELL_GCM_VERTEX_UB;
m_vertex_data[index].data.push_back(v0); 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 v0 = (float&)a0;
float v1 = (float&)a1; 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].type = CELL_GCM_VERTEX_F;
m_vertex_data[index].size = 2; m_vertex_data[index].size = 2;
u32 pos = m_vertex_data[index].data.size(); 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 v2 = (float&)a2;
float v3 = (float&)a3; 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].type = CELL_GCM_VERTEX_F;
m_vertex_data[index].size = 4; m_vertex_data[index].size = 4;
u32 pos = m_vertex_data[index].data.size(); u32 pos = m_vertex_data[index].data.size();