Updated projects to conform to the update engine factory API

5 files changed, 10 insertions, 11 deletions

diff --git a/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI_D3D11.cpp b/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI_D3D11.cpp
index c621064..ca83f18 100644
--- a/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI_D3D11.cpp
+++ b/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI_D3D11.cpp
@@ -9,7 +9,7 @@
 
 #include "RenderAPI.h"
 #include "Unity/IUnityGraphicsD3D11.h"
-#include "RenderDeviceFactoryD3D11.h"
+#include "EngineFactoryD3D11.h"
 #include "RenderDeviceD3D11.h"
 
 using namespace Diligent;
@@ -50,7 +50,7 @@ void RenderAPI_D3D11::ProcessDeviceEvent(UnityGfxDeviceEventType type, IUnityInt
             CComPtr<ID3D11DeviceContext> d3d11ImmediateContext;
             m_d3d11Device->GetImmediateContext(&d3d11ImmediateContext);
             auto *pFactoryD3d11 = GetEngineFactoryD3D11();
-            EngineD3D11Attribs Attribs;
+            EngineD3D11CreateInfo Attribs;
             pFactoryD3d11->AttachToD3D11Device(m_d3d11Device, d3d11ImmediateContext, Attribs, &m_Device, &m_Context, 0);
             break;
         }
diff --git a/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI_D3D12.cpp b/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI_D3D12.cpp
index 6f667f7..fd21662 100644
--- a/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI_D3D12.cpp
+++ b/unityplugin/GhostCubePlugin/PluginSource/src/RenderAPI_D3D12.cpp
@@ -14,7 +14,7 @@
 
 #include "RenderAPI.h"
 #include "Unity/IUnityGraphicsD3D12.h"
-#include "RenderDeviceFactoryD3D12.h"
+#include "EngineFactoryD3D12.h"
 #include "RenderDeviceD3D12.h"
 #include "CommandQueueD3D12.h"
 #include "TextureD3D12.h"
@@ -144,7 +144,7 @@ void RenderAPI_D3D12::ProcessDeviceEvent(UnityGfxDeviceEventType type, IUnityInt
             auto &DefaultAllocator = DefaultRawMemoryAllocator::GetAllocator();
             m_CmdQueue = NEW_RC_OBJ(DefaultAllocator, "UnityCommandQueueImpl instance", UnityCommandQueueImpl)(m_UnityGraphicsD3D12);
             auto *pFactoryD3D12 = GetEngineFactoryD3D12();
-            EngineD3D12Attribs Attribs;
+            EngineD3D12CreateInfo Attribs;
             std::array<ICommandQueueD3D12*, 1> CmdQueues = {m_CmdQueue};
             pFactoryD3D12->AttachToD3D12Device(d3d12Device, CmdQueues.size(), CmdQueues.data(), Attribs, &m_Device, &m_Context, 0);
             m_Device->QueryInterface(IID_RenderDeviceD3D12, reinterpret_cast<IObject**>(static_cast<IRenderDeviceD3D12**>(&m_RenderDeviceD3D12)));
diff --git a/unityplugin/GhostCubePlugin/PluginSource/src/SamplePlugin.cpp b/unityplugin/GhostCubePlugin/PluginSource/src/SamplePlugin.cpp
index d13c5fb..deae192 100644
--- a/unityplugin/GhostCubePlugin/PluginSource/src/SamplePlugin.cpp
+++ b/unityplugin/GhostCubePlugin/PluginSource/src/SamplePlugin.cpp
@@ -94,11 +94,10 @@ SamplePlugin::SamplePlugin(Diligent::IRenderDevice *pDevice, bool UseReverseZ, T
         PSODesc.GraphicsPipeline.pVS = pVS;
         PSODesc.GraphicsPipeline.pPS = pPS;
         PSODesc.GraphicsPipeline.InputLayout.LayoutElements = LayoutElems;
-        PSODesc.GraphicsPipeline.InputLayout.NumElements = _countof(LayoutElems);
+        PSODesc.GraphicsPipeline.InputLayout.NumElements    = _countof(LayoutElems);
         pDevice->CreatePipelineState(PSODesc, &m_PSO);
-        m_PSO->CreateShaderResourceBinding(&m_SRB, true);
-
         m_PSO->GetStaticShaderVariable(SHADER_TYPE_VERTEX, "Constants")->Set(m_VSConstants);
+        m_PSO->CreateShaderResourceBinding(&m_SRB, true);
     }
 
     {
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp
index 13d91da..aea6e42 100644
--- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp
+++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D11.cpp
@@ -3,7 +3,7 @@
 
 #include "DiligentGraphicsAdapterD3D11.h"
 #include "UnityGraphicsD3D11Emulator.h"
-#include "RenderDeviceFactoryD3D11.h"
+#include "EngineFactoryD3D11.h"
 #include "SwapChainBase.h"
 #include "SwapChainD3D11.h"
 #include "DefaultRawMemoryAllocator.h"
@@ -108,7 +108,7 @@ DiligentGraphicsAdapterD3D11::DiligentGraphicsAdapterD3D11(const UnityGraphicsD3
     ID3D11Device *pd3d11Device = GraphicsD3D11Impl->GetD3D11Device();
     ID3D11DeviceContext *pd3d11Context = GraphicsD3D11Impl->GetD3D11Context();
     auto *pFactoryD3d11 = GetEngineFactoryD3D11();
-    EngineD3D11Attribs Attribs;
+    EngineD3D11CreateInfo Attribs;
     pFactoryD3d11->AttachToD3D11Device(pd3d11Device, pd3d11Context, Attribs, &m_pDevice, &m_pDeviceCtx, 0);
 }
 
diff --git a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp
index 1ce1442..818d0f2 100644
--- a/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp
+++ b/unityplugin/UnityEmulator/src/DiligentGraphicsAdapterD3D12.cpp
@@ -13,7 +13,7 @@
 #include "RenderDeviceD3D12.h"
 #include "DeviceContextD3D12.h"
 #include "CommandQueueD3D12.h"
-#include "RenderDeviceFactoryD3D12.h"
+#include "EngineFactoryD3D12.h"
 #include "SwapChainBase.h"
 #include "DefaultRawMemoryAllocator.h"
 #include "DXGITypeConversions.h"
@@ -204,7 +204,7 @@ DiligentGraphicsAdapterD3D12::DiligentGraphicsAdapterD3D12(UnityGraphicsD3D12Emu
     auto CmdQueue = NEW_RC_OBJ(DefaultAllocator, "UnityCommandQueueImpl instance", ProxyCommandQueueD3D12)(*GraphicsImpl);
 
     auto *pFactoryD3D12 = GetEngineFactoryD3D12();
-    EngineD3D12Attribs Attribs;
+    EngineD3D12CreateInfo Attribs;
     std::array<ICommandQueueD3D12*, 1> CmdQueues = {CmdQueue};
     pFactoryD3D12->AttachToD3D12Device(d3d12Device, CmdQueues.size(), CmdQueues.data(), Attribs, &m_pDevice, &m_pDeviceCtx, 0);
 }