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

more fixes

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 10:09:44 -07:00
parent cf6c7c4d8d
commit a35464ca08
43 changed files with 28 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiCpuProfiler.inl
+2 -5
View File
@@ -367,14 +367,12 @@ namespace AZ
const AZ::RHI::CpuTimingStatistics& cpuTimingStatistics = m_cpuTimingStatisticsWhenPause;
const AZStd::sys_time_t ticksPerSecond = AZStd::GetTimeTicksPerSecond();
const auto ShowTimeInMs = [ticksPerSecond](AZStd::sys_time_t duration)
const auto ShowTimeInMs = [](AZStd::sys_time_t duration)
{
ImGui::Text("%.2f ms", CpuProfilerImGuiHelper::TicksToMs(duration));
};
const auto ShowRow = [ticksPerSecond, &ShowTimeInMs](const char* regionLabel, AZStd::sys_time_t duration)
const auto ShowRow = [&ShowTimeInMs](const char* regionLabel, AZStd::sys_time_t duration)
{
ImGui::Text(regionLabel);
ImGui::NextColumn();
@@ -591,7 +589,6 @@ namespace AZ
else if (io.MouseWheel != 0 && io.KeyCtrl) // Zooming
{
// We want zooming to be relative to the mouse's current position
const float mouseVel = io.MouseWheel;
const float mouseX = ImGui::GetMousePos().x;
// Find the normalized position of the cursor relative to the window
Gems/Atom/Utils/Code/Include/Atom/Utils/ImGuiGpuProfiler.inl
+1 -1
View File
@@ -1333,7 +1333,7 @@ namespace AZ
inline PassEntry* ImGuiGpuProfiler::CreatePassEntries(RHI::Ptr<RPI::ParentPass> rootPass)
{
AZStd::unordered_map<Name, PassEntry> passEntryDatabase;
const auto addPassEntry = [&passEntryDatabase, this](const RPI::Pass* pass, PassEntry* parent) -> PassEntry*
const auto addPassEntry = [&passEntryDatabase](const RPI::Pass* pass, PassEntry* parent) -> PassEntry*
{
// If parent a nullptr, it's assumed to be the rootpass.
if (parent == nullptr)
Gems/Atom/Utils/Code/Include/Atom/Utils/StableDynamicArray.inl
+2 -2
View File
@@ -305,7 +305,7 @@ namespace AZ
template<typename T, size_t ElementsPerPage, class Allocator>
size_t StableDynamicArray<T, ElementsPerPage, Allocator>::Page::Reserve()
{
for (m_bitStartIndex; m_bitStartIndex < NumUint64_t; ++m_bitStartIndex)
for (; m_bitStartIndex < NumUint64_t; ++m_bitStartIndex)
{
if (m_bits[m_bitStartIndex] != FullBits)
{
@@ -462,7 +462,7 @@ namespace AZ
}
// skip the empty bitfields in the page
for (m_bitGroupIndex; m_bitGroupIndex < Page::NumUint64_t && m_page->m_bits.at(m_bitGroupIndex) == 0; ++m_bitGroupIndex)
for (; m_bitGroupIndex < Page::NumUint64_t && m_page->m_bits.at(m_bitGroupIndex) == 0; ++m_bitGroupIndex)
{
}