fixes for const correctness, Example 2 works

Author: devshgraphicsprogramming

examples_tests/common/CommonAPI.h

@@ -388,12 +388,8 @@ class CommonAPI
 	{
 		using namespace nbl;
 		using namespace system;
-		nbl::core::smart_refctd_ptr<nbl::system::ISystemCaller> caller = nullptr;
 #ifdef _NBL_PLATFORM_WINDOWS_
-		caller = nbl::core::make_smart_refctd_ptr<nbl::system::CSystemCallerWin32>();
-#endif
-#ifdef _NBL_PLATFORM_WINDOWS_
-		return nbl::core::make_smart_refctd_ptr<nbl::system::CSystemWin32>(std::move(caller));
+		return nbl::core::make_smart_refctd_ptr<nbl::system::CSystemWin32>();
 #elif defined(_NBL_PLATFORM_ANDROID_)
 #if 0
 		return nbl::core::make_smart_refctd_ptr<nbl::system::CSystemAndroid>(std::move(caller));

include/nbl/system/IFile.h

@@ -12,7 +12,8 @@ class IFile : public IFileBase, private ISystem::IFutureManipulator
 		//
 		inline void read(ISystem::future_t<size_t>& fut, void* buffer, size_t offset, size_t sizeToRead)
 		{
-			const auto* ptr = reinterpret_cast<const std::byte*>(getMappedPointer());
+			const IFileBase* constThis = this;
+			const auto* ptr = reinterpret_cast<const std::byte*>(constThis->getMappedPointer());
 			if (ptr)
 			{
 				const size_t size = getSize();

include/nbl/system/ISystem.h

@@ -113,7 +113,7 @@ class ISystem : public core::IReferenceCounted
 
         //! Compile time resource ID
         template<typename StringUniqueType>
-        inline core::smart_refctd_ptr<IFile> loadBuiltinData() const
+        inline core::smart_refctd_ptr<const IFile> loadBuiltinData() const
         {
         #ifdef _NBL_EMBED_BUILTIN_RESOURCES_
             return impl_loadEmbeddedBuiltinData(StringUniqueType::value,nbl::builtin::get_resource<StringUniqueType>());
@@ -260,7 +260,7 @@ class ISystem : public core::IReferenceCounted
         virtual ~ISystem() {}
 
         //
-        core::smart_refctd_ptr<IFile> impl_loadEmbeddedBuiltinData(const std::string& builtinPath, const std::pair<const uint8_t*,size_t>& found) const;
+        core::smart_refctd_ptr<const IFile> impl_loadEmbeddedBuiltinData(const std::string& builtinPath, const std::pair<const uint8_t*,size_t>& found) const;
 
         // given an `absolutePath` find the archive it belongs to
         struct FoundArchiveFile

src/nbl/asset/IAssetManager.cpp

@@ -220,7 +220,7 @@ void IAssetManager::insertBuiltinAssets()
 	// materials
 	{
 		//
-		auto buildInGLSLShader = [&](	core::smart_refctd_ptr<system::IFile>&& data,
+		auto buildInGLSLShader = [&](	core::smart_refctd_ptr<const system::IFile>&& data,
 									asset::IShader::E_SHADER_STAGE type,
 									std::initializer_list<const char*> paths) -> void
 		{

src/nbl/asset/interchange/CGLTFLoader.cpp

@@ -45,7 +45,7 @@ using namespace nbl::asset;
 		{
 			auto registerShader = [&](auto constexprStringType, IShader::E_SHADER_STAGE stage, const char* extraDefine=nullptr) -> void
 			{
-				auto glslFile = assetManager->getSystem()->loadBuiltinData<decltype(constexprStringType)>();
+				core::smart_refctd_ptr<const system::IFile> glslFile = assetManager->getSystem()->loadBuiltinData<decltype(constexprStringType)>();
 				auto glsl = core::make_smart_refctd_ptr<asset::ICPUBuffer>(glslFile->getSize());
 				memcpy(glsl->getPointer(),glslFile->getMappedPointer(),glsl->getSize());
 

src/nbl/asset/interchange/CGraphicsPipelineLoaderMTL.cpp

@@ -31,7 +31,7 @@ CGraphicsPipelineLoaderMTL::CGraphicsPipelineLoaderMTL(IAssetManager* _am, core:
     //create vertex shaders and insert them into cache
     auto registerShader = [&](auto constexprStringType, ICPUShader::E_SHADER_STAGE stage) -> void
     {
-        auto data = m_assetMgr->getSystem()->loadBuiltinData<decltype(constexprStringType)>();
+        core::smart_refctd_ptr<const system::IFile> data = m_assetMgr->getSystem()->loadBuiltinData<decltype(constexprStringType)>();
         auto buffer = core::make_smart_refctd_ptr<asset::ICPUBuffer>(data->getSize());
         memcpy(buffer->getPointer(), data->getMappedPointer(), data->getSize());
         auto unspecializedShader = core::make_smart_refctd_ptr<asset::ICPUShader>(

src/nbl/asset/utils/IGLSLEmbeddedIncludeLoader.h

@@ -53,7 +53,7 @@ class IGLSLEmbeddedIncludeLoader : public IBuiltinIncludeLoader
 			system::ISystem::future_t<core::smart_refctd_ptr<system::IFile>> future;
 			auto path = "nbl/builtin/" + _name;
 			s->createFile(future,path,core::bitflag(system::IFileBase::ECF_READ)|system::IFileBase::ECF_MAPPABLE);
-			auto data = future.get();
+			core::smart_refctd_ptr<const system::IFile> data = future.get();
 			if (!data)
 				return "";
 			auto begin = reinterpret_cast<const char*>(data->getMappedPointer());

src/nbl/system/ISystem.cpp

@@ -16,7 +16,7 @@ ISystem::ISystem(core::smart_refctd_ptr<ISystem::ICaller>&& caller) : m_dispatch
     addArchiveLoader(core::make_smart_refctd_ptr<CArchiveLoaderTar>(nullptr));
 }
 
-core::smart_refctd_ptr<IFile> ISystem::impl_loadEmbeddedBuiltinData(const std::string& builtinPath, const std::pair<const uint8_t*,size_t>& found) const
+core::smart_refctd_ptr<const IFile> ISystem::impl_loadEmbeddedBuiltinData(const std::string& builtinPath, const std::pair<const uint8_t*,size_t>& found) const
 {
 #ifdef _NBL_EMBED_BUILTIN_RESOURCES_
     if (found.first && found.second)
@@ -215,7 +215,7 @@ void ISystem::createFile(future_t<core::smart_refctd_ptr<IFile>>& future, std::f
             auto file = impl_loadEmbeddedBuiltinData(filename.string(),nbl::builtin::get_resource_runtime(filename.string()));
             if (file)
             {
-                future.notify(std::move(file));
+                future.notify(core::smart_refctd_ptr<IFile>(const_cast<IFile*>(file.get())));
                 return;
             }
         #else

src/nbl/video/utilities/CScanner.cpp

@@ -6,7 +6,7 @@ using namespace video;
 core::smart_refctd_ptr<asset::ICPUShader> CScanner::createShader(const bool indirect, const E_SCAN_TYPE scanType, const E_DATA_TYPE dataType, const E_OPERATOR op) const
 {
 	auto system = m_device->getPhysicalDevice()->getSystem();
-	core::smart_refctd_ptr<nbl::system::IFile> glsl;
+	core::smart_refctd_ptr<const system::IFile> glsl;
 	{
 		if(indirect)
 			glsl = system->loadBuiltinData<NBL_CORE_UNIQUE_STRING_LITERAL_TYPE("nbl/builtin/glsl/scan/indirect.comp")>();