Small round of patches for various issues, #2.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5831 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2.code
2014-01-25 15:53:31 +00:00
parent b99aa05cbf
commit ab1f4f99af
3 changed files with 19 additions and 6 deletions
+10 -2
View File
@@ -2300,19 +2300,27 @@ void GSState::GrowVertexBuffer()
GSVertex* vertex = (GSVertex*)_aligned_malloc(sizeof(GSVertex) * maxcount, 32);
uint32* index = (uint32*)_aligned_malloc(sizeof(uint32) * maxcount * 3, 32); // worst case is slightly less than vertex number * 3
if(m_vertex.buff != NULL)
if (m_vertex.buff != NULL && vertex != NULL)
{
memcpy(vertex, m_vertex.buff, sizeof(GSVertex) * m_vertex.tail);
_aligned_free(m_vertex.buff);
}
else // very bad!
{
printf("GSdx: failed to allocate %d bytes for verticles.\n", sizeof(GSVertex) * maxcount);
}
if(m_index.buff != NULL)
if (m_index.buff != NULL && index != NULL)
{
memcpy(index, m_index.buff, sizeof(uint32) * m_index.tail);
_aligned_free(m_index.buff);
}
else // very bad!
{
printf("GSdx: failed to allocate %d bytes for indices.\n", sizeof(uint32) * maxcount * 3);
}
m_vertex.buff = vertex;
m_vertex.maxcount = maxcount - 3; // -3 to have some space at the end of the buffer before DrawingKick can grow it