Fixed a few comments

Author: Crisspl

examples_tests/20.Megatexture/main.cpp

@@ -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);

include/nbl/macros.h

@@ -62,8 +62,7 @@
 #if defined(_NBL_DEBUG) || defined(_NBL_RELWITHDEBINFO)
 // TODO even though it is defined in RWDI build, _DEBUG #define is not defined in msvc (in rwdi) so debug break is not triggered anyway
 // idk what about other compilers
-//#define _NBL_DEBUG_BREAK_IF( _CONDITION_ ) _NBL_BREAK_IF(_CONDITION_)
-#define _NBL_DEBUG_BREAK_IF( _CONDITION_ )
+#define _NBL_DEBUG_BREAK_IF( _CONDITION_ ) _NBL_BREAK_IF(_CONDITION_)
 #else
 #define _NBL_DEBUG_BREAK_IF( _CONDITION_ )
 #endif

src/nbl/asset/interchange/CImageLoaderTGA.cpp

@@ -108,34 +108,6 @@ bool CImageLoaderTGA::isALoadableFileFormat(io::IReadFile* _file) const
 		//os::Printer::log("Invalid (non-TGA) file!", _file->getFileName().c_str(), ELL_ERROR);
 		return false;
 	}
-
-	// why did it even check gamma in isALoadableFileFormat ???
-	/*
-	float gamma;
-
-	if (footer.ExtensionOffset == 0)
-	{
-		os::Printer::log("Gamma information is not present! Assuming 2.333333", ELL_WARNING);
-		gamma = 2.333333f;
-	}
-	else
-	{
-		STGAExtensionArea extension;
-		_file->seek(footer.ExtensionOffset);
-		_file->read(&extension, sizeof(STGAExtensionArea));
-		
-		gamma = extension.Gamma;
-		
-		if (gamma == 0.0f)
-		{
-			os::Printer::log("Gamma information is not present! Assuming 2.333333", ELL_WARNING);
-			gamma = 2.333333f;
-		}
-		
-		// TODO - pass gamma to LoadAsset()?
-		// Actually I think metadata will be in used here in near future
-	}
-	*/
 
     _file->seek(prevPos);
 

src/nbl/ext/MitsubaLoader/CMitsubaLoader.cpp

@@ -1299,7 +1299,6 @@ auto CMitsubaLoader::genBSDFtreeTraversal(SContext& ctx, const CElementBSDF* _bs
 
 				if (!getBuiltinAsset<asset::ICPUImage, asset::IAsset::ET_IMAGE>(key.c_str(), m_assetMgr))
 				{
-					printf("%s\n", bumpmap_element->id.c_str());
 					auto derivmap = createDerivMap(ctx, bumpmap.get(),sampler.get(),wasNormal);
 					asset::SAssetBundle imgBundle(nullptr,{ derivmap });
 					ctx.override_->insertAssetIntoCache(std::move(imgBundle), key, ctx.inner, 0u);