Fix cl_properties for image 2D array

Signed-off-by: Kamil Kopryk <[email protected]>
Related-To: NEO-4692

Author: KamilKoprykIntel

opencl/source/helpers/cl_blit_properties.h

@@ -165,6 +165,10 @@ struct ClBlitProperties {
         auto image_height = image->getImageDesc().image_height;
         auto image_depth = image->getImageDesc().image_depth;
 
+        if (image->getImageDesc().image_type == CL_MEM_OBJECT_IMAGE2D_ARRAY) {
+            image_depth = std::max(image_depth, image->getImageDesc().image_array_size);
+        }
+
         size.x = image_width;
         size.y = image_height ? image_height : 1;
         size.z = image_depth ? image_depth : 1;

opencl/test/unit_test/command_stream/command_stream_receiver_hw_2_tests.cpp

@@ -1306,6 +1306,26 @@ HWTEST_F(BcsTests, givenImage1DWhenAdjustBlitPropertiesForImageIsCalledThenValue
     EXPECT_EQ(expectedBytesPerPixel, bytesPerPixel);
 }
 
+HWTEST_F(BcsTests, givenImage2DArrayWhenAdjustBlitPropertiesForImageIsCalledThenValuesAreSetCorrectly) {
+    cl_image_desc imgDesc = Image1dDefaults::imageDesc;
+    imgDesc.image_width = 10u;
+    imgDesc.image_height = 3u;
+    imgDesc.image_depth = 0u;
+    imgDesc.image_array_size = 4u;
+    imgDesc.image_type = CL_MEM_OBJECT_IMAGE2D_ARRAY;
+    std::unique_ptr<Image> image(Image2dArrayHelper<>::create(context.get(), &imgDesc));
+    Vec3<size_t> size{0, 0, 0};
+    size_t bytesPerPixel = 0u;
+    size_t expectedBytesPerPixel = image->getSurfaceFormatInfo().surfaceFormat.ImageElementSizeInBytes;
+
+    ClBlitProperties::adjustBlitPropertiesForImage(image.get(), size, bytesPerPixel);
+
+    EXPECT_EQ(imgDesc.image_width, size.x);
+    EXPECT_EQ(imgDesc.image_height, size.y);
+    EXPECT_EQ(imgDesc.image_array_size, size.z);
+    EXPECT_EQ(expectedBytesPerPixel, bytesPerPixel);
+}
+
 HWTEST_F(BcsTests, givenHostPtrToImageWhenConstructPropertiesIsCalledThenValuesAreSetCorrectly) {
     void *hostPtr = reinterpret_cast<void *>(0x12340000);
     cl_image_desc imgDesc = Image2dDefaults::imageDesc;