diff --git a/level_zero/core/source/driver/driver_handle_imp.h b/level_zero/core/source/driver/driver_handle_imp.h index 3b2b121f6e..c803e152f8 100644 --- a/level_zero/core/source/driver/driver_handle_imp.h +++ b/level_zero/core/source/driver/driver_handle_imp.h @@ -113,9 +113,7 @@ struct DriverHandleImp : public DriverHandle { {ZE_CONTEXT_POWER_SAVING_HINT_EXP_NAME, ZE_POWER_SAVING_HINT_EXP_VERSION_CURRENT}, {ZE_DEVICE_LUID_EXT_NAME, ZE_DEVICE_LUID_EXT_VERSION_CURRENT}, {ZE_DEVICE_IP_VERSION_EXT_NAME, ZE_DEVICE_IP_VERSION_VERSION_CURRENT}, - {ZE_CACHE_RESERVATION_EXT_NAME, ZE_CACHE_RESERVATION_EXT_VERSION_CURRENT}, - {ZE_IMAGE_VIEW_EXT_NAME, ZE_IMAGE_VIEW_EXP_VERSION_CURRENT}, - {ZE_IMAGE_VIEW_PLANAR_EXT_NAME, ZE_IMAGE_VIEW_PLANAR_EXP_VERSION_CURRENT}}; + {ZE_CACHE_RESERVATION_EXT_NAME, ZE_CACHE_RESERVATION_EXT_VERSION_CURRENT}}; uint64_t uuidTimestamp = 0u; diff --git a/level_zero/core/source/helpers/properties_parser.h b/level_zero/core/source/helpers/properties_parser.h index 0f0df327e9..bbb28c8a02 100644 --- a/level_zero/core/source/helpers/properties_parser.h +++ b/level_zero/core/source/helpers/properties_parser.h @@ -107,11 +107,6 @@ inline ze_result_t prepareL0StructuresLookupTable(StructuresLookupTable &lookupT lookupTable.areImageProperties = true; lookupTable.imageProperties.isPlanarExtension = true; lookupTable.imageProperties.planeIndex = imageViewDesc->planeIndex; - } else if (extendedDesc->stype == ZE_STRUCTURE_TYPE_IMAGE_VIEW_PLANAR_EXT_DESC) { - const ze_image_view_planar_ext_desc_t *imageViewDesc = reinterpret_cast(extendedDesc); - lookupTable.areImageProperties = true; - lookupTable.imageProperties.isPlanarExtension = true; - lookupTable.imageProperties.planeIndex = imageViewDesc->planeIndex; } else if (extendedDesc->stype == ZE_STRUCTURE_TYPE_RELAXED_ALLOCATION_LIMITS_EXP_DESC) { const ze_relaxed_allocation_limits_exp_desc_t *relaxedLimitsDesc = reinterpret_cast(extendedDesc); diff --git a/level_zero/core/test/black_box_tests/zello_image_view.cpp b/level_zero/core/test/black_box_tests/zello_image_view.cpp index f920f2fff1..9de25089de 100644 --- a/level_zero/core/test/black_box_tests/zello_image_view.cpp +++ b/level_zero/core/test/black_box_tests/zello_image_view.cpp @@ -109,8 +109,6 @@ void testAppendImageViewNV12Copy(ze_context_handle_t &context, ze_device_handle_ SUCCESS_OR_TERMINATE( zeImageViewCreateExp(context, device, &imageViewDescPlaneY, srcImg, &planeYImageView)); - - planeYdesc.stype = ZE_STRUCTURE_TYPE_IMAGE_VIEW_PLANAR_EXT_DESC; SUCCESS_OR_TERMINATE( zeImageViewCreateExt(context, device, &imageViewDescPlaneY, srcImg, &planeYImageView)); @@ -135,8 +133,6 @@ void testAppendImageViewNV12Copy(ze_context_handle_t &context, ze_device_handle_ SUCCESS_OR_TERMINATE( zeImageViewCreateExp(context, device, &imageViewDescPlaneUV, srcImg, &planeUVImageView)); - - planeUVdesc.stype = ZE_STRUCTURE_TYPE_IMAGE_VIEW_PLANAR_EXT_DESC; SUCCESS_OR_TERMINATE( zeImageViewCreateExt(context, device, &imageViewDescPlaneUV, srcImg, &planeUVImageView)); @@ -362,8 +358,6 @@ void testAppendImageViewRGBPCopy(ze_context_handle_t &context, ze_device_handle_ SUCCESS_OR_TERMINATE( zeImageViewCreateExp(context, device, &imageViewDescPlaneY, srcImg, &planeYImageView)); - - planeYdesc.stype = ZE_STRUCTURE_TYPE_IMAGE_VIEW_PLANAR_EXT_DESC; SUCCESS_OR_TERMINATE( zeImageViewCreateExt(context, device, &imageViewDescPlaneY, srcImg, &planeYImageView)); @@ -388,8 +382,6 @@ void testAppendImageViewRGBPCopy(ze_context_handle_t &context, ze_device_handle_ SUCCESS_OR_TERMINATE( zeImageViewCreateExp(context, device, &imageViewDescPlaneU, srcImg, &planeUImageView)); - - planeUdesc.stype = ZE_STRUCTURE_TYPE_IMAGE_VIEW_PLANAR_EXT_DESC; SUCCESS_OR_TERMINATE( zeImageViewCreateExt(context, device, &imageViewDescPlaneU, srcImg, &planeUImageView)); @@ -414,8 +406,6 @@ void testAppendImageViewRGBPCopy(ze_context_handle_t &context, ze_device_handle_ SUCCESS_OR_TERMINATE( zeImageViewCreateExp(context, device, &imageViewDescPlaneV, srcImg, &planeVImageView)); - - planeVdesc.stype = ZE_STRUCTURE_TYPE_IMAGE_VIEW_PLANAR_EXT_DESC; SUCCESS_OR_TERMINATE( zeImageViewCreateExt(context, device, &imageViewDescPlaneV, srcImg, &planeVImageView)); diff --git a/level_zero/core/test/unit_tests/sources/image/test_image.cpp b/level_zero/core/test/unit_tests/sources/image/test_image.cpp index 499fd1ca38..8b53435c8d 100644 --- a/level_zero/core/test/unit_tests/sources/image/test_image.cpp +++ b/level_zero/core/test/unit_tests/sources/image/test_image.cpp @@ -1293,7 +1293,7 @@ HWTEST2_F(ImageCreate, WhenCopyingToSshThenSurfacePropertiesAreRetained, IsAtMos delete imageB; } -HWTEST2_F(ImageCreate, WhenImageViewCreateExpThenSuccessIsReturned, IsAtLeastSkl) { +HWTEST2_F(ImageCreate, WhenImageViewCreateThenSuccessIsReturned, IsAtLeastSkl) { using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; const size_t width = 32; const size_t height = 32; @@ -1348,60 +1348,5 @@ HWTEST2_F(ImageCreate, WhenImageViewCreateExpThenSuccessIsReturned, IsAtLeastSkl zeImageDestroy(planeY); } -HWTEST2_F(ImageCreate, WhenImageViewCreateExtThenSuccessIsReturned, IsAtLeastSkl) { - using RENDER_SURFACE_STATE = typename FamilyType::RENDER_SURFACE_STATE; - const size_t width = 32; - const size_t height = 32; - const size_t depth = 1; - - ze_image_desc_t srcImgDesc = {ZE_STRUCTURE_TYPE_IMAGE_DESC, - nullptr, - (ZE_IMAGE_FLAG_KERNEL_WRITE | ZE_IMAGE_FLAG_BIAS_UNCACHED), - ZE_IMAGE_TYPE_2D, - {ZE_IMAGE_FORMAT_LAYOUT_NV12, ZE_IMAGE_FORMAT_TYPE_UINT, - ZE_IMAGE_FORMAT_SWIZZLE_R, ZE_IMAGE_FORMAT_SWIZZLE_G, - ZE_IMAGE_FORMAT_SWIZZLE_B, ZE_IMAGE_FORMAT_SWIZZLE_A}, - width, - height, - depth, - 0, - 0}; - - auto imageHW = std::make_unique>>(); - auto ret = imageHW->initialize(device, &srcImgDesc); - ASSERT_EQ(ZE_RESULT_SUCCESS, ret); - - ze_image_view_planar_ext_desc_t planeYdesc = {}; - planeYdesc.stype = ZE_STRUCTURE_TYPE_IMAGE_VIEW_PLANAR_EXT_DESC; - planeYdesc.planeIndex = 0u; // Y plane - - ze_image_desc_t imageViewDescPlaneY = {ZE_STRUCTURE_TYPE_IMAGE_DESC, - &planeYdesc, - (ZE_IMAGE_FLAG_KERNEL_WRITE | ZE_IMAGE_FLAG_BIAS_UNCACHED), - ZE_IMAGE_TYPE_2D, - {ZE_IMAGE_FORMAT_LAYOUT_8, ZE_IMAGE_FORMAT_TYPE_UINT, - ZE_IMAGE_FORMAT_SWIZZLE_A, ZE_IMAGE_FORMAT_SWIZZLE_B, - ZE_IMAGE_FORMAT_SWIZZLE_G, ZE_IMAGE_FORMAT_SWIZZLE_R}, - width, - height, - depth, - 0, - 0}; - ze_image_handle_t planeY; - - ret = imageHW->createView(device, &imageViewDescPlaneY, &planeY); - ASSERT_EQ(ZE_RESULT_SUCCESS, ret); - - ASSERT_EQ(ZE_RESULT_SUCCESS, ret); - - auto nv12Allocation = imageHW->getAllocation(); - - auto planeYAllocation = Image::fromHandle(planeY)->getAllocation(); - - EXPECT_EQ(nv12Allocation->getGpuBaseAddress(), planeYAllocation->getGpuBaseAddress()); - - zeImageDestroy(planeY); -} - } // namespace ult } // namespace L0