From 6f074f2f9ffa54603d6f829fabe793473d01e336 Mon Sep 17 00:00:00 2001 From: antonmic <56370189+antonmic@users.noreply.github.com> Date: Thu, 2 Dec 2021 11:03:53 -0800 Subject: [PATCH 1/2] Fixing build fail when Renderdoc is enabled Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com> --- Gems/Atom/RHI/Code/Source/RHI/Factory.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp b/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp index 9146175252..2d714ed551 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp @@ -15,6 +15,7 @@ #if defined(USE_RENDERDOC) || defined(USE_PIX) #include #include +static bool s_pixGpuMarkersEnabled = false; #endif #if defined(USE_RENDERDOC) @@ -26,7 +27,6 @@ static bool s_isRenderDocDllLoaded = false; #if defined(USE_PIX) static AZStd::unique_ptr s_pixModule; static bool s_isPixGpuCaptureDllLoaded = false; -static bool s_pixGpuMarkersEnabled = false; #endif static bool s_usingWarpDevice = false; @@ -208,7 +208,7 @@ namespace AZ bool Factory::PixGpuEventsEnabled() { -#if defined(USE_PIX) +#if defined(USE_PIX) || defined(USE_RENDERDOC) return s_pixGpuMarkersEnabled; #else return false; From 51794f9c5286820d3c78383d484fb70d96c299f8 Mon Sep 17 00:00:00 2001 From: antonmic <56370189+antonmic@users.noreply.github.com> Date: Thu, 2 Dec 2021 11:24:11 -0800 Subject: [PATCH 2/2] Changing fix after offline discussion Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com> --- Gems/Atom/RHI/Code/Source/RHI/Factory.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp b/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp index 2d714ed551..ce0f4ce44b 100644 --- a/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp +++ b/Gems/Atom/RHI/Code/Source/RHI/Factory.cpp @@ -15,7 +15,6 @@ #if defined(USE_RENDERDOC) || defined(USE_PIX) #include #include -static bool s_pixGpuMarkersEnabled = false; #endif #if defined(USE_RENDERDOC) @@ -27,6 +26,7 @@ static bool s_isRenderDocDllLoaded = false; #if defined(USE_PIX) static AZStd::unique_ptr s_pixModule; static bool s_isPixGpuCaptureDllLoaded = false; +static bool s_pixGpuMarkersEnabled = false; #endif static bool s_usingWarpDevice = false; @@ -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); @@ -208,7 +209,7 @@ namespace AZ bool Factory::PixGpuEventsEnabled() { -#if defined(USE_PIX) || defined(USE_RENDERDOC) +#if defined(USE_PIX) return s_pixGpuMarkersEnabled; #else return false;