More .h -> .hpp renamings

6 files changed, 19 insertions, 8 deletions

diff --git a/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt b/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt
index 90730324..109687df 100644
--- a/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt
+++ b/Graphics/HLSL2GLSLConverterLib/CMakeLists.txt
@@ -4,8 +4,8 @@ project(Diligent-HLSL2GLSLConverterLib CXX)
 
 set(INCLUDE 
     include/GLSLDefinitions.h
-    include/HLSL2GLSLConverterImpl.h
-    include/HLSL2GLSLConverterObject.h
+    include/HLSL2GLSLConverterImpl.hpp
+    include/HLSL2GLSLConverterObject.hpp
     include/HLSLKeywords.h
 )
 
diff --git a/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterImpl.h b/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterImpl.hpp
index 0777dbdd..0777dbdd 100644
--- a/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterImpl.h
+++ b/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterImpl.hpp
diff --git a/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterObject.h b/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterObject.hpp
index 8603ced8..8603ced8 100644
--- a/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterObject.h
+++ b/Graphics/HLSL2GLSLConverterLib/include/HLSL2GLSLConverterObject.hpp
diff --git a/Graphics/HLSL2GLSLConverterLib/interface/HLSL2GLSLConverter.h b/Graphics/HLSL2GLSLConverterLib/interface/HLSL2GLSLConverter.h
index f9b0f503..3633e356 100644
--- a/Graphics/HLSL2GLSLConverterLib/interface/HLSL2GLSLConverter.h
+++ b/Graphics/HLSL2GLSLConverterLib/interface/HLSL2GLSLConverter.h
@@ -33,13 +33,14 @@
 #include "../../GraphicsEngine/interface/Shader.h"
 #include "../../../Primitives/interface/DataBlob.h"
 
-namespace Diligent
-{
+DILIGENT_BEGIN_NAMESPACE(Diligent)
 
 // {1FDE020A-9C73-4A76-8AEF-C2C6C2CF0EA5}
 static constexpr INTERFACE_ID IID_HLSL2GLSLConversionStream =
     {0x1fde020a, 0x9c73, 0x4a76, {0x8a, 0xef, 0xc2, 0xc6, 0xc2, 0xcf, 0xe, 0xa5}};
 
+#if DILIGENT_CPP_INTERFACE
+
 class IHLSL2GLSLConversionStream : public IObject
 {
 public:
@@ -51,11 +52,17 @@ public:
                          IDataBlob** ppGLSLSource) = 0;
 };
 
+#else
+
+#endif
+
 
 // {44A21160-77E0-4DDC-A57E-B8B8B65B5342}
 static constexpr INTERFACE_ID IID_HLSL2GLSLConverter =
     {0x44a21160, 0x77e0, 0x4ddc, {0xa5, 0x7e, 0xb8, 0xb8, 0xb6, 0x5b, 0x53, 0x42}};
 
+#if DILIGENT_CPP_INTERFACE
+
 /// Interface to the buffer object implemented in OpenGL
 class IHLSL2GLSLConverter : public IObject
 {
@@ -67,4 +74,8 @@ public:
                               IHLSL2GLSLConversionStream**     ppStream) const = 0;
 };
 
-} // namespace Diligent
+#else
+
+#endif
+
+DILIGENT_END_NAMESPACE // namespace Diligent
diff --git a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp
index ed4e617a..0d3755c1 100644
--- a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp
+++ b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp
@@ -357,7 +357,7 @@
 #include <unordered_set>
 #include <string>
 
-#include "HLSL2GLSLConverterImpl.h"
+#include "HLSL2GLSLConverterImpl.hpp"
 #include "ShaderBase.hpp"
 #include "DataBlobImpl.hpp"
 #include "StringDataBlobImpl.hpp"
diff --git a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterObject.cpp b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterObject.cpp
index 622df3de..e2d8a69d 100644
--- a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterObject.cpp
+++ b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterObject.cpp
@@ -26,8 +26,8 @@
  */
 
 #include "pch.h"
-#include "HLSL2GLSLConverterObject.h"
-#include "HLSL2GLSLConverterImpl.h"
+#include "HLSL2GLSLConverterObject.hpp"
+#include "HLSL2GLSLConverterImpl.hpp"
 #include "StringDataBlobImpl.hpp"
 
 namespace Diligent