Skip to content

Commit

Permalink
removes FrameAllocatorMarker usage from GL side _fastTextureLoad
Browse files Browse the repository at this point in the history
Repeatedly caused issues with 4096^2 atlases
  • Loading branch information
Azaezel committed May 7, 2016
1 parent 6caafc9 commit 5a27313
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Engine/source/gfx/gl/gfxGLTextureManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down

0 comments on commit 5a27313

Please sign in to comment.