Reworked interface definitions to use DILIGENT_BEGIN_INTERFACE/DILIGENT_END_INTERFACE pair

15 files changed, 32 insertions, 84 deletions

diff --git a/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h b/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h
index 26213214..568c6adb 100644
--- a/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h
@@ -45,7 +45,7 @@ static const INTERFACE_ID IID_BufferD3D12 =
 // clang-format off
 
 /// Exposes Direct3D12-specific functionality of a buffer object.
-DILIGENT_INTERFACE(IBufferD3D12, IBuffer)
+DILIGENT_BEGIN_INTERFACE(IBufferD3D12, IBuffer)
 {
     /// Returns a pointer to the ID3D12Resource interface of the internal Direct3D12 object.
 
@@ -71,6 +71,7 @@ DILIGENT_INTERFACE(IBufferD3D12, IBuffer)
     /// returns D3D12_RESOURCE_STATE_COMMON (0).
     VIRTUAL D3D12_RESOURCE_STATES METHOD(GetD3D12ResourceState)(THIS) CONST PURE;
 };
+DILIGENT_END_INTERFACE
 
 #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h"
 
@@ -84,11 +85,6 @@ struct IBufferD3D12Vtbl
     struct IBufferD3D12Methods  BufferD3D12;
 };
 
-typedef struct IBufferD3D12
-{
-    struct IBufferD3D12Vtbl* pVtbl;
-} IBufferD3D12;
-
 #    define IBufferD3D12_GetD3D12Buffer(This, ...)        CALL_IFACE_METHOD(BufferD3D12, GetD3D12Buffer,        This, __VA_ARGS__)
 #    define IBufferD3D12_SetD3D12ResourceState(This, ...) CALL_IFACE_METHOD(BufferD3D12, SetD3D12ResourceState, This, __VA_ARGS__)
 #    define IBufferD3D12_GetD3D12ResourceState(This)      CALL_IFACE_METHOD(BufferD3D12, GetD3D12ResourceState, This)
diff --git a/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h b/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h
index 0dc84a9b..902986e7 100644
--- a/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h
@@ -42,11 +42,12 @@ static const INTERFACE_ID IID_BufferViewD3D12 =
 #include "../../../Primitives/interface/DefineInterfaceHelperMacros.h"
 
 /// Exposes Direct3D12-specific functionality of a buffer view object.
-DILIGENT_INTERFACE(IBufferViewD3D12, IBufferView)
+DILIGENT_BEGIN_INTERFACE(IBufferViewD3D12, IBufferView)
 {
     /// Returns CPU descriptor handle of the buffer view.
     VIRTUAL D3D12_CPU_DESCRIPTOR_HANDLE METHOD(GetCPUDescriptorHandle)(THIS) PURE;
 };
+DILIGENT_END_INTERFACE
 
 #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h"
 
@@ -60,11 +61,6 @@ struct IBufferViewD3D12Vtbl
     struct IBufferViewD3D12Methods BufferViewD3D12;
 };
 
-typedef struct IBufferViewD3D12
-{
-    struct IBufferViewD3D12Vtbl* pVtbl;
-} IBufferViewD3D12;
-
 #    define IBufferViewD3D12_GetCPUDescriptorHandle(This) CALL_IFACE_METHOD(BufferViewD3D12, GetCPUDescriptorHandle, This)
 
 #endif
diff --git a/Graphics/GraphicsEngineD3D12/interface/CommandQueueD3D12.h b/Graphics/GraphicsEngineD3D12/interface/CommandQueueD3D12.h
index b87b2b78..0f612308 100644
--- a/Graphics/GraphicsEngineD3D12/interface/CommandQueueD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/CommandQueueD3D12.h
@@ -44,7 +44,7 @@ static const INTERFACE_ID IID_CommandQueueD3D12 =
 // clang-format off
 
 /// Command queue interface
-DILIGENT_INTERFACE(ICommandQueueD3D12, IObject)
+DILIGENT_BEGIN_INTERFACE(ICommandQueueD3D12, IObject)
 {
     /// Returns the fence value that will be signaled next time
     VIRTUAL Uint64 METHOD(GetNextFenceValue)(THIS) CONST PURE;
@@ -69,6 +69,7 @@ DILIGENT_INTERFACE(ICommandQueueD3D12, IObject)
                                      ID3D12Fence* pFence,
                                      Uint64       Value) PURE;
 };
+DILIGENT_END_INTERFACE
 
 #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h"
 
