Reworked C inteface method calls to use CALL_IFACE_METHOD macro

13 files changed, 39 insertions, 39 deletions

diff --git a/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h b/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h
index ee9bcf4b..26213214 100644
--- a/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/BufferD3D12.h
@@ -89,9 +89,9 @@ typedef struct IBufferD3D12
     struct IBufferD3D12Vtbl* pVtbl;
 } IBufferD3D12;
 
-#    define IBufferD3D12_GetD3D12Buffer(This, ...)        (This)->pVtbl->BufferD3D12.GetD3D12Buffer       ((IBufferD3D12*)(This), __VA_ARGS__)
-#    define IBufferD3D12_SetD3D12ResourceState(This, ...) (This)->pVtbl->BufferD3D12.SetD3D12ResourceState((IBufferD3D12*)(This), __VA_ARGS__)
-#    define IBufferD3D12_GetD3D12ResourceState(This)      (This)->pVtbl->BufferD3D12.GetD3D12ResourceState((IBufferD3D12*)(This))
+#    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)
 
 #endif
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h b/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h
index 8575e220..0dc84a9b 100644
--- a/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/BufferViewD3D12.h
@@ -65,7 +65,7 @@ typedef struct IBufferViewD3D12
     struct IBufferViewD3D12Vtbl* pVtbl;
 } IBufferViewD3D12;
 
-#    define IBufferViewD3D12_GetCPUDescriptorHandle(This) (This)->pVtbl->BufferViewD3D12.GetCPUDescriptorHandle((IBufferViewD3D12*)(This))
+#    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 60086779..b87b2b78 100644
--- a/Graphics/GraphicsEngineD3D12/interface/CommandQueueD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/CommandQueueD3D12.h
@@ -89,12 +89,12 @@ typedef struct ICommandQueueD3D12
 
 // clang-format off
 
-#    define ICommandQueueD3D12_GetNextFenceValue(This)      (This)->pVtbl->CommandQueueD3D12.GetNextFenceValue     ((ICommandQueueD3D12*)(This))
-#    define ICommandQueueD3D12_Submit(This, ...)            (This)->pVtbl->CommandQueueD3D12.Submit                ((ICommandQueueD3D12*)(This), __VA_ARGS__)
-#    define ICommandQueueD3D12_GetD3D12CommandQueue(This)   (This)->pVtbl->CommandQueueD3D12.GetD3D12CommandQueue  ((ICommandQueueD3D12*)(This))
-#    define ICommandQueueD3D12_GetCompletedFenceValue(This) (This)->pVtbl->CommandQueueD3D12.GetCompletedFenceValue((ICommandQueueD3D12*)(This))
-#    define ICommandQueueD3D12_WaitForIdle(This)            (This)->pVtbl->CommandQueueD3D12.WaitForIdle           ((ICommandQueueD3D12*)(This))
-#    define ICommandQueueD3D12_SignalFence(This, ...)       (This)->pVtbl->CommandQueueD3D12.SignalFence           ((ICommandQueueD3D12*)(This), __VA_ARGS__)
+#    define ICommandQueueD3D12_GetNextFenceValue(This)      CALL_IFACE_METHOD(CommandQueueD3D12, GetNextFenceValue,     This)
+#    define ICommandQueueD3D12_Submit(This, ...)            CALL_IFACE_METHOD(CommandQueueD3D12, Submit,                This, __VA_ARGS__)
+#    define ICommandQueueD3D12_GetD3D12CommandQueue(This)   CALL_IFACE_METHOD(CommandQueueD3D12, GetD3D12CommandQueue,  This)
+#    define ICommandQueueD3D12_GetCompletedFenceValue(This) CALL_IFACE_METHOD(CommandQueueD3D12, GetCompletedFenceValue,This)
+#    define ICommandQueueD3D12_WaitForIdle(This)            CALL_IFACE_METHOD(CommandQueueD3D12, WaitForIdle,           This)
+#    define ICommandQueueD3D12_SignalFence(This, ...)       CALL_IFACE_METHOD(CommandQueueD3D12, SignalFence,           This, __VA_ARGS__)
 
 // clang-format on
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h b/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h
index ca55515c..5bbbc91e 100644
--- a/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/DeviceContextD3D12.h
@@ -125,11 +125,11 @@ typedef struct IDeviceContextD3D12
 
 // clang-format off
 
