Skip to content

Commit 0c986f5

Browse files
bashbaugbashbaug
authored
update image enum tests to remove Kernel capability (KhronosGroup#5562)
We are removing Kernel from the image channel order and image channel data type enums because Kernel is already required transitively, so we need to update the tests to match.
1 parent b741360 commit 0c986f5

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ vars = {
1313
'protobuf_revision': 'v21.12',
1414

1515
're2_revision': 'ab7c5918b418428ed17dbe564e0d8402bd7d743d',
16-
'spirv_headers_revision': 'e77d03080b90c5d361663a67834c57bb1fddaec2',
16+
'spirv_headers_revision': 'd3c2a6fa95ad463ca8044d7fc45557db381a6a64',
1717
}
1818

1919
deps = {

‎test/operand_capabilities_test.cpp‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -340,56 +340,56 @@ INSTANTIATE_TEST_SUITE_P(
340340
// See SPIR-V Section 3.12 Image Channel Order
341341
INSTANTIATE_TEST_SUITE_P(
342342
ImageChannelOrder, EnumCapabilityTest,
343-
Combine(
344-
Values(SPV_ENV_UNIVERSAL_1_0, SPV_ENV_UNIVERSAL_1_1),
345-
ValuesIn(std::vector<EnumCapabilityCase>{
346-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::R, Kernel),
347-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::A, Kernel),
348-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::RG, Kernel),
349-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::RA, Kernel),
350-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::RGB, Kernel),
351-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::RGBA, Kernel),
352-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::BGRA, Kernel),
353-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::ARGB, Kernel),
354-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::Intensity, Kernel),
355-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::Luminance, Kernel),
356-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::Rx, Kernel),
357-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::RGx, Kernel),
358-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::RGBx, Kernel),
359-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::Depth, Kernel),
360-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::DepthStencil, Kernel),
361-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::sRGB, Kernel),
362-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::sRGBx, Kernel),
363-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::sRGBA, Kernel),
364-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::sBGRA, Kernel),
365-
CASE1(IMAGE_CHANNEL_ORDER, ImageChannelOrder::ABGR, Kernel),
366-
})));
343+
Combine(Values(SPV_ENV_UNIVERSAL_1_0, SPV_ENV_UNIVERSAL_1_1),
344+
ValuesIn(std::vector<EnumCapabilityCase>{
345+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::R),
346+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::A),
347+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::RG),
348+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::RA),
349+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::RGB),
350+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::RGBA),
351+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::BGRA),
352+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::ARGB),
353+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::Intensity),
354+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::Luminance),
355+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::Rx),
356+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::RGx),
357+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::RGBx),
358+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::Depth),
359+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::DepthStencil),
360+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::sRGB),
361+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::sRGBx),
362+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::sRGBA),
363+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::sBGRA),
364+
CASE0(IMAGE_CHANNEL_ORDER, ImageChannelOrder::ABGR),
365+
})));
367366

368367
// See SPIR-V Section 3.13 Image Channel Data Type
369368
INSTANTIATE_TEST_SUITE_P(
370369
ImageChannelDataType, EnumCapabilityTest,
371-
Combine(Values(SPV_ENV_UNIVERSAL_1_0, SPV_ENV_UNIVERSAL_1_1),
372-
ValuesIn(std::vector<EnumCapabilityCase>{
373-
// clang-format off
374-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::SnormInt8, Kernel),
375-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::SnormInt16, Kernel),
376-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnormInt8, Kernel),
377-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnormInt16, Kernel),
378-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnormShort565, Kernel),
379-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnormShort555, Kernel),
380-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnormInt101010, Kernel),
381-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::SignedInt8, Kernel),
382-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::SignedInt16, Kernel),
383-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::SignedInt32, Kernel),
384-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnsignedInt8, Kernel),
385-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnsignedInt16, Kernel),
386-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnsignedInt32, Kernel),
387-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::HalfFloat, Kernel),
388-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::Float, Kernel),
389-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnormInt24, Kernel),
390-
CASE1(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnormInt101010_2, Kernel),
391-
// clang-format on
392-
})));
370+
Combine(
371+
Values(SPV_ENV_UNIVERSAL_1_0, SPV_ENV_UNIVERSAL_1_1),
372+
ValuesIn(std::vector<EnumCapabilityCase>{
373+
// clang-format off
374+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::SnormInt8),
375+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::SnormInt16),
376+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnormInt8),
377+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnormInt16),
378+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnormShort565),
379+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnormShort555),
380+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnormInt101010),
381+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::SignedInt8),
382+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::SignedInt16),
383+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::SignedInt32),
384+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnsignedInt8),
385+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnsignedInt16),
386+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnsignedInt32),
387+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::HalfFloat),
388+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::Float),
389+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnormInt24),
390+
CASE0(IMAGE_CHANNEL_DATA_TYPE, ImageChannelDataType::UnormInt101010_2),
391+
// clang-format on
392+
})));
393393

394394
// See SPIR-V Section 3.14 Image Operands
395395
INSTANTIATE_TEST_SUITE_P(

0 commit comments

Comments
 (0)