Corresponds to grammar changes for SPIR-V 1.3 Rev4.
This commit is contained in:
David Neto 2018-09-05 15:42:21 -04:00
Родитель 571251c8f8
Коммит 7600fc0e19
3 изменённых файлов: 12 добавлений и 8 удалений

Просмотреть файл

@ -205,12 +205,12 @@ INSTANTIATE_TEST_CASE_P(
Dim, EnumCapabilityTest,
Combine(Values(SPV_ENV_UNIVERSAL_1_0, SPV_ENV_UNIVERSAL_1_1),
ValuesIn(std::vector<EnumCapabilityCase>{
CASE1(DIMENSIONALITY, Dim1D, Sampled1D),
CASE0(DIMENSIONALITY, Dim2D),
CASE2(DIMENSIONALITY, Dim1D, Sampled1D, Image1D),
CASE3(DIMENSIONALITY, Dim2D, Kernel, Shader, ImageMSArray),
CASE0(DIMENSIONALITY, Dim3D),
CASE1(DIMENSIONALITY, DimCube, Shader),
CASE1(DIMENSIONALITY, DimRect, SampledRect),
CASE1(DIMENSIONALITY, DimBuffer, SampledBuffer),
CASE2(DIMENSIONALITY, DimCube, Shader, ImageCubeArray),
CASE2(DIMENSIONALITY, DimRect, SampledRect, ImageRect),
CASE2(DIMENSIONALITY, DimBuffer, SampledBuffer, ImageBuffer),
CASE1(DIMENSIONALITY, DimSubpassData, InputAttachment),
})), );

Просмотреть файл

@ -89,8 +89,9 @@ INSTANTIATE_TEST_CASE_P(
::testing::ValuesIn(std::vector<MaskExpansionCase>{
// No bits means no change.
{SPV_OPERAND_TYPE_OPTIONAL_MEMORY_ACCESS, 0, {PREFIX0}, {PREFIX0}},
// Unknown bits means no change. Use all bits that aren't in the grammar.
// The last mask enum is 0x20
// Unknown bits means no change. Use all bits that aren't in the
// grammar.
// The last mask enum is 0x20
{SPV_OPERAND_TYPE_OPTIONAL_MEMORY_ACCESS,
0xffffffc0,
{PREFIX1},

Просмотреть файл

@ -518,7 +518,10 @@ INSTANTIATE_TEST_CASE_P(
// environments, and at least one specific environment.
//
// Note: SPV_KHR_vulkan_memory_model adds scope enum value QueueFamilyKHR.
// Scope enums are used in ID defini
// Scope enums are used in ID definitions elsewhere, that don't know they
// are using particular enums. So the assembler doesn't support assembling
// those enums names into the corresponding values. So there is no asm/dis
// tests for those enums.
Combine(
Values(SPV_ENV_UNIVERSAL_1_0, SPV_ENV_UNIVERSAL_1_1,
SPV_ENV_UNIVERSAL_1_3, SPV_ENV_VULKAN_1_0, SPV_ENV_VULKAN_1_1),