From de9b8692d538f4249e30dd979c3ebac45120be41 Mon Sep 17 00:00:00 2001 From: assiduous Date: Tue, 28 Jan 2020 12:30:39 -0800 Subject: Reworked interface definitions to use DILIGENT_BEGIN_INTERFACE/DILIGENT_END_INTERFACE pair --- Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'Graphics/GraphicsEngineD3DBase') diff --git a/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h b/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h index b5ef72b9..4e03354f 100644 --- a/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h +++ b/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h @@ -57,13 +57,14 @@ typedef struct HLSLShaderResourceDesc HLSLShaderResourceDesc; // clang-format off /// Exposes Direct3D-specific functionality of a shader object. -DILIGENT_INTERFACE(IShaderD3D, IShader) +DILIGENT_BEGIN_INTERFACE(IShaderD3D, IShader) { /// Returns HLSL shader resource description VIRTUAL void METHOD(GetHLSLResource)(THIS_ Uint32 Index, HLSLShaderResourceDesc REF ResourceDesc) CONST PURE; }; +DILIGENT_END_INTERFACE #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h" @@ -78,11 +79,6 @@ struct IShaderD3DVtbl struct IShaderD3DMethods ShaderD3D; }; -typedef struct IShaderD3D -{ - struct IShaderD3DVtbl* pVtbl; -} IShaderD3D; - // clang-format off # define IShaderD3D_GetHLSLResource(This, ...) CALL_IFACE_METHOD(ShaderD3D, GetHLSLResource, This, __VA_ARGS__) -- cgit v1.2.3