Skip to content

Commit 7c2f533

Browse files
authored
Add ImageChannelDataType definitions for cl_ext_image_unsigned_10x6_12x4_14x2 (KhronosGroup#507)
Used by the following OpenCL extension: KhronosGroup/OpenCL-Docs#1352 Signed-off-by: Kevin Petit <[email protected]>
1 parent 95dc1aa commit 7c2f533

10 files changed

Lines changed: 103 additions & 1 deletion

File tree

include/spirv/unified1/spirv.bf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,9 +387,15 @@ namespace Spv
387387
Float = 14,
388388
UnormInt24 = 15,
389389
UnormInt101010_2 = 16,
390+
UnormInt10X6EXT = 17,
390391
UnsignedIntRaw10EXT = 19,
391392
UnsignedIntRaw12EXT = 20,
392393
UnormInt2_101010EXT = 21,
394+
UnsignedInt10X6EXT = 22,
395+
UnsignedInt12X4EXT = 23,
396+
UnsignedInt14X2EXT = 24,
397+
UnormInt12X4EXT = 25,
398+
UnormInt14X2EXT = 26,
393399
Max = 0x7fffffff,
394400
}
395401

include/spirv/unified1/spirv.core.grammar.json

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13279,6 +13279,11 @@
1327913279
"value" : 16,
1328013280
"version": "1.0"
1328113281
},
13282+
{
13283+
"enumerant" : "UnormInt10X6EXT",
13284+
"value" : 17,
13285+
"version": "1.0"
13286+
},
1328213287
{
1328313288
"enumerant" : "UnsignedIntRaw10EXT",
1328413289
"value" : 19,
@@ -13293,6 +13298,31 @@
1329313298
"enumerant" : "UnormInt2_101010EXT",
1329413299
"value" : 21,
1329513300
"version": "1.0"
13301+
},
13302+
{
13303+
"enumerant" : "UnsignedInt10X6EXT",
13304+
"value" : 22,
13305+
"version": "1.0"
13306+
},
13307+
{
13308+
"enumerant" : "UnsignedInt12X4EXT",
13309+
"value" : 23,
13310+
"version": "1.0"
13311+
},
13312+
{
13313+
"enumerant" : "UnsignedInt14X2EXT",
13314+
"value" : 24,
13315+
"version": "1.0"
13316+
},
13317+
{
13318+
"enumerant" : "UnormInt12X4EXT",
13319+
"value" : 25,
13320+
"version": "1.0"
13321+
},
13322+
{
13323+
"enumerant" : "UnormInt14X2EXT",
13324+
"value" : 26,
13325+
"version": "1.0"
1329613326
}
1329713327
]
1329813328
},

include/spirv/unified1/spirv.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,9 +386,15 @@ public enum ImageChannelDataType
386386
Float = 14,
387387
UnormInt24 = 15,
388388
UnormInt101010_2 = 16,
389+
UnormInt10X6EXT = 17,
389390
UnsignedIntRaw10EXT = 19,
390391
UnsignedIntRaw12EXT = 20,
391392
UnormInt2_101010EXT = 21,
393+
UnsignedInt10X6EXT = 22,
394+
UnsignedInt12X4EXT = 23,
395+
UnsignedInt14X2EXT = 24,
396+
UnormInt12X4EXT = 25,
397+
UnormInt14X2EXT = 26,
392398
Max = 0x7fffffff,
393399
}
394400

include/spirv/unified1/spirv.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -383,9 +383,15 @@ typedef enum SpvImageChannelDataType_ {
383383
SpvImageChannelDataTypeFloat = 14,
384384
SpvImageChannelDataTypeUnormInt24 = 15,
385385
SpvImageChannelDataTypeUnormInt101010_2 = 16,
386+
SpvImageChannelDataTypeUnormInt10X6EXT = 17,
386387
SpvImageChannelDataTypeUnsignedIntRaw10EXT = 19,
387388
SpvImageChannelDataTypeUnsignedIntRaw12EXT = 20,
388389
SpvImageChannelDataTypeUnormInt2_101010EXT = 21,
390+
SpvImageChannelDataTypeUnsignedInt10X6EXT = 22,
391+
SpvImageChannelDataTypeUnsignedInt12X4EXT = 23,
392+
SpvImageChannelDataTypeUnsignedInt14X2EXT = 24,
393+
SpvImageChannelDataTypeUnormInt12X4EXT = 25,
394+
SpvImageChannelDataTypeUnormInt14X2EXT = 26,
389395
SpvImageChannelDataTypeMax = 0x7fffffff,
390396
} SpvImageChannelDataType;
391397