@@ -82,11 +83,6 @@ struct ICommandQueueD3D12Vtbl
     struct ICommandQueueD3D12Methods CommandQueueD3D12;
 };
 
-typedef struct ICommandQueueD3D12
-{
-    struct ICommandQueueD3D12Vtbl* pVtbl;
-} ICommandQueueD3D12;
-
 // clang-format off
 
 #    define ICommandQueueD3D12_GetNextFenceValue(This)      CALL_IFACE_METHOD(CommandQueueD3D12, GetNextFenceValue,     This)
diff --git a/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h b/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h
index 18018d94..61856849 100644
--- a/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h
@@ -45,7 +45,7 @@ static const INTERFACE_ID IID_DeviceContextD3D12 =
 // clang-format off
 
 /// Exposes Direct3D12-specific functionality of a device context.
-DILIGENT_INTERFACE(IDeviceContextD3D12, IDeviceContext)
+DILIGENT_BEGIN_INTERFACE(IDeviceContextD3D12, IDeviceContext)
 {
     /// Transitions internal D3D12 texture object to a specified state
 
@@ -103,6 +103,7 @@ DILIGENT_INTERFACE(IDeviceContextD3D12, IDeviceContext)
     /// Unlocks the command queue that was previously locked by IDeviceContextD3D12::LockCommandQueue().
     VIRTUAL void METHOD(UnlockCommandQueue)(THIS) PURE;
 };
+DILIGENT_END_INTERFACE
 
 #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h"
 
@@ -117,11 +118,6 @@ struct IDeviceContextD3D12Vtbl
     struct IDeviceContextD3D12Methods DeviceContextD3D12;
 };
 
-typedef struct IDeviceContextD3D12
-{
-    struct IDeviceContextD3D12Vtbl* pVtbl;
-} IDeviceContextD3D12;
-
 // clang-format off
 
 #    define IDeviceContextD3D12_TransitionTextureState(This, ...) CALL_IFACE_METHOD(DeviceContextD3D12, TransitionTextureState,This, __VA_ARGS__)
diff --git a/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h b/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h
index f878820a..eff03ab3 100644
--- a/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h
@@ -53,7 +53,7 @@ static const INTERFACE_ID IID_EngineFactoryD3D12 =
 // clang-format off
 
 /// Engine factory for Direct3D12 rendering backend
-DILIGENT_INTERFACE(IEngineFactoryD3D12, IEngineFactory)
+DILIGENT_BEGIN_INTERFACE(IEngineFactoryD3D12, IEngineFactory)
 {
     /// Loads D3D12 DLL and entry points.
 
@@ -170,6 +170,7 @@ DILIGENT_INTERFACE(IEngineFactoryD3D12, IEngineFactory)
                                                Uint32 REF             NumDisplayModes,
                                                DisplayModeAttribs*    DisplayModes) PURE;
 };
+DILIGENT_END_INTERFACE
 
 #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h"
 
@@ -184,11 +185,6 @@ struct IEngineFactoryD3D12Vtbl
     struct IEngineFactoryD3D12Methods EngineFactoryD3D12;
 };
 
-typedef struct IEngineFactoryD3D12
-{
-    struct IEngineFactoryD3D12Vtbl* pVtbl;
-} IEngineFactoryD3D12;
-
 // clang-format off
 
 #    define IEngineFactoryD3D12_LoadD3D12(This, ...)                    CALL_IFACE_METHOD(EngineFactoryD3D12, LoadD3D12,                    This, __VA_ARGS__)
diff --git a/Graphics/GraphicsEngineD3D12/interface/FenceD3D12.h b/Graphics/GraphicsEngineD3D12/interface/FenceD3D12.h
index 6cad4f48..dd25dfb3 100644
--- a/Graphics/GraphicsEngineD3D12/interface/FenceD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/FenceD3D12.h
@@ -44,7 +44,7 @@ static const INTERFACE_ID IID_FenceD3D12 =
 // clang-format off
 
 /// Exposes Direct3D12-specific functionality of a fence object.
-DILIGENT_INTERFACE(IFenceD3D12, IFence)
+DILIGENT_BEGIN_INTERFACE(IFenceD3D12, IFence)
 {
     /// Returns a pointer to the ID3D12Fence interface of the internal Direct3D12 object.
 
@@ -56,6 +56,7 @@ DILIGENT_INTERFACE(IFenceD3D12, IFence)
     VIRTUAL void METHOD(WaitForCompletion)(THIS_
                                            Uint64 Value) PURE;
 };
