Simplify super-resolution initialization

Author: TheMostDiligent

Graphics/SuperResolution/CMakeLists.txt

@@ -8,8 +8,12 @@ set(DILIGENT_DLSS_SUPPORTED FALSE CACHE INTERNAL "DLSS is not supported")
 set(DILIGENT_DSR_SUPPORTED  FALSE CACHE INTERNAL "DirectSR is not supported")
 
 if(PLATFORM_WIN32)
-    set(DILIGENT_DLSS_SUPPORTED TRUE CACHE INTERNAL "DLSS is supported on Win32 platform")
-    set(DILIGENT_DSR_SUPPORTED  TRUE CACHE INTERNAL "DirectSR is supported on Win32 platform")
+    if (D3D11_SUPPORTED OR D3D12_SUPPORTED OR VULKAN_SUPPORTED)
+        set(DILIGENT_DLSS_SUPPORTED TRUE CACHE INTERNAL "DLSS is supported on Win32 platform")
+    endif()
+    if (D3D12_SUPPORTED)
+        set(DILIGENT_DSR_SUPPORTED  TRUE CACHE INTERNAL "DirectSR is supported on Win32 platform")
+    endif()
 endif()
 
 if(${DILIGENT_NO_DLSS})
@@ -42,12 +46,9 @@ endif()
 
 set(INCLUDE
     include/SuperResolutionBase.hpp
-    include/SuperResolutionFactoryBase.hpp
     include/SuperResolutionVariants.hpp
-    include/DLSSProviderD3D12.hpp
-    include/DLSSProviderD3D11.hpp
-    include/DLSSProviderVk.hpp
-    include/DSRProviderD3D12.hpp
+    include/SuperResolutionProvider.hpp
+    include/SuperResolutionProviderRegistry.hpp
 )
 
 set(INTERFACE
@@ -58,21 +59,28 @@ set(INTERFACE
 
 set(SOURCE
     src/SuperResolutionBase.cpp
-    src/SuperResolutionFactoryBase.cpp
     src/SuperResolutionFactory.cpp
-    src/SuperResolutionFactoryD3D12.cpp
-    src/SuperResolutionFactoryD3D11.cpp
-    src/SuperResolutionFactoryVk.cpp
-    src/SuperResolutionFactoryMtl.cpp
-    src/DLSSProviderD3D12.cpp
-    src/DLSSProviderD3D11.cpp
-    src/DLSSProviderVk.cpp
-    src/DSRProviderD3D12.cpp
+    src/SuperResolutionProviderRegistry.cpp
 )
 
 if(DILIGENT_DLSS_SUPPORTED)
     list(APPEND INCLUDE include/SuperResolutionDLSS.hpp)
     list(APPEND SOURCE src/SuperResolutionDLSS.cpp)
+    if (D3D11_SUPPORTED)
+        list(APPEND SOURCE src/DLSSProviderD3D11.cpp)
+    endif()
+    if (D3D12_SUPPORTED)
+        list(APPEND SOURCE src/DLSSProviderD3D12.cpp)
+    endif()
+    if (VULKAN_SUPPORTED)
+        list(APPEND SOURCE src/DLSSProviderVk.cpp)
+    endif()
+endif()
+
+if (DILIGENT_DSR_SUPPORTED)
+    if (D3D12_SUPPORTED)
+        list(APPEND SOURCE src/DSRProviderD3D12.cpp)
+    endif()
 endif()
 
 set(DLL_SOURCE

Graphics/SuperResolution/include/DSRProviderD3D12.hpp

@@ -28,31 +28,25 @@
 
 #include "SuperResolutionFactory.h"
 #include "SuperResolution.h"
-#include "RefCntAutoPtr.hpp"
 
 #include <vector>
 
-struct NVSDK_NGX_Parameter;
-
 namespace Diligent
 {
 
-class DLSSProviderVk final
+class SuperResolutionProvider
 {
 public:
-    DLSSProviderVk(IRenderDevice* pDevice);
-
-    ~DLSSProviderVk();
-
-    void EnumerateVariants(std::vector<SuperResolutionInfo>& Variants);
+    virtual ~SuperResolutionProvider()
+    {}
 
-    void GetSourceSettings(const SuperResolutionSourceSettingsAttribs& Attribs, SuperResolutionSourceSettings& Settings);
+    virtual void EnumerateVariants(std::vector<SuperResolutionInfo>& Variants) = 0;
 
-    void CreateSuperResolution(const SuperResolutionDesc& Desc, ISuperResolution** ppUpscaler);
+    virtual void GetSourceSettings(const SuperResolutionSourceSettingsAttribs& Attribs,
+                                   SuperResolutionSourceSettings&              Settings) = 0;
 
-private:
-    RefCntAutoPtr<IRenderDevice> m_pDevice;
-    NVSDK_NGX_Parameter*         m_pNGXParams = nullptr;
+    virtual void CreateSuperResolution(const SuperResolutionDesc& Desc,
+                                       ISuperResolution**         ppUpscaler) = 0;
 };
 
 } // namespace Diligent

Graphics/SuperResolution/include/SuperResolutionFactoryBase.hpp

@@ -26,33 +26,39 @@
 
 #pragma once
 
-#include "SuperResolutionFactory.h"
-#include "SuperResolution.h"
-#include "RefCntAutoPtr.hpp"
+#include "SuperResolutionProvider.hpp"
 
+#include <string>
+#include <functional>
 #include <vector>
-
-struct NVSDK_NGX_Parameter;
+#include <memory>
 
 namespace Diligent
 {
 
-class DLSSProviderD3D11 final
+namespace SuperResolutionProviderRegistry
 {
-public:
-    DLSSProviderD3D11(IRenderDevice* pDevice);
-
-    ~DLSSProviderD3D11();
 
-    void EnumerateVariants(std::vector<SuperResolutionInfo>& Variants);
+struct RegistrationInfo
+{
+    std::string Name;
 
-    void GetSourceSettings(const SuperResolutionSourceSettingsAttribs& Attribs, SuperResolutionSourceSettings& Settings);
+    // Returns true if provider supports the given device.
+    std::function<bool(IRenderDevice*)> SupportsDevice;
 
-    void CreateSuperResolution(const SuperResolutionDesc& Desc, ISuperResolution** ppUpscaler);
+    // Creates a provider for the given device.
+    std::function<std::unique_ptr<SuperResolutionProvider>(IRenderDevice*)> CreateProvider;
+};
 
-private:
-    RefCntAutoPtr<IRenderDevice> m_pDevice;
-    NVSDK_NGX_Parameter*         m_pNGXParams = nullptr;
+// Registers a super resolution provider.
+struct Registrar
+{
+    Registrar(RegistrationInfo Reg);
 };
 
+// Returns a list of registered super resolution providers.
+const std::vector<RegistrationInfo>& GetProviders();
+
+} // namespace SuperResolutionProviderRegistry
+
 } // namespace Diligent