D3D11 and D3D12 backends: fixed issue with resolving typeless resources

2 files changed, 16 insertions, 17 deletions

diff --git a/Graphics/GraphicsEngine/include/EngineFactoryBase.h b/Graphics/GraphicsEngine/include/EngineFactoryBase.h
index 8acd5801..12294dcd 100644
--- a/Graphics/GraphicsEngine/include/EngineFactoryBase.h
+++ b/Graphics/GraphicsEngine/include/EngineFactoryBase.h
@@ -47,8 +47,8 @@ public:
     using CounterValueType = IReferenceCounters::CounterValueType;
 
     EngineFactoryBase(const INTERFACE_ID& FactoryIID)noexcept :
-        m_FactoryIID(FactoryIID),
-        m_RefCounters(*this)
+        m_FactoryIID  {FactoryIID},
+        m_RefCounters {*this     }
     {
     }
 
@@ -96,7 +96,7 @@ private:
     {
     public:
         DummyReferenceCounters(EngineFactoryBase& Factory)noexcept :
-            m_Factory(Factory)
+            m_Factory {Factory}
         {
             m_lNumStrongReferences = 0;
             m_lNumWeakReferences   = 0;
diff --git a/Graphics/GraphicsEngine/include/SwapChainBase.h b/Graphics/GraphicsEngine/include/SwapChainBase.h
index 886f8e4d..e5330c77 100644
--- a/Graphics/GraphicsEngine/include/SwapChainBase.h
+++ b/Graphics/GraphicsEngine/include/SwapChainBase.h
@@ -54,17 +54,22 @@ public:
 	/// \param pDevice - pointer to the device.
 	/// \param pDeviceContext - pointer to the device context.
 	/// \param SCDesc - swap chain description
-    SwapChainBase( IReferenceCounters*  pRefCounters,
-                   IRenderDevice*       pDevice,
-                   IDeviceContext*      pDeviceContext,
-                   const SwapChainDesc& SCDesc ) : 
-        TObjectBase(pRefCounters),
-        m_pRenderDevice(pDevice),
-        m_wpDeviceContext(pDeviceContext),
-        m_SwapChainDesc(SCDesc)
+    SwapChainBase(IReferenceCounters*  pRefCounters,
+                  IRenderDevice*       pDevice,
+                  IDeviceContext*      pDeviceContext,
+                  const SwapChainDesc& SCDesc) :
+        TObjectBase       {pRefCounters},
+        m_pRenderDevice   {pDevice       },
+        m_wpDeviceContext {pDeviceContext},
+        m_SwapChainDesc   {SCDesc        }
     {
     }
 
+    SwapChainBase             (const SwapChainBase&)  = delete;
+    SwapChainBase             (      SwapChainBase&&) = delete;
+    SwapChainBase& operator = (const SwapChainBase&)  = delete;
+    SwapChainBase& operator = (     SwapChainBase&&)  = delete;
+
     ~SwapChainBase()
     {
     }
@@ -143,12 +148,6 @@ protected:
 
     /// Swap chain description
     SwapChainDesc m_SwapChainDesc;
-
-private:
-    SwapChainBase                   ( const SwapChainBase& );
-    SwapChainBase                   ( SwapChainBase&& );
-    const SwapChainBase& operator = ( const SwapChainBase& );
-    const SwapChainBase& operator = ( SwapChainBase&& );
 };
 
 }