From f82b3292919cad5a8915baf2f4ae96daf5360c27 Mon Sep 17 00:00:00 2001
From: rgba16f <82187279+rgba16f@users.noreply.github.com>
Date: Wed, 15 Dec 2021 15:06:05 -0600
Subject: [PATCH] Minor optimizations from profiling. (#6416)

Remove noisy profile marker in the SRG validator
Make the SRG compile marker say which srg is being compiled
Move some dx12 validation code behind the AZ_RHI_ENABLE_VALIDATION define

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
---
 Gems/Atom/RHI/Code/Source/RHI/CommandListValidator.cpp    | 1 -
 Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupPool.cpp | 4 ++--
 Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h          | 4 +++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Gems/Atom/RHI/Code/Source/RHI/CommandListValidator.cpp b/Gems/Atom/RHI/Code/Source/RHI/CommandListValidator.cpp
index 58c2136e2f..ec5220aeeb 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/CommandListValidator.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/CommandListValidator.cpp
@@ -56,7 +56,6 @@ namespace AZ
             {
                 return true;
             }
-            AZ_PROFILE_FUNCTION(RHI);
             ValidateViewContext context;
             context.m_scopeName = m_scope->GetId().GetCStr();
             context.m_srgName = shaderResourceGroup.GetName().GetCStr();
diff --git a/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupPool.cpp
index 3209a30f1a..5d1da487ab 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupPool.cpp
@@ -248,8 +248,6 @@ namespace AZ
 
         void ShaderResourceGroupPool::CompileGroupsForInterval(Interval interval)
         {
-            AZ_PROFILE_SCOPE(RHI, "CompileGroupsForInterval");
-
             AZ_Assert(m_isCompiling, "You must call CompileGroupsBegin() first!");
             AZ_Assert(
                 interval.m_max >= interval.m_min &&
@@ -259,6 +257,8 @@ namespace AZ
             for (uint32_t i = interval.m_min; i < interval.m_max; ++i)
             {
                 ShaderResourceGroup* group = m_groupsToCompile[i];
+                AZ_PROFILE_SCOPE(RHI, "CompileGroupsForInterval %s", group->GetName().GetCStr());
+
                 CompileGroupInternal(*group, group->GetData());
                 group->m_isQueuedForCompile = false;
             }
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h
index 1472cdc80e..da71d669b4 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.h
@@ -390,7 +390,6 @@ namespace AZ
             }
 
             const PipelineLayout& pipelineLayout = pipelineState->GetPipelineLayout();
-            const RHI::PipelineLayoutDescriptor& pipelineLayoutDescriptor = pipelineLayout.GetPipelineLayoutDescriptor();
 
             // Pull from slot bindings dictated by the pipeline layout. Re-bind anything that has changed
             // at the flat index level.
@@ -499,12 +498,15 @@ namespace AZ
                     }
                 }
 
+#if defined (AZ_RHI_ENABLE_VALIDATION)
                 if (updatePipelineState || updateSRG)
                 {
+                    const RHI::PipelineLayoutDescriptor& pipelineLayoutDescriptor = pipelineLayout.GetPipelineLayoutDescriptor();
                     m_validator.ValidateShaderResourceGroup(
                         *shaderResourceGroup,
                         pipelineLayoutDescriptor.GetShaderResourceGroupBindingInfo(srgIndex));
                 }
+#endif
             }
             return true;
         }