Merge pull request #1596 from Azaezel/FrameMallocMallet

Areloch · Areloch · commit b1b235a4c3ab · 2016-06-08T09:40:32.000-05:00
removes FrameAllocatorMarker usage from GL side _fastTextureLoad
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
    {

Original file line number	Diff line number	Diff line change
`@@ -235,10 +235,10 @@ static void _fastTextureLoad(GFXGLTextureObject* texture, GBitmap* pDL)`
`235`	`235`	`if(pDL->getFormat() == GFXFormatR8G8B8A8 \|\| pDL->getFormat() == GFXFormatR8G8B8X8)`
`236`	`236`	`{`
`237`	`237`	`PROFILE_SCOPE(Swizzle32_Upload);`
`238`		`- FrameAllocatorMarker mem;`
`239`		`- U8* pboMemory = (U8*)mem.alloc(bufSize);`
	`238`	`+ U8* pboMemory = (U8*)dMalloc(bufSize);`
`240`	`239`	`GFX->getDeviceSwizzle32()->ToBuffer(pboMemory, pDL->getBits(0), bufSize);`
`241`	`240`	`glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, bufSize, pboMemory );`
	`241`	`+ dFree(pboMemory);`
`242`	`242`	`}`
`243`	`243`	`else`
`244`	`244`	`{`