Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix crash after opening profiler2 with GPU profiling following 3cbe96d24c. Refs #4056

Browse Source 
This was SVN commit r18435.
This commit is contained in:
wraitii 2016-06-25 09:11:10 +00:00
parent 98f8541581
commit c886206d96
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/ps/Profiler2GPU.cpp
View File

@ -250,7 +250,7 @@ private:
if (frame.events[i].isEnter)
m_Storage.Record(CProfiler2::ITEM_ENTER, t, frame.events[i].id);
else
m_Storage.Record(CProfiler2::ITEM_LEAVE, t, frame.events[i].id);
m_Storage.RecordLeave(t);
// Associate the frame number with the "frame" region
if (i == 0)
@ -402,7 +402,7 @@ private:
if (frame.events[i].isEnter)
m_Storage.Record(CProfiler2::ITEM_ENTER, t, frame.events[i].id);
else
m_Storage.Record(CProfiler2::ITEM_LEAVE, t, frame.events[i].id);
m_Storage.RecordLeave(t);
// Associate the frame number with the "frame" region
if (i == 0)
@ -690,7 +690,7 @@ private:
}
else
{
debug_warn(L"unrecognised Intel performance counter type");
//debug_warn(L"unrecognised Intel performance counter type");
}
}
@ -703,7 +703,7 @@ private:
{
lastTime = endTimes.top();
endTimes.pop();
m_Storage.Record(CProfiler2::ITEM_LEAVE, lastTime, frame.events[i].id);
m_Storage.RecordLeave(lastTime);
}
}