Skip to content

Commit b71f420

Browse files
committed
Add ABGR option to ur_image_channel_order_t enum list.
1 parent de2cccd commit b71f420

File tree

3 files changed

+24
-20
lines changed

3 files changed

+24
-20
lines changed

include/ur.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -652,12 +652,13 @@ class ur_image_channel_order_v(IntEnum):
652652
RGBA = 5 ## channel order RGBA
653653
BGRA = 6 ## channel order BGRA
654654
ARGB = 7 ## channel order ARGB
655-
INTENSITY = 8 ## channel order intensity
656-
LUMINANCE = 9 ## channel order luminance
657-
RX = 10 ## channel order Rx
658-
RGX = 11 ## channel order RGx
659-
RGBX = 12 ## channel order RGBx
660-
SRGBA = 13 ## channel order sRGBA
655+
ABGR = 8 ## channel order ABGR
656+
INTENSITY = 9 ## channel order intensity
657+
LUMINANCE = 10 ## channel order luminance
658+
RX = 11 ## channel order Rx
659+
RGX = 12 ## channel order RGx
660+
RGBX = 13 ## channel order RGBx
661+
SRGBA = 14 ## channel order sRGBA
661662

662663
class ur_image_channel_order_t(c_int):
663664
def __str__(self):

include/ur_api.h

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,20 +1385,21 @@ typedef enum ur_mem_info_t {
13851385
///////////////////////////////////////////////////////////////////////////////
13861386
/// @brief Image channel order info: number of channels and the channel layout
13871387
typedef enum ur_image_channel_order_t {
1388-
UR_IMAGE_CHANNEL_ORDER_A = 0, ///< channel order A
1389-
UR_IMAGE_CHANNEL_ORDER_R = 1, ///< channel order R
1390-
UR_IMAGE_CHANNEL_ORDER_RG = 2, ///< channel order RG
1391-
UR_IMAGE_CHANNEL_ORDER_RA = 3, ///< channel order RA
1392-
UR_IMAGE_CHANNEL_ORDER_RGB = 4, ///< channel order RGB
1393-
UR_IMAGE_CHANNEL_ORDER_RGBA = 5, ///< channel order RGBA
1394-
UR_IMAGE_CHANNEL_ORDER_BGRA = 6, ///< channel order BGRA
1395-
UR_IMAGE_CHANNEL_ORDER_ARGB = 7, ///< channel order ARGB
1396-
UR_IMAGE_CHANNEL_ORDER_INTENSITY = 8, ///< channel order intensity
1397-
UR_IMAGE_CHANNEL_ORDER_LUMINANCE = 9, ///< channel order luminance
1398-
UR_IMAGE_CHANNEL_ORDER_RX = 10, ///< channel order Rx
1399-
UR_IMAGE_CHANNEL_ORDER_RGX = 11, ///< channel order RGx
1400-
UR_IMAGE_CHANNEL_ORDER_RGBX = 12, ///< channel order RGBx
1401-
UR_IMAGE_CHANNEL_ORDER_SRGBA = 13, ///< channel order sRGBA
1388+
UR_IMAGE_CHANNEL_ORDER_A = 0, ///< channel order A
1389+
UR_IMAGE_CHANNEL_ORDER_R = 1, ///< channel order R
1390+
UR_IMAGE_CHANNEL_ORDER_RG = 2, ///< channel order RG
1391+
UR_IMAGE_CHANNEL_ORDER_RA = 3, ///< channel order RA
1392+
UR_IMAGE_CHANNEL_ORDER_RGB = 4, ///< channel order RGB
1393+
UR_IMAGE_CHANNEL_ORDER_RGBA = 5, ///< channel order RGBA
1394+
UR_IMAGE_CHANNEL_ORDER_BGRA = 6, ///< channel order BGRA
1395+
UR_IMAGE_CHANNEL_ORDER_ARGB = 7, ///< channel order ARGB
1396+
UR_IMAGE_CHANNEL_ORDER_ABGR = 8, ///< channel order ABGR
1397+
UR_IMAGE_CHANNEL_ORDER_INTENSITY = 9, ///< channel order intensity
1398+
UR_IMAGE_CHANNEL_ORDER_LUMINANCE = 10, ///< channel order luminance
1399+
UR_IMAGE_CHANNEL_ORDER_RX = 11, ///< channel order Rx
1400+
UR_IMAGE_CHANNEL_ORDER_RGX = 12, ///< channel order RGx
1401+
UR_IMAGE_CHANNEL_ORDER_RGBX = 13, ///< channel order RGBx
1402+
UR_IMAGE_CHANNEL_ORDER_SRGBA = 14, ///< channel order sRGBA
14021403
/// @cond
14031404
UR_IMAGE_CHANNEL_ORDER_FORCE_UINT32 = 0x7fffffff
14041405
/// @endcond

scripts/core/memory.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ etors:
8585
desc: "channel order BGRA"
8686
- name: ARGB
8787
desc: "channel order ARGB"
88+
- name: ABGR
89+
desc: "channel order ABGR"
8890
- name: INTENSITY
8991
desc: "channel order intensity"
9092
- name: LUMINANCE

0 commit comments

Comments
 (0)