Merge pull request #6223 from aws-lumberyard-dev/Atom/PixEventsOnIfDllLoaded

Enable Pix markers if the Pix DLL is loaded
2021-12-07 15:21:58 -07:00
parent 577280cc11 2d1d9f1f5c
commit c27a22abd4
1 changed files with 2 additions and 1 deletions
@@ -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
        }