Merge branch 'baw' of github.com:Devsh-Graphics-Programming/Nabla into baw

Author: sadiuk

include/nbl/asset/IAssetManager.h

@@ -654,7 +654,6 @@ class IAssetManager : public core::IReferenceCounted, public core::QuitSignallin
 			if (file) // could fail creating file (lack of permissions)
 			{
 				bool res = writeAsset(file.get(), _params, _override);
-				file->drop();
 				return res;
 			}
 			else

include/nbl/asset/filters/CBasicImageFilterCommon.h

@@ -26,7 +26,7 @@ class CBasicImageFilterCommon
 			public:
 				using iterator_category = std::random_access_iterator_tag;
 				using difference_type = int64_t;
-				using value_type = const uint32_t*;
+				using value_type = std::array<uint32_t,batch_dims>;
 				using pointer = const value_type*;
 				using reference = value_type;
 
@@ -35,17 +35,17 @@ class CBasicImageFilterCommon
 				BlockIterator()
 				{
 					std::fill_n(extentBatches,batch_dims,0u);
-					std::fill_n(batchCoord,batch_dims,0u);
+					std::fill_n(batchCoord.begin(),batch_dims,0u);
 				}
 				explicit inline BlockIterator(const uint32_t* _extentBatches)
 				{
 					std::copy_n(_extentBatches,batch_dims,extentBatches);
-					std::fill_n(batchCoord,batch_dims,0u);
+					std::fill_n(batchCoord.begin(),batch_dims,0u);
 				}
 				explicit inline BlockIterator(const uint32_t* _extentBatches, const uint32_t* _batchCoord)
 				{
 					std::copy_n(_extentBatches,batch_dims,extentBatches);
-					std::copy_n(_batchCoord,batch_dims,batchCoord);
+					std::copy_n(_batchCoord,batch_dims,batchCoord.begin());
 				}
 				BlockIterator(const BlockIterator<batch_dims>& other) = default;
 				BlockIterator(BlockIterator<batch_dims>&& other) = default;
@@ -59,11 +59,9 @@ class CBasicImageFilterCommon
 				}
 				inline pointer operator->() const {return &batchCoord;}
 
-				inline value_type operator[] (int index) 
+				inline value_type operator[] (int index) const
 				{
-					BlockIterator<batch_dims> temp = BlockIterator<batch_dims>(this->extentBatches);
-					temp+=index;
-					return *temp;
+					return *(operator+(index));
 				}
 
 				inline bool operator< (const BlockIterator<batch_dims>& _rhs) const 
@@ -108,7 +106,7 @@ class CBasicImageFilterCommon
 					return copy;
 				}
 
-				inline bool operator==(const BlockIterator<batch_dims>& other) const {return std::equal(batchCoord,batchCoord+batch_dims,other.batchCoord);}
+				inline bool operator==(const BlockIterator<batch_dims>& other) const {return std::equal(batchCoord.begin(),batchCoord.end(),other.batchCoord.begin());}
 				inline bool operator!=(const BlockIterator<batch_dims>& other) const {return !operator==(other);}
 
 				inline BlockIterator<batch_dims>& operator+=(const difference_type advance)
@@ -134,7 +132,7 @@ class CBasicImageFilterCommon
 				inline const uint32_t* getExtentBatches() const {return extentBatches;}
 			private:
 				uint32_t extentBatches[batch_dims];
-				uint32_t batchCoord[batch_dims];
+				value_type batchCoord;
 
 
 				explicit inline BlockIterator(const uint32_t* _extentBatches, difference_type linearAddress)
@@ -184,15 +182,15 @@ class CBasicImageFilterCommon
 
 			const auto strides = region.getByteStrides(blockInfo);
 
-			auto batch1D = [&f,&region,trueExtent,strides,trueOffset](const uint32_t* batchCoord)
+			auto batch1D = [&f,&region,trueExtent,strides,trueOffset](const std::array<uint32_t,3u>& batchCoord)
 			{
 				for (auto xBlock=0u; xBlock<trueExtent.x; ++xBlock)
 				{
 					const core::vectorSIMDu32 localCoord(xBlock,batchCoord[0],batchCoord[1],batchCoord[2]);
 					f(region.getByteOffset(localCoord,strides),localCoord+trueOffset);
 				}
 			};
