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

Merge branch 'development' into cmake/linux_fix_warn_unused

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-20 14:51:35 -07:00
parent ea2f74dc0f c8c29b1aff
commit b96b99363c
241 changed files with 5654 additions and 5352 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/AudioSystem/Code/Source/Engine/AudioSystem.cpp
+3 -3
View File
@@ -616,7 +616,7 @@ namespace Audio
void CAudioSystem::ProcessRequestThreadSafe(CAudioRequestInternal request)
{
// Audio Thread!
AZ_PROFILE_SCOPE(Audio, "Thread-Safe Request: %s", request.ToString().c_str());
AZ_PROFILE_SCOPE(Audio, "Process Thread-Safe Request");
if (m_oATL.CanProcessRequests())
{
@@ -641,7 +641,7 @@ namespace Audio
{
// Todo: This should handle request priority, use request priority as bus Address and process in priority order.
AZ_PROFILE_SCOPE(Audio, "Normal Request: %s", request.ToString().c_str());
AZ_PROFILE_SCOPE(Audio, "Process Normal Request");
AZ_Assert(g_mainThreadId != AZStd::this_thread::get_id(), "AudioSystem::ProcessRequestByPriority - called from Main thread!");
@@ -672,7 +672,7 @@ namespace Audio
{
if (!(request.nInternalInfoFlags & eARIF_WAITING_FOR_REMOVAL))
{
AZ_PROFILE_SCOPE(Audio, "Blocking Request: %s", request.ToString().c_str());
AZ_PROFILE_SCOPE(Audio, "Process Blocking Request");
if (request.eStatus == eARS_NONE)
{