summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineD3DBase
diff options
context:
space:
mode:
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