diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-04-06 15:49:17 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-04-06 15:49:17 +0000 |
| commit | 696a3cbb5a5f30d2f5000c0db90125d614ea09ca (patch) | |
| tree | f1c03f120f1cccfa94a583801179212d32d20711 /Graphics/GraphicsEngineVulkan | |
| parent | Added API info query (diff) | |
| download | DiligentCore-696a3cbb5a5f30d2f5000c0db90125d614ea09ca.tar.gz DiligentCore-696a3cbb5a5f30d2f5000c0db90125d614ea09ca.zip | |
Made IShaderSourceInputStreamFactory derived from IObject (upgraded API Version to 240021)
Diffstat (limited to 'Graphics/GraphicsEngineVulkan')
3 files changed, 16 insertions, 10 deletions
diff --git a/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.h b/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.h index ec762ec9..c4cd3210 100644 --- a/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.h +++ b/Graphics/GraphicsEngineVulkan/include/RenderDeviceVkImpl.h @@ -57,6 +57,7 @@ public: RenderDeviceVkImpl(IReferenceCounters* pRefCounters, IMemoryAllocator& RawMemAllocator, + IEngineFactory* pEngineFactory, const EngineVkCreateInfo& EngineCI, size_t CommandQueueCount, ICommandQueueVk** pCmdQueues, diff --git a/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp b/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp index 40db1ccf..57b36201 100644 --- a/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp +++ b/Graphics/GraphicsEngineVulkan/src/EngineFactoryVk.cpp @@ -251,7 +251,7 @@ void EngineFactoryVkImpl::AttachToVulkanDevice(std::shared_ptr<VulkanUtilities:: try { auto &RawMemAllocator = GetRawAllocator(); - RenderDeviceVkImpl *pRenderDeviceVk( NEW_RC_OBJ(RawMemAllocator, "RenderDeviceVkImpl instance", RenderDeviceVkImpl)(RawMemAllocator, EngineCI, CommandQueueCount, ppCommandQueues, Instance, std::move(PhysicalDevice), LogicalDevice) ); + RenderDeviceVkImpl *pRenderDeviceVk( NEW_RC_OBJ(RawMemAllocator, "RenderDeviceVkImpl instance", RenderDeviceVkImpl)(RawMemAllocator, this, EngineCI, CommandQueueCount, ppCommandQueues, Instance, std::move(PhysicalDevice), LogicalDevice) ); pRenderDeviceVk->QueryInterface(IID_RenderDevice, reinterpret_cast<IObject**>(ppDevice) ); std::shared_ptr<GenerateMipsVkHelper> GenerateMipsHelper(new GenerateMipsVkHelper(*pRenderDeviceVk)); diff --git a/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp b/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp index e31acc55..271af6e0 100644 --- a/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp +++ b/Graphics/GraphicsEngineVulkan/src/RenderDeviceVkImpl.cpp @@ -39,6 +39,7 @@ namespace Diligent RenderDeviceVkImpl :: RenderDeviceVkImpl(IReferenceCounters* pRefCounters, IMemoryAllocator& RawMemAllocator, + IEngineFactory* pEngineFactory, const EngineVkCreateInfo& EngineCI, size_t CommandQueueCount, ICommandQueueVk** CmdQueues, @@ -49,18 +50,22 @@ RenderDeviceVkImpl :: RenderDeviceVkImpl(IReferenceCounters* { pRefCounters, RawMemAllocator, + pEngineFactory, CommandQueueCount, CmdQueues, EngineCI.NumDeferredContexts, - sizeof(TextureVkImpl), - sizeof(TextureViewVkImpl), - sizeof(BufferVkImpl), - sizeof(BufferViewVkImpl), - sizeof(ShaderVkImpl), - sizeof(SamplerVkImpl), - sizeof(PipelineStateVkImpl), - sizeof(ShaderResourceBindingVkImpl), - sizeof(FenceVkImpl) + DeviceObjectSizes + { + sizeof(TextureVkImpl), + sizeof(TextureViewVkImpl), + sizeof(BufferVkImpl), + sizeof(BufferViewVkImpl), + sizeof(ShaderVkImpl), + sizeof(SamplerVkImpl), + sizeof(PipelineStateVkImpl), + sizeof(ShaderResourceBindingVkImpl), + sizeof(FenceVkImpl) + } }, m_VulkanInstance(Instance), m_PhysicalDevice(std::move(PhysicalDevice)), |