+DILIGENT_END_INTERFACE
 
 #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h"
 
@@ -71,11 +72,6 @@ struct IFenceD3D12Vtbl
     struct IFenceD3D12Methods   FenceD3D12;
 };
 
-typedef struct IFenceD3D12
-{
-    struct IFenceD3D12Vtbl* pVtbl;
-} IFenceD3D12;
-
 // clang-format off
 
 #    define IFenceD3D12_GetD3D12Fence(This)          CALL_IFACE_METHOD(FenceD3D12, GetD3D12Fence,     This)
diff --git a/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h b/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h
index 2a289e42..e3539804 100644
--- a/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h
@@ -42,7 +42,7 @@ static const INTERFACE_ID IID_PipelineStateD3D12 =
 #include "../../../Primitives/interface/DefineInterfaceHelperMacros.h"
 
 /// Exposes Direct3D12-specific functionality of a pipeline state object.
-DILIGENT_INTERFACE(IPipelineStateD3D12, IPipelineState)
+DILIGENT_BEGIN_INTERFACE(IPipelineStateD3D12, IPipelineState)
 {
     /// Returns ID3D12PipelineState interface of the internal D3D12 pipeline state object object.
 
@@ -56,7 +56,7 @@ DILIGENT_INTERFACE(IPipelineStateD3D12, IPipelineState)
     /// so Release() must not be called.
     VIRTUAL ID3D12RootSignature* METHOD(GetD3D12RootSignature)(THIS) CONST PURE;
 };
-
+DILIGENT_END_INTERFACE
 
 #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h"
 
@@ -70,11 +70,6 @@ struct IPipelineStateD3D12Vtbl
     struct IPipelineStateD3D12Methods PipelineStateD3D12;
 };
 
-typedef struct IPipelineStateD3D12
-{
-    struct IPipelineStateD3D12Vtbl* pVtbl;
-} IPipelineStateD3D12;
-
 // clang-format off
 
 #    define IPipelineStateD3D12_GetD3D12PipelineState(This) CALL_IFACE_METHOD(PipelineStateD3D12, GetD3D12PipelineState, This)
diff --git a/Graphics/GraphicsEngineD3D12/interface/QueryD3D12.h b/Graphics/GraphicsEngineD3D12/interface/QueryD3D12.h
index 78c7165d..a660dc62 100644
--- a/Graphics/GraphicsEngineD3D12/interface/QueryD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/QueryD3D12.h
@@ -42,7 +42,7 @@ static const INTERFACE_ID IID_QueryD3D12 =
 #include "../../../Primitives/interface/DefineInterfaceHelperMacros.h"
 
 /// Exposes Direct3D12-specific functionality of a Query object.
-DILIGENT_INTERFACE(IQueryD3D12, IQuery)
+DILIGENT_BEGIN_INTERFACE(IQueryD3D12, IQuery)
 {
     /// Returns the Direct3D12 query heap that internal query object resides in.
     VIRTUAL ID3D12QueryHeap* METHOD(GetD3D12QueryHeap)(THIS) PURE;
@@ -50,6 +50,7 @@ DILIGENT_INTERFACE(IQueryD3D12, IQuery)
     /// Returns the index of a query object in Direct3D12 query heap.
     VIRTUAL Uint32 METHOD(GetQueryHeapIndex)(THIS) CONST PURE;
 };
+DILIGENT_END_INTERFACE
 
 #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h"
 
@@ -63,11 +64,6 @@ struct IQueryD3D12Vtbl
     struct IQueryD3D12Methods   QueryD3D12;
 };
 
-typedef struct IQueryD3D12
-{
-    struct IQueryD3D12Vtbl* pVtbl;
-} IQueryD3D12;
-
 #    define IQueryD3D12_GetD3D12QueryHeap(This) CALL_IFACE_METHOD(QueryD3D12, GetD3D12QueryHeap, This)
 #    define IQueryD3D12_GetQueryHeapIndex(This) CALL_IFACE_METHOD(QueryD3D12, GetQueryHeapIndex, This)
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h
index f29dfff0..35ca2c09 100644
--- a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h
@@ -44,7 +44,7 @@ static const INTERFACE_ID IID_RenderDeviceD3D12 =
 // clang-format off
 
 /// Exposes Direct3D12-specific functionality of a render device.
