diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2019-03-06 04:32:21 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2019-03-06 04:32:21 +0000 |
| commit | b9c210a8df72e620500509ed5243bef18a4390ec (patch) | |
| tree | e12489dcf77cf16db9f7968df8af8b622df9f13f /Graphics/GraphicsEngineMetal | |
| parent | Fixed one more issue with Metal back-end (diff) | |
| download | DiligentCore-b9c210a8df72e620500509ed5243bef18a4390ec.tar.gz DiligentCore-b9c210a8df72e620500509ed5243bef18a4390ec.zip | |
Fixed yet few another issues with Metal backend
Diffstat (limited to 'Graphics/GraphicsEngineMetal')
| -rw-r--r-- | Graphics/GraphicsEngineMetal/include/RenderDeviceMtlImpl.h | 12 | ||||
| -rw-r--r-- | Graphics/GraphicsEngineMetal/src/RenderDeviceMtlImpl.mm | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/Graphics/GraphicsEngineMetal/include/RenderDeviceMtlImpl.h b/Graphics/GraphicsEngineMetal/include/RenderDeviceMtlImpl.h index 109958d6..fbc40a0c 100644 --- a/Graphics/GraphicsEngineMetal/include/RenderDeviceMtlImpl.h +++ b/Graphics/GraphicsEngineMetal/include/RenderDeviceMtlImpl.h @@ -39,16 +39,16 @@ class RenderDeviceMtlImpl final : public RenderDeviceBase<IRenderDeviceMtl> public: using TRenderDeviceBase = RenderDeviceBase<IRenderDeviceMtl>; - RenderDeviceMtlImpl( IReferenceCounters* pRefCounters, - IMemoryAllocator& RawMemAllocator, - const EngineMtlAttribs& EngineAttribs, - void* pMtlDevice, - Uint32 NumDeferredContexts ); + RenderDeviceMtlImpl( IReferenceCounters* pRefCounters, + IMemoryAllocator& RawMemAllocator, + const EngineMtlCreateInfo& EngineAttribs, + void* pMtlDevice, + Uint32 NumDeferredContexts ); virtual void QueryInterface( const INTERFACE_ID& IID, IObject **ppInterface )override final; virtual void CreateBuffer(const BufferDesc& BuffDesc, const BufferData* pBuffData, IBuffer** ppBuffer)override final; - virtual void CreateShader(const ShaderCreationAttribs& ShaderCreationAttribs, IShader** ppShader)override final; + virtual void CreateShader(const ShaderCreateInfo& ShaderCI, IShader** ppShader)override final; virtual void CreateTexture(const TextureDesc& TexDesc, const TextureData* pData, ITexture** ppTexture)override final; diff --git a/Graphics/GraphicsEngineMetal/src/RenderDeviceMtlImpl.mm b/Graphics/GraphicsEngineMetal/src/RenderDeviceMtlImpl.mm index df94eb0f..99ab0240 100644 --- a/Graphics/GraphicsEngineMetal/src/RenderDeviceMtlImpl.mm +++ b/Graphics/GraphicsEngineMetal/src/RenderDeviceMtlImpl.mm @@ -37,11 +37,11 @@ namespace Diligent { -RenderDeviceMtlImpl :: RenderDeviceMtlImpl(IReferenceCounters* pRefCounters, - IMemoryAllocator& RawMemAllocator, - const EngineMtlAttribs& EngineAttribs, - void* pMtlDevice, - Uint32 NumDeferredContexts) : +RenderDeviceMtlImpl :: RenderDeviceMtlImpl(IReferenceCounters* pRefCounters, + IMemoryAllocator& RawMemAllocator, + const EngineMtlCreateInfo& EngineAttribs, + void* pMtlDevice, + Uint32 NumDeferredContexts) : TRenderDeviceBase { pRefCounters, @@ -92,13 +92,13 @@ void RenderDeviceMtlImpl :: CreateBuffer(const BufferDesc& BuffDesc, const Buffe ); } -void RenderDeviceMtlImpl :: CreateShader(const ShaderCreationAttribs& ShaderCreationAttribs, IShader** ppShader) +void RenderDeviceMtlImpl :: CreateShader(const ShaderCreateInfo& ShaderCI, IShader** ppShader) { - CreateDeviceObject( "shader", ShaderCreationAttribs.Desc, ppShader, + CreateDeviceObject( "shader", ShaderCI.Desc, ppShader, [&]() { ShaderMtlImpl* pShaderMtl( NEW_RC_OBJ(m_ShaderObjAllocator, "ShaderMtlImpl instance", ShaderMtlImpl) - (this, ShaderCreationAttribs ) ); + (this, ShaderCI ) ); pShaderMtl->QueryInterface( IID_Shader, reinterpret_cast<IObject**>(ppShader) ); OnCreateDeviceObject( pShaderMtl ); |