Revert "Revert filter fixes"

This reverts commit 21a198e.

Author: Erfan-Ahmadi

include/nbl/asset/filters/CBasicImageFilterCommon.h

@@ -278,7 +278,7 @@ class NBL_API CBasicImageFilterCommon
 				// compute new offset
 				{
 					const auto strides = referenceRegion->getByteStrides(blockInfo);
-					const core::vector3du32_SIMD offsetInOffset = offset-resultOffset;
+					const core::vector3du32_SIMD offsetInOffset = blockInfo.convertTexelsToBlocks(offset-resultOffset);
 					newRegion.bufferOffset += referenceRegion->getLocalByteOffset(offsetInOffset,strides);
 				}
 

include/nbl/asset/filters/CCopyImageFilter.h

@@ -65,9 +65,9 @@ class NBL_API CCopyImageFilter : public CImageFilter<CCopyImageFilter>, public C
 				const auto blockDims = asset::getBlockDimensions(commonExecuteData.inFormat);
 				auto copy = [&commonExecuteData,&blockDims](uint32_t readBlockArrayOffset, core::vectorSIMDu32 readBlockPos) -> void
 				{
-					const auto localOutPos = readBlockPos + commonExecuteData.offsetDifference;
-					const auto writeOffset = commonExecuteData.oit->getByteOffset(localOutPos, commonExecuteData.outByteStrides);
-					memcpy(commonExecuteData.outData + writeOffset, commonExecuteData.inData + readBlockArrayOffset, commonExecuteData.outBlockByteSize);
+					const auto localOutPos = readBlockPos+commonExecuteData.offsetDifference;
+					const auto writeOffset = commonExecuteData.oit->getByteOffset(localOutPos,commonExecuteData.outByteStrides);
+					memcpy(commonExecuteData.outData+writeOffset,commonExecuteData.inData+readBlockArrayOffset,commonExecuteData.outBlockByteSize);
 				};
 				CBasicImageFilterCommon::executePerRegion<ExecutionPolicy>(policy,commonExecuteData.inImg,copy,commonExecuteData.inRegions.begin(),commonExecuteData.inRegions.end(),clip);
 

include/nbl/asset/filters/CMatchedSizeInOutImageFilterCommon.h

@@ -202,8 +202,12 @@ class NBL_API CMatchedSizeInOutImageFilterCommon : public CBasicImageFilterCommo
 				CBasicImageFilterCommon::clip_region_functor_t clip(subresource,range,commonExecuteData.inFormat);
 				// setup convert state
 				const auto& outRegionOffset = commonExecuteData.oit->imageOffset;
-				commonExecuteData.offsetDifference = state->outOffsetBaseLayer - (core::vectorSIMDu32(outRegionOffset.x, outRegionOffset.y, outRegionOffset.z, commonExecuteData.oit->imageSubresource.baseArrayLayer) + state->inOffsetBaseLayer);
-				commonExecuteData.outByteStrides = commonExecuteData.oit->getByteStrides(TexelBlockInfo(commonExecuteData.outFormat));
+				const auto& inOffset = (core::vectorSIMDu32(outRegionOffset.x, outRegionOffset.y, outRegionOffset.z, commonExecuteData.oit->imageSubresource.baseArrayLayer) + state->inOffsetBaseLayer);
+				const auto& inOffsetInBlocks = srcImageTexelBlockInfo.convertTexelsToBlocks(inOffset);
+				// offsetDifference types are uint but I know my two's complement wraparound well enough to make this work
+				// TODO: this needs to be in block dimensions for copy filter but probably needs to be in texel dimensions for convert filter
+				commonExecuteData.offsetDifference = dstImageTexelBlockInfo.convertTexelsToBlocks(state->outOffsetBaseLayer) - inOffsetInBlocks;
+				commonExecuteData.outByteStrides = commonExecuteData.oit->getByteStrides(dstImageTexelBlockInfo);
 				if (!perOutput(commonExecuteData,clip))
 					return false;
 			}