Revert "Auxiliary commit to revert individual files from 2e25575"

This reverts commit 9058d1df986c06f131c641274c0ccb44e20519be.

Author: Erfan-Ahmadi

include/nbl/asset/filters/CSwizzleAndConvertImageFilter.h

@@ -77,7 +77,7 @@ class NBL_API CSwizzleAndConvertImageFilterBase : public CSwizzleableAndDitherab
 								base_t::template onDecode<kInFormat,encodeBufferType>(state, srcPix, decodeBuffer, encodeBuffer, blockX, blockY);
 							else
 								base_t::template onDecode<encodeBufferType>(rInFormat, state, srcPix, decodeBuffer, encodeBuffer, blockX, blockY);
-							state->normalization.prepass(encodeBuffer,readBlockPos+commonExecuteData.offsetDifference,blockX,blockY,4u/*TODO: figure this out*/);
+							state->normalization.prepass(encodeBuffer,readBlockPos*blockDims+commonExecuteData.offsetDifference,blockX,blockY,4u/*TODO: figure this out*/);
 						}
 					};
 					CBasicImageFilterCommon::executePerRegion(policy, commonExecuteData.inImg, normalizePrepass, commonExecuteData.inRegions.begin(), commonExecuteData.inRegions.end(), clip);
@@ -146,8 +146,8 @@ class NBL_API CSwizzleAndConvertImageFilter : public CImageFilter<CSwizzleAndCon
 					for (auto blockY=0u; blockY<blockDims.y; blockY++)
 					for (auto blockX=0u; blockX<blockDims.x; blockX++)
 					{
-						auto localOutPos = readBlockPos+commonExecuteData.offsetDifference;
-						uint8_t* dstPix = commonExecuteData.outData+commonExecuteData.oit->getByteOffset(localOutPos + core::vectorSIMDu32(blockX, blockY),commonExecuteData.outBlockByteStrides);
+						auto localOutPos = readBlockPos*blockDims+commonExecuteData.offsetDifference;
+						uint8_t* dstPix = commonExecuteData.outData+commonExecuteData.oit->getByteOffset(localOutPos + core::vectorSIMDu32(blockX, blockY),commonExecuteData.outByteStrides);
 
 						constexpr auto maxChannels = 4;
 						decodeBufferType decodeBuffer[maxChannels] = {};
@@ -212,8 +212,8 @@ class NBL_API CSwizzleAndConvertImageFilter<EF_UNKNOWN,EF_UNKNOWN,Swizzle,Dither
 					for (auto blockY=0u; blockY<blockDims.y; blockY++)
 					for (auto blockX=0u; blockX<blockDims.x; blockX++)
 					{
-						auto localOutPos = readBlockPos+commonExecuteData.offsetDifference;
-						uint8_t* dstPix = commonExecuteData.outData+commonExecuteData.oit->getByteOffset(localOutPos + core::vectorSIMDu32(blockX, blockY),commonExecuteData.outBlockByteStrides);
+						auto localOutPos = readBlockPos*blockDims+commonExecuteData.offsetDifference;
+						uint8_t* dstPix = commonExecuteData.outData+commonExecuteData.oit->getByteOffset(localOutPos + core::vectorSIMDu32(blockX, blockY),commonExecuteData.outByteStrides);
 
 						constexpr auto maxChannels = 4;
 						double decodeBuffer[maxChannels] = {};
@@ -287,8 +287,8 @@ class NBL_API CSwizzleAndConvertImageFilter<EF_UNKNOWN,outFormat,Swizzle,Dither,
 					for (auto blockY = 0u; blockY < blockDims.y; blockY++)
 					for (auto blockX = 0u; blockX < blockDims.x; blockX++)
 					{
-						auto localOutPos = readBlockPos + commonExecuteData.offsetDifference;
-						uint8_t* dstPix = commonExecuteData.outData + commonExecuteData.oit->getByteOffset(localOutPos + core::vectorSIMDu32(blockX, blockY), commonExecuteData.outBlockByteStrides);
+						auto localOutPos = readBlockPos * blockDims + commonExecuteData.offsetDifference;
+						uint8_t* dstPix = commonExecuteData.outData + commonExecuteData.oit->getByteOffset(localOutPos + core::vectorSIMDu32(blockX, blockY), commonExecuteData.outByteStrides);
 
 						constexpr auto maxChannels = 4;
 						double decodeBuffer[maxChannels] = {};
@@ -363,8 +363,8 @@ class NBL_API CSwizzleAndConvertImageFilter<inFormat,EF_UNKNOWN,Swizzle,Dither,N
 					for (auto blockY = 0u; blockY < blockDims.y; blockY++)
 						for (auto blockX = 0u; blockX < blockDims.x; blockX++)
 						{
-							auto localOutPos = readBlockPos + commonExecuteData.offsetDifference;
-							uint8_t* dstPix = commonExecuteData.outData + commonExecuteData.oit->getByteOffset(localOutPos + core::vectorSIMDu32(blockX, blockY), commonExecuteData.outBlockByteStrides);
+							auto localOutPos = readBlockPos * blockDims + commonExecuteData.offsetDifference;
+							uint8_t* dstPix = commonExecuteData.outData + commonExecuteData.oit->getByteOffset(localOutPos + core::vectorSIMDu32(blockX, blockY), commonExecuteData.outByteStrides);
 
 							constexpr auto maxChannels = 4;
 							decodeBufferType decodeBuffer[maxChannels] = {};