Merge pull request #2937 from aws-lumberyard-dev/AzCore/JobGraph

Resolve size_t conversion werrors
monroegm-disable-blank-issue-2
Jeremy Ong 4 years ago committed by GitHub
commit ca3bc3d343
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -37,7 +37,7 @@ namespace AZ
Task** cursor = m_successors.data(); Task** cursor = m_successors.data();
for (size_t i = 0; i != m_tasks.size(); ++i) for (uint32_t i = 0; i != m_tasks.size(); ++i)
{ {
Task& task = m_tasks[i]; Task& task = m_tasks[i];
task.m_graph = this; task.m_graph = this;

@ -64,8 +64,9 @@ namespace AZ
} }
m_compiledTaskGraph->m_waitEvent = waitEvent; m_compiledTaskGraph->m_waitEvent = waitEvent;
m_compiledTaskGraph->m_remaining = m_compiledTaskGraph->m_tasks.size() + (m_retained ? 1 : 0); uint32_t taskCount = aznumeric_cast<uint32_t>(m_compiledTaskGraph->m_tasks.size());
for (size_t i = 0; i != m_compiledTaskGraph->m_tasks.size(); ++i) m_compiledTaskGraph->m_remaining = taskCount + (m_retained ? 1 : 0);
for (uint32_t i = 0; i != taskCount; ++i)
{ {
m_compiledTaskGraph->m_tasks[i].Init(); m_compiledTaskGraph->m_tasks[i].Init();
} }

@ -46,10 +46,10 @@ namespace AZ
void PrecedesInternal(TaskToken& comesAfter); void PrecedesInternal(TaskToken& comesAfter);
// Only the TaskGraph should be creating TaskToken // Only the TaskGraph should be creating TaskToken
TaskToken(TaskGraph& parent, size_t index); TaskToken(TaskGraph& parent, uint32_t index);
TaskGraph& m_parent; TaskGraph& m_parent;
size_t m_index; uint32_t m_index;
}; };
// A TaskGraphEvent may be used to block until a task graph has finished executing. Usage // A TaskGraphEvent may be used to block until a task graph has finished executing. Usage

@ -10,7 +10,7 @@
namespace AZ namespace AZ
{ {
inline TaskToken::TaskToken(TaskGraph& parent, size_t index) inline TaskToken::TaskToken(TaskGraph& parent, uint32_t index)
: m_parent{ parent } : m_parent{ parent }
, m_index{ index } , m_index{ index }
{ {
@ -50,7 +50,7 @@ namespace AZ
m_tasks.emplace_back(desc, AZStd::forward<Lambda>(lambda)); m_tasks.emplace_back(desc, AZStd::forward<Lambda>(lambda));
return { *this, m_tasks.size() - 1 }; return { *this, aznumeric_cast<uint32_t>(m_tasks.size() - 1) };
} }
template <typename... Lambdas> template <typename... Lambdas>

Loading…
Cancel
Save