From 5a27313e146beaea9ec03b82855f7736d1350d0b Mon Sep 17 00:00:00 2001 From: Azaezel Date: Fri, 6 May 2016 19:35:40 -0500 Subject: [PATCH] removes FrameAllocatorMarker usage from GL side _fastTextureLoad Repeatedly caused issues with 4096^2 atlases --- Engine/source/gfx/gl/gfxGLTextureManager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Engine/source/gfx/gl/gfxGLTextureManager.cpp b/Engine/source/gfx/gl/gfxGLTextureManager.cpp index 70a5e43038..478465bf4d 100644 --- a/Engine/source/gfx/gl/gfxGLTextureManager.cpp +++ b/Engine/source/gfx/gl/gfxGLTextureManager.cpp @@ -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 {