mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a double to float coercion and JS errors with empty threads in Profiler2 . Refs #4056

Browse Source 
This was SVN commit r18424.
This commit is contained in:
wraitii
2016-06-22 16:46:49 +00:00
parent 3cbe96d24c
commit 490ee7387f
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/ps/Profiler2.cpp
+3 -3
View File
@@ -587,7 +587,7 @@ void rewriteBuffer(u8* buffer, u32& bufferSize)
double curTime = initialTime;
// the region enter
{
CProfiler2::SItem_dt_id item = { curTime, regionName };
CProfiler2::SItem_dt_id item = { (float)curTime, regionName };
buffer[writePos] = (u8)CProfiler2::ITEM_ENTER;
memcpy(buffer + writePos + 1, &item, sizeof(item));
writePos += sizeof(item) + 1;
@@ -597,7 +597,7 @@ void rewriteBuffer(u8* buffer, u32& bufferSize)
// sub-events, aggregated
for (auto& type : timeByType)
{
CProfiler2::SItem_dt_id item = { curTime, std::get<0>(type.second) };
CProfiler2::SItem_dt_id item = { (float)curTime, std::get<0>(type.second) };
buffer[writePos] = (u8)CProfiler2::ITEM_ENTER;
memcpy(buffer + writePos + 1, &item, sizeof(item));
writePos += sizeof(item) + 1;
@@ -628,7 +628,7 @@ void rewriteBuffer(u8* buffer, u32& bufferSize)
}
// Time of computation
{
CProfiler2::SItem_dt_id item = { curTime, "CondenseBuffer" };
CProfiler2::SItem_dt_id item = { (float)curTime, "CondenseBuffer" };
buffer[writePos] = (u8)CProfiler2::ITEM_ENTER;
memcpy(buffer + writePos + 1, &item, sizeof(item));
writePos += sizeof(item) + 1;