From d5e6ec5758f910b22f38611d78efa81567981850 Mon Sep 17 00:00:00 2001
From: rgba16f <82187279+rgba16f@users.noreply.github.com>
Date: Wed, 22 Dec 2021 11:30:32 -0600
Subject: [PATCH] Change the nvidia Aftermath integration to use c strings
 directly rather than convert to an AZStd::string (#6535)

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
---
 .../Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp | 6 +++---
 Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp      | 2 +-
 Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h        | 2 +-
 Gems/Atom/RHI/DX12/Code/Source/RHI/NsightAftermath.h        | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp
index 199efbb139..429fded6ad 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp
@@ -53,14 +53,14 @@ namespace Aftermath
 #endif
     }
 
-    void SetAftermathEventMarker( [[maybe_unused]] void* cntxHandle, [[maybe_unused]] const AZStd::string& markerData, [[maybe_unused]] bool isAftermathInitialized)
+    void SetAftermathEventMarker( [[maybe_unused]] void* cntxHandle, [[maybe_unused]] const char* markerData, [[maybe_unused]] bool isAftermathInitialized)
     {
 #if defined(USE_NSIGHT_AFTERMATH)
         if (isAftermathInitialized)
         {
             GFSDK_Aftermath_Result result = GFSDK_Aftermath_SetEventMarker(
-                static_cast<GFSDK_Aftermath_ContextHandle>(cntxHandle), static_cast<const void*>(markerData.c_str()),
-                static_cast<unsigned int>(markerData.size()) + 1);
+                static_cast<GFSDK_Aftermath_ContextHandle>(cntxHandle), static_cast<const void*>(markerData),
+                static_cast<unsigned int>(strlen(markerData) + 1);
             AssertOnError(result);
         }
 #endif
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp
index 9733045179..35f52b3930 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp
@@ -85,7 +85,7 @@ namespace AZ
             return m_hardwareQueueClass;
         }
 
-        void CommandListBase::SetAftermathEventMarker(const AZStd::string& markerData)
+        void CommandListBase::SetAftermathEventMarker(const char* markerData)
         {
             auto& device = static_cast<Device&>(GetDevice());
             Aftermath::SetAftermathEventMarker(m_aftermathCommandListContext, markerData, device.IsAftermathInitialized());
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h
index 5f3e4dce1e..d2ad804524 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h
@@ -52,7 +52,7 @@ namespace AZ
 
             RHI::HardwareQueueClass GetHardwareQueueClass() const;
 
-            void SetAftermathEventMarker(const AZStd::string& markerData);
+            void SetAftermathEventMarker(const char* markerData);
 
         protected:
             void Init(Device& device, RHI::HardwareQueueClass hardwareQueueClass, ID3D12CommandAllocator* commandAllocator);
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/NsightAftermath.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/NsightAftermath.h
index a486822309..bce293ad29 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/NsightAftermath.h
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/NsightAftermath.h
@@ -15,6 +15,7 @@
 namespace Aftermath
 {
     void SetAftermathEventMarker(void* cntxHandle, const AZStd::string& markerData, bool isAftermathInitialized);
+    void SetAftermathEventMarker(void* cntxHandle, const char* markerData, bool isAftermathInitialized);
     bool InitializeAftermath(AZ::RHI::Ptr<ID3D12DeviceX> dx12Device);
     void* CreateAftermathContextHandle(ID3D12GraphicsCommandList* commandList, void* crashTracker);
     void OutputLastScopeExecutingOnGPU(void* crashTracker);