merging latest dev, again, and hopefully dev is not still completely broken

Signed-off-by: kberg-amzn <karlberg@amazon.com>
2021-11-05 19:23:01 -07:00
parent 479ff188a0 3b1c63335a
commit c0e63988d8
3 changed files with 0 additions and 7 deletions
@@ -457,8 +457,6 @@ void JobManagerWorkStealing::ProcessJobsInternal(ThreadInfo* info, Job* suspende
            else
            {
                //attempt to steal a job from another thread's queue
-                AZ_PROFILE_SCOPE(AzCore, "JobManagerWorkStealing::ProcessJobsInternal:WorkStealing");
-
                unsigned int numStealAttempts = 0;
                const unsigned int maxStealAttempts = (unsigned int)m_workerThreads.size() * 3; //try every thread a few times before giving up
                while (!job)
@@ -152,8 +152,6 @@ namespace AZ

        ResultCode FrameScheduler::ImportScopeProducer(ScopeProducer& scopeProducer)
        {
-            AZ_PROFILE_SCOPE(RHI, "FrameScheduler: ImportScopeProducer");
-
            if (!ValidateIsProcessing())
            {
                return RHI::ResultCode::InvalidOperation;
@@ -266,7 +264,6 @@ namespace AZ

            // Execute all queued resource invalidations, which will mark SRG's for compilation.
            {
-                AZ_PROFILE_SCOPE(RHI, "Invalidate Resources");
                ResourceInvalidateBus::ExecuteQueuedEvents();
            }

@@ -216,8 +216,6 @@ namespace AZ

        void RasterPass::CompileResources(const RHI::FrameGraphCompileContext& context)
        {
-            AZ_PROFILE_SCOPE(RPI, "RasterPass: CompileResources");
-
            if (m_shaderResourceGroup == nullptr)
            {
                return;