Implemented IShaderD3D C interface.

Closed https://github.com/DiligentGraphics/DiligentCore/issues/55

3 files changed, 34 insertions, 5 deletions

diff --git a/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h b/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h
index 29d8345d..4a68af4a 100644
--- a/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h
+++ b/Graphics/GraphicsEngineD3D11/interface/ShaderD3D11.h
@@ -60,6 +60,7 @@ struct IShaderD3D11Vtbl
     struct IObjectMethods       Object;
     struct IDeviceObjectMethods DeviceObject;
     struct IShaderMethods       Shader;
+    struct IShaderD3DMethods    ShaderD3D;
     struct IShaderD3D11Methods  ShaderD3D11;
 };
 
diff --git a/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h b/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h
index 65c8e32f..2027e0cd 100644
--- a/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h
+++ b/Graphics/GraphicsEngineD3D12/interface/ShaderD3D12.h
@@ -63,6 +63,7 @@ struct IShaderD3D12Vtbl
     struct IObjectMethods       Object;
     struct IDeviceObjectMethods DeviceObject;
     struct IShaderMethods       Shader;
+    struct IShaderD3DMethods    ShaderD3D;
     //struct IShaderD3D12Methods  ShaderD3D12;
 };
 
diff --git a/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h b/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h
index f64ba232..b5ef72b9 100644
--- a/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h
+++ b/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h
@@ -47,20 +47,47 @@ struct HLSLShaderResourceDesc DILIGENT_DERIVE(ShaderResourceDesc)
 
     Uint32 ShaderRegister DEFAULT_INITIALIZER(0);
 };
+typedef struct HLSLShaderResourceDesc HLSLShaderResourceDesc;
 
 // clang-format on
 
-#if DILIGENT_CPP_INTERFACE
+#define DILIGENT_INTERFACE_NAME IShaderD3D
+#include "../../../Primitives/interface/DefineInterfaceHelperMacros.h"
+
+// clang-format off
 
 /// Exposes Direct3D-specific functionality of a shader object.
-class IShaderD3D : public IShader
+DILIGENT_INTERFACE(IShaderD3D, IShader)
 {
-public:
     /// Returns HLSL shader resource description
-    virtual void GetHLSLResource(Uint32 Index, HLSLShaderResourceDesc& ResourceDesc) const = 0;
+    VIRTUAL void METHOD(GetHLSLResource)(THIS_
+                                         Uint32                     Index,
+                                         HLSLShaderResourceDesc REF ResourceDesc) CONST PURE;
 };
 
-#else
+#include "../../../Primitives/interface/UndefInterfaceHelperMacros.h"
+
+#if DILIGENT_C_INTERFACE
+
+// clang-format on
+
+struct IShaderD3DVtbl
+{
+    struct IObjectMethods       Object;
+    struct IDeviceObjectMethods DeviceObject;
+    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__)
+
+// clang-format on
 
 #endif