Merge branch 'development' into redcode/driller_removal

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-12-03 13:35:16 -08:00
parent 4c16bf7587 1ae18faf9f
commit 03adf700fe
478 changed files with 7537 additions and 7933 deletions
@@ -63,8 +63,9 @@ namespace AZ
 #if defined(USE_RENDERDOC)
            // If RenderDoc is requested, we need to load the library as early as possible (before device queries/factories are made)
            bool enableRenderDoc = RHI::QueryCommandLineOption("enableRenderDoc");
+#if defined(USE_PIX)
            s_pixGpuMarkersEnabled = s_pixGpuMarkersEnabled || enableRenderDoc;
-
+#endif
            if (enableRenderDoc && AZ_TRAIT_RENDERDOC_MODULE && !s_renderDocModule)
            {
                s_renderDocModule = DynamicModuleHandle::Create(AZ_TRAIT_RENDERDOC_MODULE);