refactor

Author: devsh

3rdparty/ngfx/ngfx.cmake

@@ -5,11 +5,12 @@ option(NBL_BUILD_WITH_NGFX "Enable NGFX build" OFF)
 # then you can pick SDK version with "NGFX_SDK_VERSION" cache variable (CMake GUI list supported)
 
 if(NBL_BUILD_WITH_NGFX)
-    if(NOT DEFINED ENV{NGFX_SDK})
-        message(FATAL_ERROR "\"NGFX_SDK\" environment variable must be defined to build with NBL_BUILD_WITH_NGFX enabled!")
+    if(NOT DEFINED NGFX_SDK)
+        if(NOT DEFINED ENV{NGFX_SDK})
+            message(FATAL_ERROR "\"NGFX_SDK\" environment variable must be defined to build with NBL_BUILD_WITH_NGFX enabled!")
+        endif()
+        set(NGFX_SDK "$ENV{NGFX_SDK}")
     endif()
-
-    set(NGFX_SDK "$ENV{NGFX_SDK}")
     cmake_path(NORMAL_PATH NGFX_SDK OUTPUT_VARIABLE NGFX_SDK)
 
     if(NOT EXISTS "${NGFX_SDK}")

examples_tests

@@ -20,7 +20,6 @@ class IPhysicalDevice;
 class NBL_API2 IAPIConnection : public core::IReferenceCounted
 {
     public:
-
         // Equivalent to Instance Extensions and Layers
         // Any device feature that has an api connection feature dependency that is not enabled is considered to be unsupported,
         //  for example you need to enable E_SWAPCHAIN_MODE::ESM_SURFACE in order for the physical device to report support in SPhysicalDeviceFeatures::swapchainMode
@@ -60,39 +59,35 @@ class NBL_API2 IAPIConnection : public core::IReferenceCounted
 
         const SFeatures& getEnabledFeatures() const { return m_enabledFeatures; }
 
-        enum SDebuggerType
+        //
+        enum class EDebuggerType : uint8_t
         {
-            EDT_NONE,
-            EDT_RENDERDOC,
-            EDT_NGFX
+            None,
+            Renderdoc,
+            NSight
         };
-        const SDebuggerType isRunningInGraphicsDebugger() const { return m_debuggerType; }
+        inline EDebuggerType runningInGraphicsDebugger() const {return m_debugger;}
+        inline bool isRunningInGraphicsDebugger() const {return m_debugger!=EDebuggerType::None;}
+
+        //
         virtual bool startCapture() = 0;
         virtual bool endCapture() = 0;
 
     protected:
         IAPIConnection(const SFeatures& enabledFeatures);
 
-        std::vector<std::unique_ptr<IPhysicalDevice>> m_physicalDevices;
-        SDebuggerType m_debuggerType;
-        renderdoc_api_t* m_rdoc_api;
+        bool loadRenderdoc();
 
-        struct SNGFXIntegration 
-        {
-            SNGFXIntegration();
+        bool loadNGFX() const;
+        void executeNGFXCommand();
 
-            bool useNGFX = false;
 
-            bool injectNGFXToProcess();
-            bool executeNGFXCommand();
-            inline bool isAPILoaded() { return m_loaded; }
-        private:
-            const bool m_loaded;
-        };
-        using ngfx_api_t = SNGFXIntegration;
-        ngfx_api_t m_ngfx_api;
+        std::vector<std::unique_ptr<IPhysicalDevice>> m_physicalDevices;
 
         SFeatures m_enabledFeatures = {};
+        
+        EDebuggerType m_debugger = EDebuggerType::None;
+        renderdoc_api_t* m_rdoc_api = nullptr;
 };
 
 }

include/nbl/video/IAPIConnection.h

@@ -323,31 +323,30 @@ CVulkanConnection::~CVulkanConnection()
 
 bool CVulkanConnection::startCapture()
 {
-    auto debugType = isRunningInGraphicsDebugger();
-    if (debugType == EDT_NONE)
-        return false;
-    if (flag.test())
+    if (flag.test_and_set())
     {
         auto logger = m_debugCallback->getLogger();
         if(logger)
             logger->log("Only one capture can be running at a time.", system::ILogger::ELL_ERROR);
 
         return false;
     }
-
-    flag.test_and_set();
-    if (debugType == EDT_RENDERDOC)
-        m_rdoc_api->StartFrameCapture(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(m_vkInstance), NULL);
-    else
-        m_ngfx_api.executeNGFXCommand();
+    switch (runningInGraphicsDebugger())
+    {
+        case EDebuggerType::Renderdoc:
+            m_rdoc_api->StartFrameCapture(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(m_vkInstance),NULL);
+            break;
+        case EDebuggerType::NSight:
+            executeNGFXCommand();
+            break;
+        default:
+            return false;
+    }
     return true;
 }
 
 bool CVulkanConnection::endCapture()
 {
-    auto debugType = isRunningInGraphicsDebugger();
-    if (debugType == EDT_NONE)
-        return false;
     if (!flag.test())
     {
         auto logger = m_debugCallback->getLogger();
@@ -356,11 +355,19 @@ bool CVulkanConnection::endCapture()
 
         return false;
     }
-
-    if (debugType == EDT_RENDERDOC)
-        m_rdoc_api->EndFrameCapture(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(m_vkInstance), NULL);
-    // no equivalent end frame capture for ngfx, ends captures on next frame delimiter
-    // see https://www.reddit.com/r/GraphicsProgramming/comments/w0hl9o/graphics_debugger_record_before_first_frame/
+    switch (runningInGraphicsDebugger())
+    {
+        case EDebuggerType::Renderdoc:
+            m_rdoc_api->EndFrameCapture(RENDERDOC_DEVICEPOINTER_FROM_VKINSTANCE(m_vkInstance),nullptr);
+            break;
+        case EDebuggerType::NSight:
+            // no equivalent end frame capture for ngfx, ends captures on next frame delimiter
+            // see https://www.reddit.com/r/GraphicsProgramming/comments/w0hl9o/graphics_debugger_record_before_first_frame/
+            break;
+        default:
+            flag.clear();
+            return false;
+    }
     flag.clear();
     return true;
 }