From 2d1d9f1f5ca893d1e68d3cd541496b24429fde4c Mon Sep 17 00:00:00 2001 From: Jeremy Ong Date: Tue, 7 Dec 2021 10:32:09 -0700 Subject: [PATCH] Enable Pix markers if the Pix DLL is loaded Fixes a regression introduced when Nsight Pix markers were enabled. Signed-off-by: Jeremy Ong --- Gems/Atom/RHI/Code/Source/RHI/Factory.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp b/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp index ce0f4ce44b..e63c8d3bde 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp @@ -123,7 +123,8 @@ namespace AZ //Pix dll can still be injected even if we do not pass in enablePixGPU. This can be done if we launch the app from Pix. s_isPixGpuCaptureDllLoaded = Platform::IsPixDllInjected(AZ_TRAIT_PIX_MODULE); - s_pixGpuMarkersEnabled = s_pixGpuMarkersEnabled || RHI::QueryCommandLineOption("enablePixGpuMarkers"); + s_pixGpuMarkersEnabled = + s_pixGpuMarkersEnabled || RHI::QueryCommandLineOption("enablePixGpuMarkers") || s_isPixGpuCaptureDllLoaded; #endif }