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

GSdx: there is a possibility of calling GSState::Flush in the middle of a strip or fan, the last few vertices must be saved to be able to continue, haven't found anything with this problem though. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5046 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gabest11 2012-01-05 04:40:47 +00:00
parent f68f007f00
commit a8e8e6e80f
2 changed files with 64 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
plugins/GSdx/GSState.cpp
View File

@ -42,6 +42,7 @@ GSState::GSState(GSVertexTrace* vt, size_t vertex_stride)
memset(&m_index, 0, sizeof(m_index)); memset(&m_index, 0, sizeof(m_index));
m_vertex.stride = vertex_stride; m_vertex.stride = vertex_stride;
m_vertex.tmp = (uint8*)_aligned_malloc(vertex_stride * 2, 32);
GrowVertexBuffer(); GrowVertexBuffer();
@ -116,6 +117,8 @@ GSState::GSState(GSVertexTrace* vt, size_t vertex_stride)
GSState::~GSState() GSState::~GSState()
{ {
_aligned_free(m_vertex.tmp);
if(m_vertex.buff) _aligned_free(m_vertex.buff); if(m_vertex.buff) _aligned_free(m_vertex.buff);
if(m_index.buff) _aligned_free(m_index.buff); if(m_index.buff) _aligned_free(m_index.buff);
} }
@ -1203,6 +1206,34 @@ void GSState::FlushPrim()
{ {
if(m_index.tail > 0) if(m_index.tail > 0)
{ {
uint8* buff = m_vertex.tmp;
size_t stride = m_vertex.stride;
size_t head = m_vertex.head;
size_t tail = m_vertex.tail;
switch(PRIM->PRIM)
{
case GS_LINESTRIP:
memcpy(&buff[0], &m_vertex.buff[stride * head], stride);
break;
case GS_TRIANGLESTRIP:
memcpy(&buff[0], &m_vertex.buff[stride * head], stride * 2);
break;
case GS_TRIANGLEFAN:
memcpy(&buff[0], &m_vertex.buff[stride * head], stride);
memcpy(&buff[stride], &m_vertex.buff[stride * (tail - 1)], stride);
break;
case GS_POINTLIST:
case GS_LINELIST:
case GS_TRIANGLELIST:
case GS_SPRITE:
case GS_INVALID:
break;
default:
__assume(0);
}
if(GSLocalMemory::m_psm[m_context->FRAME.PSM].fmt < 3 && GSLocalMemory::m_psm[m_context->ZBUF.PSM].fmt < 3) if(GSLocalMemory::m_psm[m_context->FRAME.PSM].fmt < 3 && GSLocalMemory::m_psm[m_context->ZBUF.PSM].fmt < 3)
{ {
// FIXME: berserk fpsm = 27 (8H) // FIXME: berserk fpsm = 27 (8H)
@ -1212,11 +1243,39 @@ void GSState::FlushPrim()
m_perfmon.Put(GSPerfMon::Draw, 1); m_perfmon.Put(GSPerfMon::Draw, 1);
m_perfmon.Put(GSPerfMon::Prim, m_index.tail / GSUtil::GetVertexCount(PRIM->PRIM)); m_perfmon.Put(GSPerfMon::Prim, m_index.tail / GSUtil::GetVertexCount(PRIM->PRIM));
} }
}
m_vertex.head = 0; switch(PRIM->PRIM)
m_vertex.tail = 0; {
m_index.tail = 0; case GS_LINESTRIP:
memcpy(&m_vertex.buff[0], &buff[0], stride);
m_vertex.tail = 1;
break;
case GS_TRIANGLESTRIP:
memcpy(&m_vertex.buff[0], &buff[0], stride * 2);
m_vertex.tail = 2;
break;
case GS_TRIANGLEFAN:
memcpy(&m_vertex.buff[0], &buff[0], stride * 2);
m_vertex.tail = 2;
break;
case GS_POINTLIST:
case GS_LINELIST:
case GS_TRIANGLELIST:
case GS_SPRITE:
case GS_INVALID:
m_vertex.tail = 0;
break;
default:
__assume(0);
}
m_vertex.head = 0;
m_index.tail = 0;
}
else
{
m_vertex.head = m_vertex.tail = 0;
}
} }
// //

2
plugins/GSdx/GSState.h
View File

@ -131,7 +131,7 @@ protected:
GSVertex m_v; GSVertex m_v;
float m_q; float m_q;
struct {uint8* buff; size_t head, tail, maxcount, stride, n;} m_vertex; struct {uint8* buff; size_t head, tail, maxcount, stride, n; uint8* tmp;} m_vertex;
struct {uint32* buff; size_t tail;} m_index; struct {uint32* buff; size_t tail;} m_index;
typedef void (GSState::*DrawingKickPtr)(uint32 skip); typedef void (GSState::*DrawingKickPtr)(uint32 skip);