@@ -3508,9 +3514,15 @@ inline const char* SpvImageChannelDataTypeToString(SpvImageChannelDataType value
35083514
case SpvImageChannelDataTypeFloat: return "Float";
35093515
case SpvImageChannelDataTypeUnormInt24: return "UnormInt24";
35103516
case SpvImageChannelDataTypeUnormInt101010_2: return "UnormInt101010_2";
3517+
case SpvImageChannelDataTypeUnormInt10X6EXT: return "UnormInt10X6EXT";
35113518
case SpvImageChannelDataTypeUnsignedIntRaw10EXT: return "UnsignedIntRaw10EXT";
35123519
case SpvImageChannelDataTypeUnsignedIntRaw12EXT: return "UnsignedIntRaw12EXT";
35133520
case SpvImageChannelDataTypeUnormInt2_101010EXT: return "UnormInt2_101010EXT";
3521+
case SpvImageChannelDataTypeUnsignedInt10X6EXT: return "UnsignedInt10X6EXT";
3522+
case SpvImageChannelDataTypeUnsignedInt12X4EXT: return "UnsignedInt12X4EXT";
3523+
case SpvImageChannelDataTypeUnsignedInt14X2EXT: return "UnsignedInt14X2EXT";
3524+
case SpvImageChannelDataTypeUnormInt12X4EXT: return "UnormInt12X4EXT";
3525+
case SpvImageChannelDataTypeUnormInt14X2EXT: return "UnormInt14X2EXT";
35143526
default: return "Unknown";
35153527
}
35163528
}

include/spirv/unified1/spirv.hpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,15 @@ enum ImageChannelDataType {
379379
ImageChannelDataTypeFloat = 14,
380380
ImageChannelDataTypeUnormInt24 = 15,
381381
ImageChannelDataTypeUnormInt101010_2 = 16,
382+
ImageChannelDataTypeUnormInt10X6EXT = 17,
382383
ImageChannelDataTypeUnsignedIntRaw10EXT = 19,
383384
ImageChannelDataTypeUnsignedIntRaw12EXT = 20,
384385
ImageChannelDataTypeUnormInt2_101010EXT = 21,
386+
ImageChannelDataTypeUnsignedInt10X6EXT = 22,
387+
ImageChannelDataTypeUnsignedInt12X4EXT = 23,
388+
ImageChannelDataTypeUnsignedInt14X2EXT = 24,
389+
ImageChannelDataTypeUnormInt12X4EXT = 25,
390+
ImageChannelDataTypeUnormInt14X2EXT = 26,
385391
ImageChannelDataTypeMax = 0x7fffffff,
386392
};
387393

@@ -3504,9 +3510,15 @@ inline const char* ImageChannelDataTypeToString(ImageChannelDataType value) {
35043510
case ImageChannelDataTypeFloat: return "Float";
35053511
case ImageChannelDataTypeUnormInt24: return "UnormInt24";
35063512
case ImageChannelDataTypeUnormInt101010_2: return "UnormInt101010_2";
3513+
case ImageChannelDataTypeUnormInt10X6EXT: return "UnormInt10X6EXT";
35073514
case ImageChannelDataTypeUnsignedIntRaw10EXT: return "UnsignedIntRaw10EXT";
35083515
case ImageChannelDataTypeUnsignedIntRaw12EXT: return "UnsignedIntRaw12EXT";
35093516
case ImageChannelDataTypeUnormInt2_101010EXT: return "UnormInt2_101010EXT";
3517+
case ImageChannelDataTypeUnsignedInt10X6EXT: return "UnsignedInt10X6EXT";
3518+
case ImageChannelDataTypeUnsignedInt12X4EXT: return "UnsignedInt12X4EXT";
3519+
case ImageChannelDataTypeUnsignedInt14X2EXT: return "UnsignedInt14X2EXT";
3520+
case ImageChannelDataTypeUnormInt12X4EXT: return "UnormInt12X4EXT";
3521+
case ImageChannelDataTypeUnormInt14X2EXT: return "UnormInt14X2EXT";
35103522
default: return "Unknown";
35113523
}
35123524
}

include/spirv/unified1/spirv.hpp11

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -379,9 +379,15 @@ enum class ImageChannelDataType : unsigned {
379379
Float = 14,
380380
UnormInt24 = 15,
381381
UnormInt101010_2 = 16,
382+
UnormInt10X6EXT = 17,
382383
UnsignedIntRaw10EXT = 19,
383384
UnsignedIntRaw12EXT = 20,
384385
UnormInt2_101010EXT = 21,
386+
UnsignedInt10X6EXT = 22,
387+
UnsignedInt12X4EXT = 23,
388+
UnsignedInt14X2EXT = 24,
389+
UnormInt12X4EXT = 25,
390+
UnormInt14X2EXT = 26,
385391
Max = 0x7fffffff,
386392
};
387393

