Merge branch 'master' into przemog_occlusion_culling

Author: Przemog1

.gitmodules

@@ -7,7 +7,7 @@
 [submodule "3rdparty/glslang"]
 	path = 3rdparty/glslang
 	url = https://github.com/devshgraphicsprogramming/glslang.git
-	branch = nabla
+	branch = master
 [submodule "3rdparty/shaderc"]
 	path = 3rdparty/shaderc
 	url = https://github.com/google/shaderc.git
@@ -20,7 +20,7 @@
 [submodule "3rdparty/spirv_cross"]
 	path = 3rdparty/spirv_cross
 	url = https://github.com/devshgraphicsprogramming/SPIRV-Cross.git
-	branch = nabla
+	branch = master
 [submodule "3rdparty/zlib"]
 	path = 3rdparty/zlib
 	url = https://github.com/madler/zlib.git
@@ -99,3 +99,9 @@
 [submodule "3rdparty/volk"]
 	path = 3rdparty/volk
 	url = https://github.com/zeux/volk.git
+[submodule "3rdparty/simdjson"]
+	path = 3rdparty/simdjson
+	url = https://github.com/simdjson/simdjson
+[submodule "3rdparty/glTFSampleModels"]
+	path = 3rdparty/glTFSampleModels
+	url = https://github.com/KhronosGroup/glTF-Sample-Models

3rdparty/CMakeLists.txt

@@ -471,7 +471,7 @@ set(NBL_3RDPARTY_TARGETS
 				SPIRV 
 				Iex
 				IexMath
-				SPIRV-Tools
+				SPIRV-Tools-static
 				SPIRV-Tools-opt )
 #TODO insert more targets that are conditionally built
 if (NBL_BUILD_MITSUBA_LOADER)

3rdparty/SPIRV-Headers

@@ -149,17 +149,18 @@ struct commit_t
 };
 STextureData getTextureData(core::vector<commit_t>& _out_commits, const asset::ICPUImage* _img, asset::ICPUVirtualTexture* _vt, asset::ISampler::E_TEXTURE_CLAMP _uwrap, asset::ISampler::E_TEXTURE_CLAMP _vwrap, asset::ISampler::E_TEXTURE_BORDER_COLOR _borderColor)
 {
-    const auto& extent = _img->getCreationParameters().extent;
+    auto img = _vt->createUpscaledImage(_img);
+    const auto& extent = img->getCreationParameters().extent;
 
-    auto imgAndOrigSz = asset::ICPUVirtualTexture::createPoTPaddedSquareImageWithMipLevels(_img, _uwrap, _vwrap, _borderColor);
+    auto imgAndOrigSz = asset::ICPUVirtualTexture::createPoTPaddedSquareImageWithMipLevels(img.get(), _uwrap, _vwrap, _borderColor);
 
     asset::IImage::SSubresourceRange subres;
     subres.baseMipLevel = 0u;
     subres.levelCount = core::findLSB(core::roundDownToPoT<uint32_t>(std::max(extent.width, extent.height))) + 1;
     subres.baseArrayLayer = 0u;
     subres.layerCount = 1u;
 
-    auto addr = _vt->alloc(_img->getCreationParameters().format, imgAndOrigSz.second, subres, _uwrap, _vwrap);
+    auto addr = _vt->alloc(img->getCreationParameters().format, imgAndOrigSz.second, subres, _uwrap, _vwrap);
     commit_t cm{ addr, std::move(imgAndOrigSz.first), subres, _uwrap, _vwrap, _borderColor };
 
     _out_commits.push_back(cm);