Updates to comply with the new API

17 files changed, 52 insertions, 51 deletions

diff --git a/AssetLoader/interface/DXSDKMeshLoader.h b/AssetLoader/interface/DXSDKMeshLoader.h
index e06eb8b..b27a721 100644
--- a/AssetLoader/interface/DXSDKMeshLoader.h
+++ b/AssetLoader/interface/DXSDKMeshLoader.h
@@ -35,8 +35,8 @@
 #include "../../../DiligentCore/Graphics/GraphicsEngine/interface/Buffer.h"
 #include "../../../DiligentCore/Graphics/GraphicsEngine/interface/Texture.h"
 #include "../../../DiligentCore/Graphics/GraphicsEngine/interface/TextureView.h"
-#include "../../../DiligentCore/Common/interface/BasicMath.h"
-#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.h"
+#include "../../../DiligentCore/Common/interface/BasicMath.hpp"
+#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
 
 namespace Diligent
 {
diff --git a/AssetLoader/interface/GLTFLoader.h b/AssetLoader/interface/GLTFLoader.h
index d9322c6..b5f9036 100644
--- a/AssetLoader/interface/GLTFLoader.h
+++ b/AssetLoader/interface/GLTFLoader.h
@@ -32,8 +32,8 @@
 
 #include "../../../DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
 #include "../../../DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
-#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.h"
-#include "../../../DiligentCore/Common/interface/AdvancedMath.h"
+#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
+#include "../../../DiligentCore/Common/interface/AdvancedMath.hpp"
 
 namespace tinygltf
 {
diff --git a/AssetLoader/src/DXSDKMeshLoader.cpp b/AssetLoader/src/DXSDKMeshLoader.cpp
index f4c3686..f36c180 100644
--- a/AssetLoader/src/DXSDKMeshLoader.cpp
+++ b/AssetLoader/src/DXSDKMeshLoader.cpp
@@ -29,11 +29,11 @@
 #include <sstream>
 
 #include "DXSDKMeshLoader.h"
-#include "DataBlobImpl.h"
-#include "RefCntAutoPtr.h"
-#include "FileWrapper.h"
+#include "DataBlobImpl.hpp"
+#include "RefCntAutoPtr.hpp"
+#include "FileWrapper.hpp"
 #include "TextureUtilities.h"
-#include "GraphicsAccessories.h"
+#include "GraphicsAccessories.hpp"
 
 namespace Diligent
 {
diff --git a/AssetLoader/src/GLTFLoader.cpp b/AssetLoader/src/GLTFLoader.cpp
index f9c8779..f9b35ef 100644
--- a/AssetLoader/src/GLTFLoader.cpp
+++ b/AssetLoader/src/GLTFLoader.cpp
@@ -30,13 +30,13 @@
 #include <cmath>
 
 #include "GLTFLoader.h"
-#include "MapHelper.h"
+#include "MapHelper.hpp"
 #include "CommonlyUsedStates.h"
-#include "DataBlobImpl.h"
+#include "DataBlobImpl.hpp"
 #include "Image.h"
-#include "FileSystem.h"
-#include "FileWrapper.h"
-#include "GraphicsAccessories.h"
+#include "FileSystem.hpp"
+#include "FileWrapper.hpp"
+#include "GraphicsAccessories.hpp"
 
 #define TINYGLTF_IMPLEMENTATION
 #define TINYGLTF_NO_STB_IMAGE
diff --git a/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp b/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp
index 8b1bc5a..8667a80 100644
--- a/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp
+++ b/HLSL2GLSLConverter/src/HLSL2GLSLConverterApp.cpp
@@ -4,14 +4,14 @@
 #include <Windows.h>
 #include <crtdbg.h>
 
-#include "Errors.h"
-#include "HLSL2GLSLConverterImpl.h"
-#include "RefCntAutoPtr.h"
-#include "Errors.h"
+#include "Errors.hpp"
+#include "HLSL2GLSLConverterImpl.hpp"
+#include "RefCntAutoPtr.hpp"
+#include "Errors.hpp"
 #include "EngineFactoryOpenGL.h"
-#include "RefCntAutoPtr.h"
-#include "DataBlobImpl.h"
-#include "FileWrapper.h"
+#include "RefCntAutoPtr.hpp"
+#include "DataBlobImpl.hpp"
+#include "FileWrapper.hpp"
 
 using namespace Diligent;
 
@@ -155,8 +155,8 @@ int main(int argc, char** argv)
 
 #if EXPLICITLY_LOAD_ENGINE_GL_DLL
     // Declare function pointer
-    GetEngineFactoryOpenGLType GetEngineFactoryOpenGL = nullptr;
-    if( !LoadGraphicsEngineOpenGL(GetEngineFactoryOpenGL) )
+    auto GetEngineFactoryOpenGL = LoadGraphicsEngineOpenGL();
+    if (GetEngineFactoryOpenGL == nullptr)
     {
         LOG_ERROR_MESSAGE("Failed to load OpenGL engine implementation");
         return -1;
@@ -174,7 +174,7 @@ int main(int argc, char** argv)
         return -1;
     }
     RefCntAutoPtr<Diligent::IDataBlob> pHLSLSourceBlob( MakeNewRCObj<DataBlobImpl>()(0) );
-    pInputFileStream->Read(pHLSLSourceBlob);
+    pInputFileStream->ReadBlob(pHLSLSourceBlob);
     auto *HLSLSource = reinterpret_cast<char*>(pHLSLSourceBlob->GetDataPtr());
     auto SourceLen = static_cast<Int32>( pHLSLSourceBlob->GetSize() );
 
diff --git a/Imgui/CMakeLists.txt b/Imgui/CMakeLists.txt
index 579eec8..5e0b1ff 100644
--- a/Imgui/CMakeLists.txt
+++ b/Imgui/CMakeLists.txt
@@ -96,6 +96,7 @@ PRIVATE
     Diligent-PlatformInterface 
     Diligent-GraphicsEngineInterface 
     Diligent-GraphicsAccessories
+    Diligent-GraphicsTools 
 )
 
 set_target_properties(Diligent-Imgui PROPERTIES
diff --git a/Imgui/interface/ImGuiImplDiligent.h b/Imgui/interface/ImGuiImplDiligent.h
index 08714fd..542e76f 100644
--- a/Imgui/interface/ImGuiImplDiligent.h
+++ b/Imgui/interface/ImGuiImplDiligent.h
@@ -33,8 +33,8 @@
 namespace Diligent
 {
 
-class IRenderDevice;
-class IDeviceContext;
+struct IRenderDevice;
+struct IDeviceContext;
 enum TEXTURE_FORMAT : Uint16;
 
 class ImGuiImplDiligent_Internal;
diff --git a/Imgui/src/ImGuiImplDiligent.cpp b/Imgui/src/ImGuiImplDiligent.cpp
index c249b24..353949a 100644
--- a/Imgui/src/ImGuiImplDiligent.cpp
+++ b/Imgui/src/ImGuiImplDiligent.cpp
@@ -30,9 +30,9 @@
 #include "ImGuiImplDiligent.h"
 #include "RenderDevice.h"
 #include "DeviceContext.h"
-#include "RefCntAutoPtr.h"
-#include "BasicMath.h"
-#include "MapHelper.h"
+#include "RefCntAutoPtr.hpp"
+#include "BasicMath.hpp"
+#include "MapHelper.hpp"
 
 namespace Diligent
 {
diff --git a/NativeApp/src/UWP/App.cpp b/NativeApp/src/UWP/App.cpp
index 0c928eb..61a500d 100644
--- a/NativeApp/src/UWP/App.cpp
+++ b/NativeApp/src/UWP/App.cpp
@@ -32,7 +32,7 @@
 #endif
 
 #include "App.h"
-#include "StringTools.h"
+#include "StringTools.hpp"
 
 #include <ppltasks.h>
 
diff --git a/NativeApp/src/Win32/WinMain.cpp b/NativeApp/src/Win32/WinMain.cpp
index 05a6065..1a9bcd0 100644
--- a/NativeApp/src/Win32/WinMain.cpp
+++ b/NativeApp/src/Win32/WinMain.cpp
@@ -32,8 +32,8 @@
 #include <Windows.h>
 #include <crtdbg.h>
 #include "NativeAppBase.h"
-#include "StringTools.h"
-#include "Timer.h"
+#include "StringTools.hpp"
+#include "Timer.hpp"
 
 using namespace Diligent;
 
diff --git a/TextureLoader/include/pch.h b/TextureLoader/include/pch.h
index 13c3f13..35a7fbd 100644
--- a/TextureLoader/include/pch.h
+++ b/TextureLoader/include/pch.h
@@ -30,5 +30,5 @@
 #include "BasicTypes.h"
 #include "RenderDevice.h"
 #include "DeviceContext.h"
-#include "Errors.h"
-#include "DebugUtilities.h"
+#include "Errors.hpp"
+#include "DebugUtilities.hpp"
diff --git a/TextureLoader/interface/Image.h b/TextureLoader/interface/Image.h
index 6925cae..7a8f11a 100644
--- a/TextureLoader/interface/Image.h
+++ b/TextureLoader/interface/Image.h
@@ -32,8 +32,8 @@
 #include "../../../DiligentCore/Graphics/GraphicsEngine/interface/GraphicsTypes.h"
 #include "../../../DiligentCore/Primitives/interface/FileStream.h"
 #include "../../../DiligentCore/Primitives/interface/DataBlob.h"
-#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.h"
-#include "../../../DiligentCore/Common/interface/ObjectBase.h"
+#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
+#include "../../../DiligentCore/Common/interface/ObjectBase.hpp"
 
 namespace Diligent
 {
diff --git a/TextureLoader/src/Image.cpp b/TextureLoader/src/Image.cpp
index f2dc7f0..5f0bb0c 100644
--- a/TextureLoader/src/Image.cpp
+++ b/TextureLoader/src/Image.cpp
@@ -31,19 +31,19 @@
 #include <array>
 
 #include "Image.h"
-#include "Errors.h"
+#include "Errors.hpp"
 
 #include "tiffio.h"
 #include "png.h"
 #include "jpeglib.h"
 
-#include "DataBlobImpl.h"
-#include "DebugUtilities.h"
-#include "RefCntAutoPtr.h"
-#include "Align.h"
-#include "GraphicsAccessories.h"
-#include "BasicFileStream.h"
-#include "StringTools.h"
+#include "DataBlobImpl.hpp"
+#include "DebugUtilities.hpp"
+#include "RefCntAutoPtr.hpp"
+#include "Align.hpp"
+#include "GraphicsAccessories.hpp"
+#include "BasicFileStream.hpp"
+#include "StringTools.hpp"
 
 namespace Diligent
 {
@@ -770,7 +770,7 @@ EImageFileFormat CreateImageFromFile(const Char* FilePath,
             LOG_ERROR_AND_THROW("Failed to open image file \"", FilePath, '\"');
 
         RefCntAutoPtr<IDataBlob> pFileData(MakeNewRCObj<DataBlobImpl>()(0));
-        pFileStream->Read(pFileData);
+        pFileStream->ReadBlob(pFileData);
 
         ImgFileFormat = Image::GetFileFormat(reinterpret_cast<Uint8*>(pFileData->GetDataPtr()), pFileData->GetSize());
         if (ImgFileFormat == EImageFileFormat::unknown)
diff --git a/TextureLoader/src/KTXLoader.cpp b/TextureLoader/src/KTXLoader.cpp
index 5bf4f74..a747844 100644
--- a/TextureLoader/src/KTXLoader.cpp
+++ b/TextureLoader/src/KTXLoader.cpp
@@ -27,8 +27,8 @@
 
 #include <algorithm>
 #include "TextureLoader.h"
-#include "GraphicsAccessories.h"
-#include "Align.h"
+#include "GraphicsAccessories.hpp"
+#include "Align.hpp"
 
 #define GL_RGBA32F            0x8814
 #define GL_RGBA32UI           0x8D70
diff --git a/TextureLoader/src/TextureLoader.cpp b/TextureLoader/src/TextureLoader.cpp
index 530fd6e..9aa8c67 100644
--- a/TextureLoader/src/TextureLoader.cpp
+++ b/TextureLoader/src/TextureLoader.cpp
@@ -32,7 +32,7 @@
 #include <vector>
 
 #include "TextureLoader.h"
-#include "GraphicsAccessories.h"
+#include "GraphicsAccessories.hpp"
 #include "DDSLoader.h"
 #include "ColorConversion.h"
 
diff --git a/TextureLoader/src/TextureUtilities.cpp b/TextureLoader/src/TextureUtilities.cpp
index b3ac604..8349c9d 100644
--- a/TextureLoader/src/TextureUtilities.cpp
+++ b/TextureLoader/src/TextureUtilities.cpp
@@ -27,11 +27,11 @@
 
 #include "pch.h"
 #include "TextureUtilities.h"
-#include "Errors.h"
+#include "Errors.hpp"
 #include "TextureLoader.h"
 #include "Image.h"
-#include "RefCntAutoPtr.h"
-#include "DataBlobImpl.h"
+#include "RefCntAutoPtr.hpp"
+#include "DataBlobImpl.hpp"
 
 namespace Diligent
 {
diff --git a/ThirdParty/imGuIZMO.quat/imGuIZMO.cpp b/ThirdParty/imGuIZMO.quat/imGuIZMO.cpp
index 140b8ee..60a03eb 100644
--- a/ThirdParty/imGuIZMO.quat/imGuIZMO.cpp
+++ b/ThirdParty/imGuIZMO.quat/imGuIZMO.cpp
@@ -14,7 +14,7 @@
 // Modified by Egor Yusov, Diligent Graphics LLC
 
 
-#include "BasicMath.h"
+#include "BasicMath.hpp"
 #include "imGuIZMO.h"