diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2020-01-28 05:06:57 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2020-01-28 05:06:57 +0000 |
| commit | 7f60ebc2347aed1866726ea82df7116010414b8d (patch) | |
| tree | eb126cb016cf5712186dca16b058df2937909641 /Graphics/GraphicsEngineD3D11 | |
| parent | Refactored D3D11 C interface (diff) | |
| download | DiligentCore-7f60ebc2347aed1866726ea82df7116010414b8d.tar.gz DiligentCore-7f60ebc2347aed1866726ea82df7116010414b8d.zip | |
Implemented C interface for D3D12 backend
Diffstat (limited to 'Graphics/GraphicsEngineD3D11')
5 files changed, 9 insertions, 11 deletions
diff --git a/Graphics/GraphicsEngineD3D11/interface/EngineFactoryD3D11.h b/Graphics/GraphicsEngineD3D11/interface/EngineFactoryD3D11.h index 855081a1..09e72ea4 100644 --- a/Graphics/GraphicsEngineD3D11/interface/EngineFactoryD3D11.h +++ b/Graphics/GraphicsEngineD3D11/interface/EngineFactoryD3D11.h @@ -150,12 +150,12 @@ DILIGENT_INTERFACE(IEngineFactoryD3D11, IEngineFactory) DisplayModeAttribs* DisplayModes) PURE; }; - // clang-format on - #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h" #if DILIGENT_C_INTERFACE +// clang-format on + struct IEngineFactoryD3D11Vtbl { struct IObjectMethods Object; diff --git a/Graphics/GraphicsEngineD3D11/interface/QueryD3D11.h b/Graphics/GraphicsEngineD3D11/interface/QueryD3D11.h index 65e4c306..96b52d27 100644 --- a/Graphics/GraphicsEngineD3D11/interface/QueryD3D11.h +++ b/Graphics/GraphicsEngineD3D11/interface/QueryD3D11.h @@ -38,7 +38,7 @@ DILIGENT_BEGIN_NAMESPACE(Diligent) static const struct INTERFACE_ID IID_QueryD3D11 = {0x77d95eaa, 0xd16e, 0x43f4, {0xb0, 0xeb, 0xbe, 0xbc, 0xd2, 0xec, 0x8c, 0x57}}; -#define DILIGENT_INTERFACE_NAME IPipelineStateD3D11 +#define DILIGENT_INTERFACE_NAME IQueryD3D11 #include "../../../Primitives/interface/DefineInterfaceHelperMacros.h" /// Exposes Direct3D11-specific functionality of a Query object. diff --git a/Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h b/Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h index e6e81a55..ecb4ec73 100644 --- a/Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h +++ b/Graphics/GraphicsEngineD3D11/interface/RenderDeviceD3D11.h @@ -110,12 +110,12 @@ DILIGENT_INTERFACE(IRenderDeviceD3D11, IRenderDevice) ITexture** ppTexture) PURE; }; - // clang-format on - #include "../../../Primitives/interface/UndefInterfaceHelperMacros.h" #if DILIGENT_C_INTERFACE +// clang-format on + struct IRenderDeviceD3D11Vtbl { struct IObjectMethods Object; diff --git a/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h b/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h index f7240f90..afa876e4 100644 --- a/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h +++ b/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h @@ -63,12 +63,12 @@ struct IShaderD3D11Vtbl struct IShaderD3D11Methods ShaderD3D11; }; -struct IShaderD3D11 +typedef struct IShaderD3D11 { struct IShaderD3D11Vtbl* pVtbl; -}; +} IShaderD3D11; -# define IShaderD3D11_GetD3D11Shader(This) (This)->pVtbl->ShaderD3D11.GetD3D11Shader((struct IShaderD3D11*)(This)) +# define IShaderD3D11_GetD3D11Shader(This) (This)->pVtbl->ShaderD3D11.GetD3D11Shader((IShaderD3D11*)(This)) #endif diff --git a/Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h b/Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h index dd9da9fd..096637c5 100644 --- a/Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h +++ b/Graphics/GraphicsEngineD3D11/interface/ShaderResourceBindingD3D11.h @@ -44,9 +44,7 @@ static const struct INTERFACE_ID IID_ShaderResourceBindingD3D11 = #if DILIGENT_CPP_INTERFACE /// Exposes Direct3D11-specific functionality of a shader resource binding object. -class IShaderResourceBindingD3D11 : public IShaderResourceBinding -{ -}; +DILIGENT_INTERFACE(IShaderResourceBindingD3D11, IShaderResourceBinding){}; #endif |