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

GFX3D: 

- Workaround a bug specific to GCC v4.9 where allocating the VERTLIST blocks would cause a std::bad_alloc exception. (Fixes bug #1438.)
This commit is contained in:
rogerman 2015-03-18 03:25:14 +00:00
parent 5bab1a14f3
commit bfe105a188
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
desmume/src/gfx3d.cpp
View File

@ -521,8 +521,22 @@ void gfx3d_init()
//printf("SPEED TEST %d %d\n",diff,diff2);
if(polylists == NULL) { polylists = new POLYLIST[2]; polylist = &polylists[0]; }
if(vertlists == NULL) { vertlists = new VERTLIST[2]; vertlist = &vertlists[0]; }
// Use malloc() instead of new because, for some unknown reason, GCC 4.9 has a bug
// that causes a std::bad_alloc exception on certain memory allocations. Right now,
// POLYLIST and VERTLIST are POD-style structs, so malloc() can substitute for new
// in this case.
if(polylists == NULL)
{
polylists = (POLYLIST *)malloc(sizeof(POLYLIST)*2);
polylist = &polylists[0];
}
if(vertlists == NULL)
{
vertlists = (VERTLIST *)malloc(sizeof(VERTLIST)*2);
vertlist = &vertlists[0];
}
makeTables();
gfx3d_reset();
}