-DILIGENT_INTERFACE(IRenderDeviceD3D12, IRenderDevice)
+DILIGENT_BEGIN_INTERFACE(IRenderDeviceD3D12, IRenderDevice)
 {
     /// Returns ID3D12Device interface of the internal Direct3D12 device object.
 
@@ -96,6 +96,7 @@ DILIGENT_INTERFACE(IRenderDeviceD3D12, IRenderDevice)
                                                      RESOURCE_STATE       InitialState,
                                                      IBuffer**            ppBuffer) PURE;
 };
+DILIGENT_END_INTERFACE
 
 #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h"
 
@@ -110,11 +111,6 @@ struct IRenderDeviceD3D12Vtbl
     struct IRenderDeviceD3D12Methods RenderDeviceD3D12;
 };
 
-typedef struct IRenderDeviceD3D12
-{
-    struct IRenderDeviceD3D12Vtbl* pVtbl;
-} IRenderDeviceD3D12;
-
 // clang-format off
 
 #    define IRenderDeviceD3D12_GetD3D12Device(This)                    CALL_IFACE_METHOD(RenderDeviceD3D12, GetD3D12Device,               This)
diff --git a/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h b/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h
index a37d477a..399f653d 100644
--- a/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h
@@ -42,7 +42,7 @@ static const INTERFACE_ID IID_SamplerD3D12 =
 #include "../../../Primitives/interface/DefineInterfaceHelperMacros.h"
 
 /// Exposes Direct3D12-specific functionality of a sampler object.
-DILIGENT_INTERFACE(ISamplerD3D12, ISampler)
+DILIGENT_BEGIN_INTERFACE(ISamplerD3D12, ISampler)
 {
     /// Returns a CPU descriptor handle of the D3D12 sampler object
 
@@ -50,6 +50,7 @@ DILIGENT_INTERFACE(ISamplerD3D12, ISampler)
     /// so Release() must not be called.
     VIRTUAL D3D12_CPU_DESCRIPTOR_HANDLE METHOD(GetCPUDescriptorHandle)(THIS) PURE;
 };
+DILIGENT_END_INTERFACE
 
 #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h"
 
@@ -63,11 +64,6 @@ struct ISamplerD3D12Vtbl
     struct ISamplerD3D12Methods SamplerD3D12;
 };
 
-typedef struct ISamplerD3D12
-{
-    struct ISamplerD3D12Vtbl* pVtbl;
-} ISamplerD3D12;
-
 #    define ISamplerD3D12_GetCPUDescriptorHandle(This) CALL_IFACE_METHOD(SamplerD3D12, GetCPUDescriptorHandle, This)
 
 #endif
diff --git a/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h b/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h
index 2027e0cd..a70d56bb 100644
--- a/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h
@@ -44,13 +44,14 @@ static const INTERFACE_ID IID_ShaderD3D12 =
 #if DILIGENT_CPP_INTERFACE
 
 /// Exposes Direct3D12-specific functionality of a shader object.
-DILIGENT_INTERFACE(IShaderD3D12, IShaderD3D){
+DILIGENT_BEGIN_INTERFACE(IShaderD3D12, IShaderD3D){
     /// Returns a pointer to the ID3D12DeviceChild interface of the internal Direct3D12 object.
 
     /// The method does *NOT* call AddRef() on the returned interface,
     /// so Release() must not be called.
     //virtual ID3D12DeviceChild* GetD3D12Shader() = 0;
 };
+DILIGENT_END_INTERFACE
 
 #endif
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/ShaderResourceBindingD3D12.h b/Graphics/GraphicsEngineD3D12/interface/ShaderResourceBindingD3D12.h
index b744ecc3..587ffa3d 100644
--- a/Graphics/GraphicsEngineD3D12/interface/ShaderResourceBindingD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/ShaderResourceBindingD3D12.h
@@ -44,7 +44,8 @@ static const INTERFACE_ID IID_ShaderResourceBindingD3D12 =
 #if DILIGENT_CPP_INTERFACE
 
 /// Exposes Direct3D12-specific functionality of a shader resource binding.
-DILIGENT_INTERFACE(IShaderResourceBindingD3D12, IShaderResourceBinding){};
+DILIGENT_BEGIN_INTERFACE(IShaderResourceBindingD3D12, IShaderResourceBinding){};
+DILIGENT_END_INTERFACE
 
 #endif
 
@@ -60,10 +61,10 @@ struct IShaderResourceBindingD3D12Vtbl
     //struct IShaderResourceBindingD3D12Methods ShaderResourceBindingD3D12;
 };
 