-#    define IDeviceContextD3D12_TransitionTextureState(This, ...) (This)->pVtbl->DeviceContextD3D12.TransitionTextureState((IDeviceContextD3D12*)(This), __VA_ARGS__)
-#    define IDeviceContextD3D12_TransitionBufferState(This, ...)  (This)->pVtbl->DeviceContextD3D12.TransitionBufferState ((IDeviceContextD3D12*)(This), __VA_ARGS__)
-#    define IDeviceContextD3D12_GetD3D12CommandList(This)         (This)->pVtbl->DeviceContextD3D12.GetD3D12CommandList   ((IDeviceContextD3D12*)(This))
-#    define IDeviceContextD3D12_LockCommandQueue(This)            (This)->pVtbl->DeviceContextD3D12.LockCommandQueue      ((IDeviceContextD3D12*)(This))
-#    define IDeviceContextD3D12_UnlockCommandQueue(This)          (This)->pVtbl->DeviceContextD3D12.UnlockCommandQueue    ((IDeviceContextD3D12*)(This))
+#    define IDeviceContextD3D12_TransitionTextureState(This, ...) CALL_IFACE_METHOD(DeviceContextD3D12, TransitionTextureState,This, __VA_ARGS__)
+#    define IDeviceContextD3D12_TransitionBufferState(This, ...)  CALL_IFACE_METHOD(DeviceContextD3D12, TransitionBufferState, This, __VA_ARGS__)
+#    define IDeviceContextD3D12_GetD3D12CommandList(This)         CALL_IFACE_METHOD(DeviceContextD3D12, GetD3D12CommandList,   This)
+#    define IDeviceContextD3D12_LockCommandQueue(This)            CALL_IFACE_METHOD(DeviceContextD3D12, LockCommandQueue,      This)
+#    define IDeviceContextD3D12_UnlockCommandQueue(This)          CALL_IFACE_METHOD(DeviceContextD3D12, UnlockCommandQueue,    This)
 
 // clang-format on
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h b/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h
index a7e0304e..f878820a 100644
--- a/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/EngineFactoryD3D12.h
@@ -191,12 +191,12 @@ typedef struct IEngineFactoryD3D12
 
 // clang-format off
 
-#    define IEngineFactoryD3D12_LoadD3D12(This, ...)                    (This)->pVtbl->EngineFactoryD3D12.LoadD3D12                   ((IEngineFactoryD3D12*)(This), __VA_ARGS__)
-#    define IEngineFactoryD3D12_CreateDeviceAndContextsD3D12(This, ...) (This)->pVtbl->EngineFactoryD3D12.CreateDeviceAndContextsD3D12((IEngineFactoryD3D12*)(This), __VA_ARGS__)
-#    define IEngineFactoryD3D12_CreateSwapChainD3D12(This, ...)         (This)->pVtbl->EngineFactoryD3D12.CreateSwapChainD3D12        ((IEngineFactoryD3D12*)(This), __VA_ARGS__)
-#    define IEngineFactoryD3D12_AttachToD3D12Device(This, ...)          (This)->pVtbl->EngineFactoryD3D12.AttachToD3D12Device         ((IEngineFactoryD3D12*)(This), __VA_ARGS__)
-#    define IEngineFactoryD3D12_EnumerateAdapters(This, ...)            (This)->pVtbl->EngineFactoryD3D12.EnumerateAdapters           ((IEngineFactoryD3D12*)(This), __VA_ARGS__)
-#    define IEngineFactoryD3D12_EnumerateDisplayModes(This, ...)        (This)->pVtbl->EngineFactoryD3D12.EnumerateDisplayModes       ((IEngineFactoryD3D12*)(This), __VA_ARGS__)
+#    define IEngineFactoryD3D12_LoadD3D12(This, ...)                    CALL_IFACE_METHOD(EngineFactoryD3D12, LoadD3D12,                    This, __VA_ARGS__)
+#    define IEngineFactoryD3D12_CreateDeviceAndContextsD3D12(This, ...) CALL_IFACE_METHOD(EngineFactoryD3D12, CreateDeviceAndContextsD3D12, This, __VA_ARGS__)
+#    define IEngineFactoryD3D12_CreateSwapChainD3D12(This, ...)         CALL_IFACE_METHOD(EngineFactoryD3D12, CreateSwapChainD3D12,         This, __VA_ARGS__)
+#    define IEngineFactoryD3D12_AttachToD3D12Device(This, ...)          CALL_IFACE_METHOD(EngineFactoryD3D12, AttachToD3D12Device,          This, __VA_ARGS__)
+#    define IEngineFactoryD3D12_EnumerateAdapters(This, ...)            CALL_IFACE_METHOD(EngineFactoryD3D12, EnumerateAdapters,            This, __VA_ARGS__)
+#    define IEngineFactoryD3D12_EnumerateDisplayModes(This, ...)        CALL_IFACE_METHOD(EngineFactoryD3D12, EnumerateDisplayModes,        This, __VA_ARGS__)
 
 // clang-format on
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/FenceD3D12.h b/Graphics/GraphicsEngineD3D12/interface/FenceD3D12.h
index 25fc5c04..6cad4f48 100644
--- a/Graphics/GraphicsEngineD3D12/interface/FenceD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/FenceD3D12.h
@@ -78,8 +78,8 @@ typedef struct IFenceD3D12
 
 // clang-format off
 
