intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 14:55:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Correct IMAGE1D_BUFFER width size calculation in BCS

Browse Source 
Buffer's default bytesPerPixel value always equals 1 and as
IMAGE1D_BUFFER is originally an image, X coordinate needs to be
multiplied by bytesPerPixel in both copySize and (src/dst)Size.

Signed-off-by: Rafal Maziejuk <rafal.maziejuk@intel.com>
Related-To: NEO-6134
This commit is contained in:
Rafal Maziejuk
2022-03-09 16:39:26 +00:00
committed by Compute-Runtime-Automation
parent 6b29b03c29
commit 3490b489ad
2 changed files with 52 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
opencl/source/helpers/cl_blit_properties.h
View File

@@ -168,7 +168,7 @@ struct ClBlitProperties {
}
}
static void adjustBlitPropertiesForImage(MemObj *memObj, Vec3<size_t> &size, size_t &bytesPerPixel, uint64_t &gpuAddress, size_t &rowPitch, size_t &slicePitch, BlitterConstants::BlitDirection &blitDirection) {
static void adjustBlitPropertiesForImage(MemObj *memObj, BlitProperties &blitProperties, size_t &rowPitch, size_t &slicePitch, const bool isSource) {
auto image = castToObject<Image>(memObj);
const auto &imageDesc = image->getImageDesc();
auto image_width = imageDesc.image_width;
@@ -180,6 +180,12 @@ struct ClBlitProperties {
}
SurfaceOffsets surfaceOffsets;
auto &gpuAddress = isSource ? blitProperties.srcGpuAddress : blitProperties.dstGpuAddress;
auto &size = isSource ? blitProperties.srcSize : blitProperties.dstSize;
auto &copySize = blitProperties.copySize;
auto &bytesPerPixel = blitProperties.bytesPerPixel;
auto &blitDirection = blitProperties.blitDirection;
image->getSurfaceOffsets(surfaceOffsets);
gpuAddress += surfaceOffsets.offset;
size.x = image_width;
@@ -201,6 +207,9 @@ struct ClBlitProperties {
if (blitDirection == BlitterConstants::BlitDirection::ImageToImage) {
blitDirection = BlitterConstants::BlitDirection::BufferToBuffer;
}
size.x *= bytesPerPixel;
copySize.x *= bytesPerPixel;
}
}
@@ -212,14 +221,12 @@ struct ClBlitProperties {
if (blitProperties.blitDirection == BlitterConstants::BlitDirection::ImageToHostPtr ||
blitProperties.blitDirection == BlitterConstants::BlitDirection::ImageToImage) {
adjustBlitPropertiesForImage(builtinOpParams.srcMemObj, blitProperties.srcSize, blitProperties.bytesPerPixel,
blitProperties.srcGpuAddress, srcRowPitch, srcSlicePitch, blitProperties.blitDirection);
adjustBlitPropertiesForImage(builtinOpParams.srcMemObj, blitProperties, srcRowPitch, srcSlicePitch, true);
}
if (blitProperties.blitDirection == BlitterConstants::BlitDirection::HostPtrToImage ||
blitProperties.blitDirection == BlitterConstants::BlitDirection::ImageToImage) {
adjustBlitPropertiesForImage(builtinOpParams.dstMemObj, blitProperties.dstSize, blitProperties.bytesPerPixel,
blitProperties.dstGpuAddress, dstRowPitch, dstSlicePitch, blitProperties.blitDirection);
adjustBlitPropertiesForImage(builtinOpParams.dstMemObj, blitProperties, dstRowPitch, dstSlicePitch, false);
}
blitProperties.srcRowPitch = srcRowPitch ? srcRowPitch : blitProperties.srcSize.x * blitProperties.bytesPerPixel;