TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-06 22:10:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

removes FrameAllocatorMarker usage from GL side _fastTextureLoad

Browse source 
Repeatedly caused issues with 4096^2 atlases
This commit is contained in:
Azaezel 2016-05-06 19:35:40 -05:00
parent 6caafc9844
commit 5a27313e14
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Engine/source/gfx/gl/gfxGLTextureManager.cpp
View file

@ -234,10 +234,10 @@ static void _fastTextureLoad(GFXGLTextureObject* texture, GBitmap* pDL)
if(pDL->getFormat() == GFXFormatR8G8B8A8 || pDL->getFormat() == GFXFormatR8G8B8X8)
{
FrameAllocatorMarker mem;
U8* pboMemory = (U8*)mem.alloc(bufSize);
U8* pboMemory = (U8*)dMalloc(bufSize);
GFX->getDeviceSwizzle32()->ToBuffer(pboMemory, pDL->getBits(0), bufSize);
glBufferSubData(GL_PIXEL_UNPACK_BUFFER_ARB, 0, bufSize, pboMemory );
dFree(pboMemory);
}
else
{