-#    define IFenceD3D12_GetD3D12Fence(This)          (This)->pVtbl->FenceD3D12.GetD3D12Fence    ((IFenceD3D12*)(This))
-#    define IFenceD3D12_WaitForCompletion(This, ...) (This)->pVtbl->FenceD3D12.WaitForCompletion((IFenceD3D12*)(This), __VA_ARGS__)
+#    define IFenceD3D12_GetD3D12Fence(This)          CALL_IFACE_METHOD(FenceD3D12, GetD3D12Fence,     This)
+#    define IFenceD3D12_WaitForCompletion(This, ...) CALL_IFACE_METHOD(FenceD3D12, WaitForCompletion, This, __VA_ARGS__)
 
 // clang-format on
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h b/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h
index 41cff8d9..2a289e42 100644
--- a/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/PipelineStateD3D12.h
@@ -77,8 +77,8 @@ typedef struct IPipelineStateD3D12
 
 // clang-format off
 
-#    define IPipelineStateD3D12_GetD3D12PipelineState(This) (This)->pVtbl->PipelineStateD3D12.GetD3D12PipelineState((IPipelineStateD3D12*)(This))
-#    define IPipelineStateD3D12_GetD3D12RootSignature(This) (This)->pVtbl->PipelineStateD3D12.GetD3D12RootSignature((IPipelineStateD3D12*)(This))
+#    define IPipelineStateD3D12_GetD3D12PipelineState(This) CALL_IFACE_METHOD(PipelineStateD3D12, GetD3D12PipelineState, This)
+#    define IPipelineStateD3D12_GetD3D12RootSignature(This) CALL_IFACE_METHOD(PipelineStateD3D12, GetD3D12RootSignature, This)
 
 // clang-format on
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/QueryD3D12.h b/Graphics/GraphicsEngineD3D12/interface/QueryD3D12.h
index 918172ca..78c7165d 100644
--- a/Graphics/GraphicsEngineD3D12/interface/QueryD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/QueryD3D12.h
@@ -68,8 +68,8 @@ typedef struct IQueryD3D12
     struct IQueryD3D12Vtbl* pVtbl;
 } IQueryD3D12;
 
-#    define IQueryD3D12_GetD3D12QueryHeap(This) (This)->pVtbl->QueryD3D12.GetD3D12QueryHeap((IQueryD3D12*)(This))
-#    define IQueryD3D12_GetQueryHeapIndex(This) (This)->pVtbl->QueryD3D12.GetQueryHeapIndex((IQueryD3D12*)(This))
+#    define IQueryD3D12_GetD3D12QueryHeap(This) CALL_IFACE_METHOD(QueryD3D12, GetD3D12QueryHeap, This)
+#    define IQueryD3D12_GetQueryHeapIndex(This) CALL_IFACE_METHOD(QueryD3D12, GetQueryHeapIndex, This)
 
 #endif
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h
index fa61e89c..f29dfff0 100644
--- a/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/RenderDeviceD3D12.h
@@ -117,12 +117,12 @@ typedef struct IRenderDeviceD3D12
 
 // clang-format off
 
