Memory: remove a part of the last merge request that causes crashes in multi-threaded mode.

This commit is contained in:
John Kessenich 2016-01-18 11:10:40 -07:00
parent 3e9add360d
commit 28ad350b35
2 changed files with 2 additions and 10 deletions

View file

@ -1613,13 +1613,7 @@ TIntermTyped* TIntermediate::promoteConstantUnion(TBasicType promoteTo, TIntermC
void TIntermAggregate::addToPragmaTable(const TPragmaTable& pTable)
{
assert(!pragmaTable);
// We allocate this with the thread-pool allocator because the destructors
// for TIntermNode's are never called. When TIntermNodes are no longer
// needed, the pool allocator destroys all memory at once without
// destruction.
void* memory = GetThreadPoolAllocator().allocate(sizeof(TPragmaTable));
pragmaTable = new(memory) TPragmaTable();
pragmaTable = new TPragmaTable();
*pragmaTable = pTable;
}