-			auto batch2D = [&f,&region,trueExtent,strides,trueOffset](const uint32_t* batchCoord)
+			auto batch2D = [&f,&region,trueExtent,strides,trueOffset](const std::array<uint32_t,2u>& batchCoord)
 			{
 				for (auto yBlock=0u; yBlock<trueExtent.y; ++yBlock)
 				for (auto xBlock=0u; xBlock<trueExtent.x; ++xBlock)
@@ -201,7 +199,7 @@ class CBasicImageFilterCommon
 					f(region.getByteOffset(localCoord,strides),localCoord+trueOffset);
 				}
 			};
-			auto batch3D = [&f,&region,trueExtent,strides,trueOffset](const uint32_t* batchCoord)
+			auto batch3D = [&f,&region,trueExtent,strides,trueOffset](const std::array<uint32_t,1u>& batchCoord)
 			{
 				for (auto zBlock=0u; zBlock<trueExtent.z; ++zBlock)
 				for (auto yBlock=0u; yBlock<trueExtent.y; ++yBlock)

include/nbl/asset/filters/CBlitImageFilter.h

@@ -461,7 +461,7 @@ class CBlitImageFilter : public CImageFilter<CBlitImageFilter<Swizzle,Dither,Nor
 					CBasicImageFilterCommon::BlockIterator<batch_dims> begin(batchExtent);
 					const uint32_t spaceFillingEnd[batch_dims] = {0u,batchExtent[1]};
 					CBasicImageFilterCommon::BlockIterator<batch_dims> end(begin.getExtentBatches(),spaceFillingEnd);
-					std::for_each(policy,begin,end,[&](const uint32_t* batchCoord) -> void
+					std::for_each(policy,begin,end,[&](const std::array<uint32_t,batch_dims>& batchCoord) -> void
 					{
 						// we need some tmp memory for threads in the first pass so that they dont step on each other
 						uint32_t decode_offset;

src/nbl/system/CArchiveLoaderZip.cpp

@@ -410,8 +410,6 @@ namespace nbl::system
 				if (!pBuf)
 				{
 					delete[] decryptedBuf;
-					if (decrypted)
-						decrypted->drop();
 					return 0;
 				}
 
@@ -457,9 +455,7 @@ namespace nbl::system
 					inflateEnd(&stream);
 				}
 
-				if (decrypted)
-					decrypted->drop();
-				else
+				if (!decrypted)
 					delete[] pcData;
 
 				delete[] decryptedBuf;
@@ -496,8 +492,6 @@ namespace nbl::system
 				{
 					m_logger.log("Not enough memory for decompressing %s", ILogger::ELL_ERROR, params.absolutePath.string().c_str());
 					delete[] decryptedBuf;
-					if (decrypted)
-						decrypted->drop();
 					return 0;
 				}
 
@@ -541,9 +535,7 @@ namespace nbl::system
 				err = BZ2_bzDecompress(&bz_ctx);
 				err = BZ2_bzDecompressEnd(&bz_ctx);
 
-				if (decrypted)
-					decrypted->drop();
-				else
+				if (!decrypted)
 					delete[] pcData;
 
 				if (err != BZ_OK)
@@ -579,8 +571,6 @@ namespace nbl::system
 				{
 					m_logger.log("Not enough memory for decompressing %s", ILogger::ELL_ERROR, params.absolutePath.c_str());
 					delete[] decryptedBuf;
-					if (decrypted)
-						decrypted->drop();
 					return 0;
 				}
 
@@ -615,9 +605,7 @@ namespace nbl::system
 					&lzmaAlloc);
 				uncompressedSize = tmpDstSize; // may be different to expected value
 
-				if (decrypted)
-					decrypted->drop();
-				else
+				if (!decrypted)
 					delete[] pcData;
 
 				delete[] decryptedBuf;

src/nbl/video/COpenGL_Connection.cpp

@@ -35,7 +35,7 @@ core::smart_refctd_ptr<COpenGL_Connection<API_TYPE>> COpenGL_Connection<API_TYPE
 
     if (!physicalDevice)
     {
-        retval->drop();
+        retval->drop(); // maual drop needed, haven't made a smart pointer yet
         return nullptr;
     }
     retval->m_physicalDevices.push_back(std::move(physicalDevice));