-#    define IRenderDeviceD3D12_GetD3D12Device(This)                    (This)->pVtbl->RenderDeviceD3D12.GetD3D12Device              ((IRenderDeviceD3D12*)(This))
-#    define IRenderDeviceD3D12_GetNextFenceValue(This, ...)            (This)->pVtbl->RenderDeviceD3D12.GetNextFenceValue           ((IRenderDeviceD3D12*)(This), __VA_ARGS__)
-#    define IRenderDeviceD3D12_GetCompletedFenceValue(This, ...)       (This)->pVtbl->RenderDeviceD3D12.GetCompletedFenceValue      ((IRenderDeviceD3D12*)(This), __VA_ARGS__)
-#    define IRenderDeviceD3D12_IsFenceSignaled(This, ...)              (This)->pVtbl->RenderDeviceD3D12.IsFenceSignaled             ((IRenderDeviceD3D12*)(This), __VA_ARGS__)
-#    define IRenderDeviceD3D12_CreateTextureFromD3DResource(This, ...) (This)->pVtbl->RenderDeviceD3D12.CreateTextureFromD3DResource((IRenderDeviceD3D12*)(This), __VA_ARGS__)
-#    define IRenderDeviceD3D12_CreateBufferFromD3DResource(This, ...)  (This)->pVtbl->RenderDeviceD3D12.CreateBufferFromD3DResource ((IRenderDeviceD3D12*)(This), __VA_ARGS__)
+#    define IRenderDeviceD3D12_GetD3D12Device(This)                    CALL_IFACE_METHOD(RenderDeviceD3D12, GetD3D12Device,               This)
+#    define IRenderDeviceD3D12_GetNextFenceValue(This, ...)            CALL_IFACE_METHOD(RenderDeviceD3D12, GetNextFenceValue,            This, __VA_ARGS__)
+#    define IRenderDeviceD3D12_GetCompletedFenceValue(This, ...)       CALL_IFACE_METHOD(RenderDeviceD3D12, GetCompletedFenceValue,       This, __VA_ARGS__)
+#    define IRenderDeviceD3D12_IsFenceSignaled(This, ...)              CALL_IFACE_METHOD(RenderDeviceD3D12, IsFenceSignaled,              This, __VA_ARGS__)
+#    define IRenderDeviceD3D12_CreateTextureFromD3DResource(This, ...) CALL_IFACE_METHOD(RenderDeviceD3D12, CreateTextureFromD3DResource, This, __VA_ARGS__)
+#    define IRenderDeviceD3D12_CreateBufferFromD3DResource(This, ...)  CALL_IFACE_METHOD(RenderDeviceD3D12, CreateBufferFromD3DResource,  This, __VA_ARGS__)
 
 // clang-format on
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h b/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h
index 6ca1350c..a37d477a 100644
--- a/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/SamplerD3D12.h
@@ -68,7 +68,7 @@ typedef struct ISamplerD3D12
     struct ISamplerD3D12Vtbl* pVtbl;
 } ISamplerD3D12;
 
-#    define ISamplerD3D12_GetCPUDescriptorHandle(This) (This)->pVtbl->SamplerD3D12.GetCPUDescriptorHandle((ISamplerD3D12*)(This))
+#    define ISamplerD3D12_GetCPUDescriptorHandle(This) CALL_IFACE_METHOD(SamplerD3D12, GetCPUDescriptorHandle, This)
 
 #endif
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h b/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h
index a5dc7bb8..afe58928 100644
--- a/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/SwapChainD3D12.h
@@ -73,7 +73,7 @@ typedef struct ISwapChainD3D12
 
 // clang-format off
 
-#    define ISwapChainD3D12_GetDXGISwapChain(This)  (This)->pVtbl->SwapChainD3D12.GetDXGISwapChain((ISwapChainD3D12*)(This))
+#    define ISwapChainD3D12_GetDXGISwapChain(This)  CALL_IFACE_METHOD(SwapChainD3D12, GetDXGISwapChain, This)
 
 // clang-format on
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h b/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h
index f2e48201..e2bfa4cc 100644
--- a/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/TextureD3D12.h
@@ -85,9 +85,9 @@ typedef struct ITextureD3D12
 
 // clang-format off
 
-#    define ITextureD3D12_GetD3D12Texture(This)            (This)->pVtbl->TextureD3D12.GetD3D12Texture      ((ITextureD3D12*)(This))
-#    define ITextureD3D12_SetD3D12ResourceState(This, ...) (This)->pVtbl->TextureD3D12.SetD3D12ResourceState((ITextureD3D12*)(This), __VA_ARGS__)
-#    define ITextureD3D12_GetD3D12ResourceState(This)      (This)->pVtbl->TextureD3D12.GetD3D12ResourceState((ITextureD3D12*)(This))
+#    define ITextureD3D12_GetD3D12Texture(This)            CALL_IFACE_METHOD(TextureD3D12, GetD3D12Texture,       This)
+#    define ITextureD3D12_SetD3D12ResourceState(This, ...) CALL_IFACE_METHOD(TextureD3D12, SetD3D12ResourceState, This, __VA_ARGS__)
+#    define ITextureD3D12_GetD3D12ResourceState(This)      CALL_IFACE_METHOD(TextureD3D12, GetD3D12ResourceState, This)
 
 // clang-format ons
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h b/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h
index cf87716e..461c5631 100644
--- a/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/TextureViewD3D12.h
@@ -66,7 +66,7 @@ typedef struct ITextureViewD3D12
     struct ITextureViewD3D12Vtbl* pVtbl;
 } ITextureViewD3D12;
 
-#    define ITextureViewD3D12_GetCPUDescriptorHandle(This) (This)->pVtbl->TextureViewD3D12.GetCPUDescriptorHandle((ITextureViewD3D12*)(This))
+#    define ITextureViewD3D12_GetCPUDescriptorHandle(This) CALL_IFACE_METHOD(TextureViewD3D12, GetCPUDescriptorHandle, This)
 
 #endif