-struct IShaderResourceBindingD3D12
+typedef struct IShaderResourceBindingD3D12
 {
     struct IShaderResourceBindingD3D12Vtbl* pVtbl;
-};
+} IShaderResourceBindingD3D12;
 
 #endif
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h b/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h
index afe58928..42a515e4 100644
--- a/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h
@@ -45,7 +45,7 @@ static const INTERFACE_ID IID_SwapChainD3D12 =
 #include "../../../Primitives/interface/DefineInterfaceHelperMacros.h"
 
 /// Exposes Direct3D12-specific functionality of a swap chain.
-DILIGENT_INTERFACE(ISwapChainD3D12, ISwapChain)
+DILIGENT_BEGIN_INTERFACE(ISwapChainD3D12, ISwapChain)
 {
     /// Returns a pointer to the IDXGISwapChain interface of the internal DXGI object.
 
@@ -53,6 +53,7 @@ DILIGENT_INTERFACE(ISwapChainD3D12, ISwapChain)
     /// so Release() must not be called.
     VIRTUAL IDXGISwapChain* METHOD(GetDXGISwapChain)(THIS) PURE;
 };
+DILIGENT_END_INTERFACE
 
 #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h"
 
@@ -66,11 +67,6 @@ struct ISwapChainD3D12Vtbl
     struct ISwapChainD3D12Methods SwapChainD3D12;
 };
 
-typedef struct ISwapChainD3D12
-{
-    struct ISwapChainD3D12Vtbl* pVtbl;
-} ISwapChainD3D12;
-
 // clang-format off
 
 #    define ISwapChainD3D12_GetDXGISwapChain(This)  CALL_IFACE_METHOD(SwapChainD3D12, GetDXGISwapChain, This)
diff --git a/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h b/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h
index e2bfa4cc..3689b992 100644
--- a/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h
@@ -44,7 +44,7 @@ static const INTERFACE_ID IID_TextureD3D12 =
 // clang-format off
 
 /// Exposes Direct3D12-specific functionality of a texture object.
-DILIGENT_INTERFACE(ITextureD3D12, ITexture)
+DILIGENT_BEGIN_INTERFACE(ITextureD3D12, ITexture)
 {
     /// Returns a pointer to the ID3D12Resource interface of the internal Direct3D12 object.
 
@@ -63,6 +63,7 @@ DILIGENT_INTERFACE(ITextureD3D12, ITexture)
     /// returns D3D12_RESOURCE_STATE_COMMON (0).
     VIRTUAL D3D12_RESOURCE_STATES METHOD(GetD3D12ResourceState)(THIS) CONST PURE;
 };
+DILIGENT_END_INTERFACE
 
 #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h"
 
@@ -78,11 +79,6 @@ struct ITextureD3D12Vtbl
     struct ITextureD3D12Methods TextureD3D12;
 };
 
-typedef struct ITextureD3D12
-{
-    struct ITextureD3D12Vtbl* pVtbl;
-} ITextureD3D12;
-
 // clang-format off
 
 #    define ITextureD3D12_GetD3D12Texture(This)            CALL_IFACE_METHOD(TextureD3D12, GetD3D12Texture,       This)
diff --git a/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h b/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h
index 461c5631..77c0b1b8 100644
--- a/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h
@@ -42,12 +42,12 @@ static const INTERFACE_ID IID_TextureViewD3D12 =
 #include "../../../Primitives/interface/DefineInterfaceHelperMacros.h"
 
 /// Exposes Direct3D12-specific functionality of a texture view object.
-DILIGENT_INTERFACE(ITextureViewD3D12, ITextureView)
+DILIGENT_BEGIN_INTERFACE(ITextureViewD3D12, ITextureView)
 {
     /// Returns CPU descriptor handle of the texture view.
     VIRTUAL D3D12_CPU_DESCRIPTOR_HANDLE METHOD(GetCPUDescriptorHandle)(THIS) PURE;
 };
-
+DILIGENT_END_INTERFACE
 
 #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h"
 
@@ -61,11 +61,6 @@ struct ITextureViewD3D12Vtbl
     struct ITextureViewD3D12Methods TextureViewD3D12;
 };
 
-typedef struct ITextureViewD3D12
-{
-    struct ITextureViewD3D12Vtbl* pVtbl;
-} ITextureViewD3D12;
-
 #    define ITextureViewD3D12_GetCPUDescriptorHandle(This) CALL_IFACE_METHOD(TextureViewD3D12, GetCPUDescriptorHandle, This)
 
 #endif