summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineD3DBase
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2020-01-27 06:01:27 +0000
committerassiduous <assiduous@diligentgraphics.com>2020-01-27 06:01:27 +0000
commit87029a3f6979c79c65f9828bf886d01dcd94b936 (patch)
tree75e1a88d398d03bbd29258af6f20be6203238d8b /Graphics/GraphicsEngineD3DBase
parentFixed BufferViewMtlImpl (diff)
downloadDiligentCore-87029a3f6979c79c65f9828bf886d01dcd94b936.tar.gz
DiligentCore-87029a3f6979c79c65f9828bf886d01dcd94b936.zip
Implemented D3D11 engine C interface (mostly)
Diffstat (limited to 'Graphics/GraphicsEngineD3DBase')
-rw-r--r--Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h24
1 files changed, 17 insertions, 7 deletions
diff --git a/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h b/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h
index 98b3501d..55ec3a5c 100644
--- a/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h
+++ b/Graphics/GraphicsEngineD3DBase/interface/ShaderD3D.h
@@ -32,20 +32,26 @@
#include "../../GraphicsEngine/interface/Shader.h"
-namespace Diligent
-{
+DILIGENT_BEGIN_NAMESPACE(Diligent)
+
// {1EA0898C-1612-457F-B74E-808843D2CBE3}
-static constexpr INTERFACE_ID IID_ShaderD3D =
+static const struct INTERFACE_ID IID_ShaderD3D =
{0x1ea0898c, 0x1612, 0x457f, {0xb7, 0x4e, 0x80, 0x88, 0x43, 0xd2, 0xcb, 0xe3}};
+// clang-format off
+
/// HLSL resource description
-struct HLSLShaderResourceDesc : ShaderResourceDesc
-{
- Uint32 ShaderRegister = 0;
+struct HLSLShaderResourceDesc DILIGENT_DERIVE(ShaderResourceDesc)
+
+ Uint32 ShaderRegister DEFAULT_INITIALIZER(0);
};
+// clang-format on
+
+#if DILIGENT_CPP_INTERFACE
+
/// Exposes Direct3D-specific functionality of a shader object.
class IShaderD3D : public IShader
{
@@ -54,4 +60,8 @@ public:
virtual HLSLShaderResourceDesc GetHLSLResource(Uint32 Index) const = 0;
};
-} // namespace Diligent
+#else
+
+#endif
+
+DILIGENT_END_NAMESPACE // namespace Diligent