mirror of https://github.com/PCSX2/pcsx2.git
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:
parent
b99aa05cbf
commit
ab1f4f99af
plugins/GSdx
|
@ -130,7 +130,7 @@ protected:
|
|||
}
|
||||
else // very bad!
|
||||
{
|
||||
printf("GSdx: failed to allocate %d bytes for verticles. We will proceed to crash now.\n", sizeof(Vertex) * maxcount);
|
||||
printf("GSdx: failed to allocate %d bytes for verticles.\n", sizeof(Vertex) * maxcount);
|
||||
}
|
||||
|
||||
m_vertices = vertices;
|
||||
|
|
|
@ -1212,7 +1212,9 @@ EXPORT_C GSBenchmark(HWND hwnd, HINSTANCE hinst, LPSTR lpszCmdLine, int nCmdShow
|
|||
|
||||
if(1)
|
||||
{
|
||||
GSLocalMemory mem;
|
||||
GSLocalMemory * pMem = new GSLocalMemory();
|
||||
GSLocalMemory& mem(*pMem);
|
||||
|
||||
|
||||
static struct {int psm; const char* name;} s_format[] =
|
||||
{
|
||||
|
@ -1360,13 +1362,15 @@ EXPORT_C GSBenchmark(HWND hwnd, HINSTANCE hinst, LPSTR lpszCmdLine, int nCmdShow
|
|||
}
|
||||
|
||||
_aligned_free(ptr);
|
||||
delete pMem;
|
||||
}
|
||||
|
||||
//
|
||||
|
||||
if(0)
|
||||
{
|
||||
GSLocalMemory mem;
|
||||
GSLocalMemory * pMem2 = new GSLocalMemory();
|
||||
GSLocalMemory& mem2(*pMem2);
|
||||
|
||||
uint8* ptr = (uint8*)_aligned_malloc(1024 * 1024 * 4, 32);
|
||||
|
||||
|
@ -1397,7 +1401,8 @@ EXPORT_C GSBenchmark(HWND hwnd, HINSTANCE hinst, LPSTR lpszCmdLine, int nCmdShow
|
|||
int x = 0;
|
||||
int y = 0;
|
||||
|
||||
(mem.*wi)(x, y, ptr, trlen, BITBLTBUF, TRXPOS, TRXREG);
|
||||
(mem2.*wi)(x, y, ptr, trlen, BITBLTBUF, TRXPOS, TRXREG);
|
||||
delete pMem2;
|
||||
}
|
||||
|
||||
//
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue