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

merging from development + fixing linux

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
pappeste
2021-06-24 18:10:14 -07:00
committed by Esteban Papp
parent 20a4ec9b7d
commit 95914e3fd6
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactSourceCoveringTestsSerializer.cpp
+2 -2
View File
@@ -50,8 +50,8 @@ namespace TestImpact
AZStd::vector<AZStd::string> coveringTests;
sourceCoveringTests.reserve(1U << 16); // Reserve for approx. 65k source files
const AZStd::string delim = "\n";
auto start = 0U;
auto end = sourceCoveringTestsListString.find(delim);
size_t start = 0U;
size_t end = sourceCoveringTestsListString.find(delim);
while (end != AZStd::string::npos)
{
Gems/AWSMetrics/Code/Source/MetricsManager.cpp
+1 -1
View File
@@ -256,7 +256,7 @@ namespace AWSMetrics
}
m_globalStats.m_numSuccesses++;
m_globalStats.m_sendSizeInBytes += static_cast<AZStd::atomic<uint32_t>::value_type>(metricsEvent.GetSizeInBytes());
m_globalStats.m_sendSizeInBytes += static_cast<uint32_t>(metricsEvent.GetSizeInBytes());
}
else
{
Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAsset.cpp
+1 -1
View File
@@ -516,7 +516,7 @@ namespace AZ
SupervariantIndex ShaderAsset::GetSupervariantIndexInternal(AZ::Name supervariantName) const
{
const auto& supervariants = GetCurrentShaderApiData().m_supervariants;
const uint32_t supervariantCount = supervariants.size();
const uint32_t supervariantCount = static_cast<uint32_t>(supervariants.size());
for (uint32_t index = 0; index < supervariantCount; ++index)
{
if (supervariants[index].m_name == supervariantName)
Gems/Vegetation/Code/Source/AreaSystemComponent.cpp
+3 -3
View File
@@ -1010,7 +1010,7 @@ namespace Vegetation
if (m_debugData)
{
m_debugData->m_areaTaskQueueCount.store(static_cast<AZStd::atomic_int::value_type>(m_vegetationThreadTasks.size()), AZStd::memory_order_relaxed);
m_debugData->m_areaTaskQueueCount.store(static_cast<int>(m_vegetationThreadTasks.size()), AZStd::memory_order_relaxed);
}
}
@@ -1025,8 +1025,8 @@ namespace Vegetation
if (m_debugData)
{
m_debugData->m_areaTaskQueueCount.store(static_cast<AZStd::atomic_int::value_type>(m_vegetationThreadTasks.size()), AZStd::memory_order_relaxed);
m_debugData->m_areaTaskActiveCount.store(static_cast<AZStd::atomic_int::value_type>(tasks.size()), AZStd::memory_order_relaxed);
m_debugData->m_areaTaskQueueCount.store(static_cast<int>(m_vegetationThreadTasks.size()), AZStd::memory_order_relaxed);
m_debugData->m_areaTaskActiveCount.store(static_cast<int>(tasks.size()), AZStd::memory_order_relaxed);
}
}
Gems/Vegetation/Code/Source/InstanceSystemComponent.cpp
+2 -2
View File
@@ -483,7 +483,7 @@ namespace Vegetation
AZStd::lock_guard<decltype(m_instanceMapMutex)> scopedLock(m_instanceMapMutex);
AZ_Assert(m_instanceMap.find(instanceData.m_instanceId) == m_instanceMap.end(), "InstanceId %llu is already in use!", instanceData.m_instanceId);
m_instanceMap[instanceData.m_instanceId] = AZStd::make_pair(instanceData.m_descriptorPtr, opaqueInstanceData);
m_instanceCount = static_cast<AZStd::atomic_int::value_type>(m_instanceMap.size());
m_instanceCount = static_cast<int>(m_instanceMap.size());
}
}
@@ -503,7 +503,7 @@ namespace Vegetation
opaqueInstanceData = instanceItr->second.second;
m_instanceMap.erase(instanceItr);
}
m_instanceCount = static_cast<AZStd::atomic_int::value_type>(m_instanceMap.size());
m_instanceCount = static_cast<int>(m_instanceMap.size());
}
if (opaqueInstanceData)