birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Profiler: fix build error due to cast on Mac (#2003)

Browse Source 
Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
This commit is contained in:
Jacob Hilliard
2021-07-08 16:47:42 -07:00
committed by GitHub
parent 18d490f059
commit 7362d461c0
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.inl
+6 -8
View File
@@ -25,17 +25,15 @@ namespace AZ
{
// NOTE: Fix build error in case AZStd::thread_id is not of an arithmetic type, and instead a pointer
template<typename ThreadId, typename AZStd::enable_if<AZStd::is_pointer<ThreadId>::value>::type* = nullptr>
void TextThreadId(ThreadId threadId)
AZStd::string TextThreadId(ThreadId threadId)
{
const AZStd::string threadIdText = AZStd::string::format("Thread: %p", threadId);
ImGui::Text(threadIdText.c_str());
return AZStd::string::format("Thread: %p", threadId);
}
template<typename ThreadId, typename AZStd::enable_if<!AZStd::is_pointer<ThreadId>::value>::type* = nullptr>
void TextThreadId(ThreadId threadId)
AZStd::string TextThreadId(ThreadId threadId)
{
const AZStd::string threadIdText = AZStd::string::format("Thread: %zu", static_cast<size_t>(threadId));
ImGui::Text(threadIdText.c_str());
return AZStd::string::format("Thread: %zu", static_cast<size_t>(threadId));
}
inline float TicksToMs(AZStd::sys_time_t ticks)
{
@@ -108,7 +106,7 @@ namespace AZ
for (ThreadRegionEntry& entry : entries)
{
CpuProfilerImGuiHelper::TextThreadId(entry.m_threadId.m_id);
ImGui::Text(CpuProfilerImGuiHelper::TextThreadId(entry.m_threadId.m_id).c_str());
const AZStd::sys_time_t elapsed = entry.m_endTick - entry.m_startTick;
ShowTimeInMs(elapsed);
@@ -610,7 +608,7 @@ namespace AZ
{
auto [wx, wy] = ImGui::GetWindowPos();
wy -= ImGui::GetScrollY();
const AZStd::string threadIdText = AZStd::string::format("Thread %zu", static_cast<size_t>(threadId.m_id));
const AZStd::string threadIdText = CpuProfilerImGuiHelper::TextThreadId(threadId.m_id);
ImGui::GetWindowDrawList()->AddText({ wx + 10, wy + baseRow * RowHeight + 5 }, IM_COL32_WHITE, threadIdText.c_str());
}