merge fixes

Author: Erfan-Ahmadi

include/nbl/asset/utils/CHLSLCompiler.h

@@ -8,11 +8,12 @@
 #include "nbl/asset/utils/ISPIRVOptimizer.h"
 #include "nbl/asset/utils/IShaderCompiler.h"
 
+class IDxcUtils;
+class IDxcCompiler3;
+class DxcCompilationResult;
+
 #include <wrl.h>
 #include <combaseapi.h>
-#include <dxc/dxc/include/dxc/dxcapi.h>
-
-using Microsoft::WRL::ComPtr;
 
 namespace nbl::asset
 {
@@ -49,8 +50,8 @@ class NBL_API2 CHLSLCompiler final : public IShaderCompiler
 		void insertIntoStart(std::string& code, std::ostringstream&& ins) const override;
 	protected:
 
-		ComPtr<IDxcUtils> m_dxcUtils;
-		ComPtr<IDxcCompiler3> m_dxcCompiler;
+		Microsoft::WRL::ComPtr<IDxcUtils> m_dxcUtils;
+		Microsoft::WRL::ComPtr<IDxcCompiler3> m_dxcCompiler;
 
 		DxcCompilationResult dxcCompile(std::string& source, LPCWSTR* args, uint32_t argCount, const CHLSLCompiler::SOptions& options) const;
 

src/nbl/asset/utils/CHLSLCompiler.cpp

@@ -4,6 +4,8 @@
 #include "nbl/asset/utils/CHLSLCompiler.h"
 #include "nbl/asset/utils/shadercUtils.h"
 
+#include <dxc/dxcapi.h>
+
 #include <sstream>
 #include <regex>
 #include <iterator>
@@ -14,6 +16,7 @@
 
 using namespace nbl;
 using namespace nbl::asset;
+using Microsoft::WRL::ComPtr;
 
 CHLSLCompiler::CHLSLCompiler(core::smart_refctd_ptr<system::ISystem>&& system)
     : IShaderCompiler(std::move(system))