Skip to content

[L0] Add 3-channel image support #2022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 19, 2024
Merged

[L0] Add 3-channel image support #2022

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff79add
[L0] Add 3-channel image support
nrspruit Aug 28, 2024
71cdf25
[L0] Return error if not exactly RGB or RGX
nrspruit Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 45 additions & 1 deletion source/adapters/level_zero/image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,19 @@ ur_result_t ze2urImageFormat(const ze_image_desc_t *ZeImageDesc,
switch (ZeImageFormat.layout) {
case ZE_IMAGE_FORMAT_LAYOUT_8:
case ZE_IMAGE_FORMAT_LAYOUT_8_8:
case ZE_IMAGE_FORMAT_LAYOUT_8_8_8:
case ZE_IMAGE_FORMAT_LAYOUT_8_8_8_8:
ZeImageFormatTypeSize = 8;
break;
case ZE_IMAGE_FORMAT_LAYOUT_16:
case ZE_IMAGE_FORMAT_LAYOUT_16_16:
case ZE_IMAGE_FORMAT_LAYOUT_16_16_16:
case ZE_IMAGE_FORMAT_LAYOUT_16_16_16_16:
ZeImageFormatTypeSize = 16;
break;
case ZE_IMAGE_FORMAT_LAYOUT_32:
case ZE_IMAGE_FORMAT_LAYOUT_32_32:
case ZE_IMAGE_FORMAT_LAYOUT_32_32_32:
case ZE_IMAGE_FORMAT_LAYOUT_32_32_32_32:
ZeImageFormatTypeSize = 32;
break;
Expand Down Expand Up @@ -98,7 +101,30 @@ ur_result_t ze2urImageFormat(const ze_image_desc_t *ZeImageDesc,
default:
logger::error(
"ze2urImageFormat: unexpected image format channel y: y = {}\n",
ZeImageFormat.x);
ZeImageFormat.y);
return UR_RESULT_ERROR_INVALID_VALUE;
}
break;
case ZE_IMAGE_FORMAT_LAYOUT_8_8_8:
case ZE_IMAGE_FORMAT_LAYOUT_16_16_16:
case ZE_IMAGE_FORMAT_LAYOUT_32_32_32:
if (ZeImageFormat.x == ZE_IMAGE_FORMAT_SWIZZLE_R &&
ZeImageFormat.y == ZE_IMAGE_FORMAT_SWIZZLE_G) {
switch (ZeImageFormat.z) {
case ZE_IMAGE_FORMAT_SWIZZLE_B:
ChannelOrder = UR_IMAGE_CHANNEL_ORDER_RGB;
break;
case ZE_IMAGE_FORMAT_SWIZZLE_X:
ChannelOrder = UR_IMAGE_CHANNEL_ORDER_RGX;
break;
default:
logger::error(
"ze2urImageFormat: unexpected image format channel z: z = {}\n",
ZeImageFormat.z);
return UR_RESULT_ERROR_INVALID_VALUE;
}
} else {
logger::error("ze2urImageFormat: unexpected image format channel");
return UR_RESULT_ERROR_INVALID_VALUE;
}
break;
Expand Down Expand Up @@ -303,6 +329,24 @@ ur_result_t ur2zeImageDesc(const ur_image_format_t *ImageFormat,
}
break;
}
case UR_IMAGE_CHANNEL_ORDER_RGB:
case UR_IMAGE_CHANNEL_ORDER_RGX: {
switch (ZeImageFormatTypeSize) {
case 8:
ZeImageFormatLayout = ZE_IMAGE_FORMAT_LAYOUT_8_8_8;
break;
case 16:
ZeImageFormatLayout = ZE_IMAGE_FORMAT_LAYOUT_16_16_16;
break;
case 32:
ZeImageFormatLayout = ZE_IMAGE_FORMAT_LAYOUT_32_32_32;
break;
default:
logger::error("ur2zeImageDesc: unexpected data type size");
return UR_RESULT_ERROR_INVALID_VALUE;
}
break;
}
default:
logger::error("format channel order = {}", ImageFormat->channelOrder);
die("ur2zeImageDesc: unsupported image channel order\n");
Expand Down
Loading