Merge pull request #1596 from Azaezel/FrameMallocMallet

removes FrameAllocatorMarker usage from GL side _fastTextureLoad
GarageGames · Jun 8, 2016 · b1b235a · b1b235a
2 parents efecbca + 27afd2d
commit b1b235a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Engine/source/gfx/gl/gfxGLTextureManager.cpp b/Engine/source/gfx/gl/gfxGLTextureManager.cpp
@@ -235,10 +235,10 @@ static void _fastTextureLoad(GFXGLTextureObject* texture, GBitmap* pDL)
    if(pDL->getFormat() == GFXFormatR8G8B8A8 || pDL->getFormat() == GFXFormatR8G8B8X8)
    {
       PROFILE_SCOPE(Swizzle32_Upload);
-      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, 0, bufSize, pboMemory );
+      dFree(pboMemory);
    }
    else
    {