@@ -3504,9 +3510,15 @@ inline const char* ImageChannelDataTypeToString(ImageChannelDataType value) {
35043510
case ImageChannelDataType::Float: return "Float";
35053511
case ImageChannelDataType::UnormInt24: return "UnormInt24";
35063512
case ImageChannelDataType::UnormInt101010_2: return "UnormInt101010_2";
3513+
case ImageChannelDataType::UnormInt10X6EXT: return "UnormInt10X6EXT";
35073514
case ImageChannelDataType::UnsignedIntRaw10EXT: return "UnsignedIntRaw10EXT";
35083515
case ImageChannelDataType::UnsignedIntRaw12EXT: return "UnsignedIntRaw12EXT";
35093516
case ImageChannelDataType::UnormInt2_101010EXT: return "UnormInt2_101010EXT";
3517+
case ImageChannelDataType::UnsignedInt10X6EXT: return "UnsignedInt10X6EXT";
3518+
case ImageChannelDataType::UnsignedInt12X4EXT: return "UnsignedInt12X4EXT";
3519+
case ImageChannelDataType::UnsignedInt14X2EXT: return "UnsignedInt14X2EXT";
3520+
case ImageChannelDataType::UnormInt12X4EXT: return "UnormInt12X4EXT";
3521+
case ImageChannelDataType::UnormInt14X2EXT: return "UnormInt14X2EXT";
35103522
default: return "Unknown";
35113523
}
35123524
}

include/spirv/unified1/spirv.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,9 +419,15 @@
419419
"Float": 14,
420420
"UnormInt24": 15,
421421
"UnormInt101010_2": 16,
422+
"UnormInt10X6EXT": 17,
422423
"UnsignedIntRaw10EXT": 19,
423424
"UnsignedIntRaw12EXT": 20,
424-
"UnormInt2_101010EXT": 21
425+
"UnormInt2_101010EXT": 21,
426+
"UnsignedInt10X6EXT": 22,
427+
"UnsignedInt12X4EXT": 23,
428+
"UnsignedInt14X2EXT": 24,
429+
"UnormInt12X4EXT": 25,
430+
"UnormInt14X2EXT": 26
425431
}
426432
},
427433
{

include/spirv/unified1/spirv.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,15 @@ spv = {
370370
Float = 14,
371371
UnormInt24 = 15,
372372
UnormInt101010_2 = 16,
373+
UnormInt10X6EXT = 17,
373374
UnsignedIntRaw10EXT = 19,
374375
UnsignedIntRaw12EXT = 20,
375376
UnormInt2_101010EXT = 21,
377+
UnsignedInt10X6EXT = 22,
378+
UnsignedInt12X4EXT = 23,
379+
UnsignedInt14X2EXT = 24,
380+
UnormInt12X4EXT = 25,
381+
UnormInt14X2EXT = 26,
376382
Max = 0x7fffffff,
377383
},
378384

include/spirv/unified1/spirv.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,15 @@
359359
'Float' : 14,
360360
'UnormInt24' : 15,
361361
'UnormInt101010_2' : 16,
362+
'UnormInt10X6EXT' : 17,
362363
'UnsignedIntRaw10EXT' : 19,
363364
'UnsignedIntRaw12EXT' : 20,
364365
'UnormInt2_101010EXT' : 21,
366+
'UnsignedInt10X6EXT' : 22,
367+
'UnsignedInt12X4EXT' : 23,
368+
'UnsignedInt14X2EXT' : 24,
369+
'UnormInt12X4EXT' : 25,
370+
'UnormInt14X2EXT' : 26,
365371
},
366372

367373
'ImageOperandsShift' : {

include/spirv/unified1/spv.d

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,9 +389,15 @@ enum ImageChannelDataType : uint
389389
Float = 14,
390390
UnormInt24 = 15,
391391
UnormInt101010_2 = 16,
392+
UnormInt10X6EXT = 17,
392393
UnsignedIntRaw10EXT = 19,
393394
UnsignedIntRaw12EXT = 20,
394395
UnormInt2_101010EXT = 21,
396+
UnsignedInt10X6EXT = 22,
397+
UnsignedInt12X4EXT = 23,
398+
UnsignedInt14X2EXT = 24,
399+
UnormInt12X4EXT = 25,
400+
UnormInt14X2EXT = 26,
395401
Max = 0x7fffffff,
396402
}
397403

0 commit comments

Comments
 (0)