Skip to content

Commit e660827

Browse files
committed
generator: Do not generate code for "disabled" extensions
It is unlikely that disabled, reserved extensions (without naming whatsoever) are used through Ash bindings generated from Vulkan-Headers releases, and are best ignored to reduce diff noise and spurious issues [1] with unfinished extension definitions. This approach matches what is defined in the registry spec for `supported="disabled"` [2]: use `supported="disabled"` to indicate this extension should never be processed. [1]: KhronosGroup/Vulkan-Docs#1549 [2]: https://github.com/KhronosGroup/Vulkan-Docs/blob/b4e8cd820b2487bc892b391fb26b49501473a6a6/registry.txt#L1302-L1306
1 parent 06b4f8e commit e660827

File tree

3 files changed

+117
-3278
lines changed

3 files changed

+117
-3278
lines changed

ash/src/vk/const_debugs.rs

+11-91
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,10 @@ impl fmt::Debug for AccelerationStructureCompatibilityKHR {
5959
}
6060
impl fmt::Debug for AccelerationStructureCreateFlagsKHR {
6161
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
62-
const KNOWN: &[(Flags, &str)] = &[
63-
(
64-
AccelerationStructureCreateFlagsKHR::DEVICE_ADDRESS_CAPTURE_REPLAY.0,
65-
"DEVICE_ADDRESS_CAPTURE_REPLAY",
66-
),
67-
(
68-
AccelerationStructureCreateFlagsKHR::RESERVED_2_NV.0,
69-
"RESERVED_2_NV",
70-
),
71-
];
62+
const KNOWN: &[(Flags, &str)] = &[(
63+
AccelerationStructureCreateFlagsKHR::DEVICE_ADDRESS_CAPTURE_REPLAY.0,
64+
"DEVICE_ADDRESS_CAPTURE_REPLAY",
65+
)];
7266
debug_flags(f, KNOWN, self.0)
7367
}
7468
}
@@ -481,7 +475,6 @@ impl fmt::Debug for BufferCreateFlags {
481475
(BufferCreateFlags::SPARSE_BINDING.0, "SPARSE_BINDING"),
482476
(BufferCreateFlags::SPARSE_RESIDENCY.0, "SPARSE_RESIDENCY"),
483477
(BufferCreateFlags::SPARSE_ALIASED.0, "SPARSE_ALIASED"),
484-
(BufferCreateFlags::RESERVED_5_NV.0, "RESERVED_5_NV"),
485478
(BufferCreateFlags::PROTECTED.0, "PROTECTED"),
486479
(
487480
BufferCreateFlags::DEVICE_ADDRESS_CAPTURE_REPLAY.0,
@@ -549,7 +542,6 @@ impl fmt::Debug for BufferUsageFlags {
549542
BufferUsageFlags::SHADER_BINDING_TABLE_KHR.0,
550543
"SHADER_BINDING_TABLE_KHR",
551544
),
552-
(BufferUsageFlags::RESERVED_18_QCOM.0, "RESERVED_18_QCOM"),
553545
(
554546
BufferUsageFlags::SHADER_DEVICE_ADDRESS.0,
555547
"SHADER_DEVICE_ADDRESS",
@@ -587,10 +579,6 @@ impl fmt::Debug for BuildAccelerationStructureFlagsKHR {
587579
BuildAccelerationStructureFlagsKHR::LOW_MEMORY.0,
588580
"LOW_MEMORY",
589581
),
590-
(
591-
BuildAccelerationStructureFlagsKHR::RESERVED_5_NV.0,
592-
"RESERVED_5_NV",
593-
),
594582
];
595583
debug_flags(f, KNOWN, self.0)
596584
}
@@ -1021,7 +1009,6 @@ impl fmt::Debug for DescriptorBindingFlags {
10211009
DescriptorBindingFlags::VARIABLE_DESCRIPTOR_COUNT.0,
10221010
"VARIABLE_DESCRIPTOR_COUNT",
10231011
),
1024-
(DescriptorBindingFlags::RESERVED_4_QCOM.0, "RESERVED_4_QCOM"),
10251012
];
10261013
debug_flags(f, KNOWN, self.0)
10271014
}
@@ -1370,14 +1357,6 @@ impl fmt::Debug for ExternalFenceHandleTypeFlags {
13701357
"OPAQUE_WIN32_KMT",
13711358
),
13721359
(ExternalFenceHandleTypeFlags::SYNC_FD.0, "SYNC_FD"),
1373-
(
1374-
ExternalFenceHandleTypeFlags::RESERVED_4_NV.0,
1375-
"RESERVED_4_NV",
1376-
),
1377-
(
1378-
ExternalFenceHandleTypeFlags::RESERVED_5_NV.0,
1379-
"RESERVED_5_NV",
1380-
),
13811360
];
13821361
debug_flags(f, KNOWN, self.0)
13831362
}
@@ -1507,14 +1486,6 @@ impl fmt::Debug for ExternalSemaphoreHandleTypeFlags {
15071486
ExternalSemaphoreHandleTypeFlags::ZIRCON_EVENT_FUCHSIA.0,
15081487
"ZIRCON_EVENT_FUCHSIA",
15091488
),
1510-
(
1511-
ExternalSemaphoreHandleTypeFlags::RESERVED_5_NV.0,
1512-
"RESERVED_5_NV",
1513-
),
1514-
(
1515-
ExternalSemaphoreHandleTypeFlags::RESERVED_6_NV.0,
1516-
"RESERVED_6_NV",
1517-
),
15181489
];
15191490
debug_flags(f, KNOWN, self.0)
15201491
}
@@ -1756,36 +1727,6 @@ impl fmt::Debug for Format {
17561727
Self::ASTC_10X10_SFLOAT_BLOCK_EXT => Some("ASTC_10X10_SFLOAT_BLOCK_EXT"),
17571728
Self::ASTC_12X10_SFLOAT_BLOCK_EXT => Some("ASTC_12X10_SFLOAT_BLOCK_EXT"),
17581729
Self::ASTC_12X12_SFLOAT_BLOCK_EXT => Some("ASTC_12X12_SFLOAT_BLOCK_EXT"),
1759-
Self::ASTC_3X3X3_UNORM_BLOCK_EXT => Some("ASTC_3X3X3_UNORM_BLOCK_EXT"),
1760-
Self::ASTC_3X3X3_SRGB_BLOCK_EXT => Some("ASTC_3X3X3_SRGB_BLOCK_EXT"),
1761-
Self::ASTC_3X3X3_SFLOAT_BLOCK_EXT => Some("ASTC_3X3X3_SFLOAT_BLOCK_EXT"),
1762-
Self::ASTC_4X3X3_UNORM_BLOCK_EXT => Some("ASTC_4X3X3_UNORM_BLOCK_EXT"),
1763-
Self::ASTC_4X3X3_SRGB_BLOCK_EXT => Some("ASTC_4X3X3_SRGB_BLOCK_EXT"),
1764-
Self::ASTC_4X3X3_SFLOAT_BLOCK_EXT => Some("ASTC_4X3X3_SFLOAT_BLOCK_EXT"),
1765-
Self::ASTC_4X4X3_UNORM_BLOCK_EXT => Some("ASTC_4X4X3_UNORM_BLOCK_EXT"),
1766-
Self::ASTC_4X4X3_SRGB_BLOCK_EXT => Some("ASTC_4X4X3_SRGB_BLOCK_EXT"),
1767-
Self::ASTC_4X4X3_SFLOAT_BLOCK_EXT => Some("ASTC_4X4X3_SFLOAT_BLOCK_EXT"),
1768-
Self::ASTC_4X4X4_UNORM_BLOCK_EXT => Some("ASTC_4X4X4_UNORM_BLOCK_EXT"),
1769-
Self::ASTC_4X4X4_SRGB_BLOCK_EXT => Some("ASTC_4X4X4_SRGB_BLOCK_EXT"),
1770-
Self::ASTC_4X4X4_SFLOAT_BLOCK_EXT => Some("ASTC_4X4X4_SFLOAT_BLOCK_EXT"),
1771-
Self::ASTC_5X4X4_UNORM_BLOCK_EXT => Some("ASTC_5X4X4_UNORM_BLOCK_EXT"),
1772-
Self::ASTC_5X4X4_SRGB_BLOCK_EXT => Some("ASTC_5X4X4_SRGB_BLOCK_EXT"),
1773-
Self::ASTC_5X4X4_SFLOAT_BLOCK_EXT => Some("ASTC_5X4X4_SFLOAT_BLOCK_EXT"),
1774-
Self::ASTC_5X5X4_UNORM_BLOCK_EXT => Some("ASTC_5X5X4_UNORM_BLOCK_EXT"),
1775-
Self::ASTC_5X5X4_SRGB_BLOCK_EXT => Some("ASTC_5X5X4_SRGB_BLOCK_EXT"),
1776-
Self::ASTC_5X5X4_SFLOAT_BLOCK_EXT => Some("ASTC_5X5X4_SFLOAT_BLOCK_EXT"),
1777-
Self::ASTC_5X5X5_UNORM_BLOCK_EXT => Some("ASTC_5X5X5_UNORM_BLOCK_EXT"),
1778-
Self::ASTC_5X5X5_SRGB_BLOCK_EXT => Some("ASTC_5X5X5_SRGB_BLOCK_EXT"),
1779-
Self::ASTC_5X5X5_SFLOAT_BLOCK_EXT => Some("ASTC_5X5X5_SFLOAT_BLOCK_EXT"),
1780-
Self::ASTC_6X5X5_UNORM_BLOCK_EXT => Some("ASTC_6X5X5_UNORM_BLOCK_EXT"),
1781-
Self::ASTC_6X5X5_SRGB_BLOCK_EXT => Some("ASTC_6X5X5_SRGB_BLOCK_EXT"),
1782-
Self::ASTC_6X5X5_SFLOAT_BLOCK_EXT => Some("ASTC_6X5X5_SFLOAT_BLOCK_EXT"),
1783-
Self::ASTC_6X6X5_UNORM_BLOCK_EXT => Some("ASTC_6X6X5_UNORM_BLOCK_EXT"),
1784-
Self::ASTC_6X6X5_SRGB_BLOCK_EXT => Some("ASTC_6X6X5_SRGB_BLOCK_EXT"),
1785-
Self::ASTC_6X6X5_SFLOAT_BLOCK_EXT => Some("ASTC_6X6X5_SFLOAT_BLOCK_EXT"),
1786-
Self::ASTC_6X6X6_UNORM_BLOCK_EXT => Some("ASTC_6X6X6_UNORM_BLOCK_EXT"),
1787-
Self::ASTC_6X6X6_SRGB_BLOCK_EXT => Some("ASTC_6X6X6_SRGB_BLOCK_EXT"),
1788-
Self::ASTC_6X6X6_SFLOAT_BLOCK_EXT => Some("ASTC_6X6X6_SFLOAT_BLOCK_EXT"),
17891730
Self::G8_B8R8_2PLANE_444_UNORM_EXT => Some("G8_B8R8_2PLANE_444_UNORM_EXT"),
17901731
Self::G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT => {
17911732
Some("G10X6_B10X6R10X6_2PLANE_444_UNORM_3PACK16_EXT")
@@ -2055,7 +1996,6 @@ impl fmt::Debug for ImageCreateFlags {
20551996
"SAMPLE_LOCATIONS_COMPATIBLE_DEPTH_EXT",
20561997
),
20571998
(ImageCreateFlags::SUBSAMPLED_EXT.0, "SUBSAMPLED_EXT"),
2058-
(ImageCreateFlags::RESERVED_15_NV.0, "RESERVED_15_NV"),
20591999
(ImageCreateFlags::ALIAS.0, "ALIAS"),
20602000
(
20612001
ImageCreateFlags::SPLIT_INSTANCE_BIND_REGIONS.0,
@@ -2200,8 +2140,6 @@ impl fmt::Debug for ImageUsageFlags {
22002140
ImageUsageFlags::SHADING_RATE_IMAGE_NV.0,
22012141
"SHADING_RATE_IMAGE_NV",
22022142
),
2203-
(ImageUsageFlags::RESERVED_16_QCOM.0, "RESERVED_16_QCOM"),
2204-
(ImageUsageFlags::RESERVED_17_QCOM.0, "RESERVED_17_QCOM"),
22052143
(
22062144
ImageUsageFlags::FRAGMENT_DENSITY_MAP_EXT.0,
22072145
"FRAGMENT_DENSITY_MAP_EXT",
@@ -2392,7 +2330,6 @@ impl fmt::Debug for MemoryHeapFlags {
23922330
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
23932331
const KNOWN: &[(Flags, &str)] = &[
23942332
(MemoryHeapFlags::DEVICE_LOCAL.0, "DEVICE_LOCAL"),
2395-
(MemoryHeapFlags::RESERVED_2_KHR.0, "RESERVED_2_KHR"),
23962333
(MemoryHeapFlags::MULTI_INSTANCE.0, "MULTI_INSTANCE"),
23972334
];
23982335
debug_flags(f, KNOWN, self.0)
@@ -2677,14 +2614,10 @@ impl fmt::Debug for PipelineBindPoint {
26772614
}
26782615
impl fmt::Debug for PipelineCacheCreateFlags {
26792616
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
2680-
const KNOWN: &[(Flags, &str)] = &[
2681-
(PipelineCacheCreateFlags::RESERVED_1_EXT.0, "RESERVED_1_EXT"),
2682-
(
2683-
PipelineCacheCreateFlags::EXTERNALLY_SYNCHRONIZED_EXT.0,
2684-
"EXTERNALLY_SYNCHRONIZED_EXT",
2685-
),
2686-
(PipelineCacheCreateFlags::RESERVED_2_EXT.0, "RESERVED_2_EXT"),
2687-
];
2617+
const KNOWN: &[(Flags, &str)] = &[(
2618+
PipelineCacheCreateFlags::EXTERNALLY_SYNCHRONIZED_EXT.0,
2619+
"EXTERNALLY_SYNCHRONIZED_EXT",
2620+
)];
26882621
debug_flags(f, KNOWN, self.0)
26892622
}
26902623
}
@@ -2793,7 +2726,6 @@ impl fmt::Debug for PipelineCreateFlags {
27932726
PipelineCreateFlags::EARLY_RETURN_ON_FAILURE_EXT.0,
27942727
"EARLY_RETURN_ON_FAILURE_EXT",
27952728
),
2796-
(PipelineCreateFlags::RESERVED_20_NV.0, "RESERVED_20_NV"),
27972729
(
27982730
PipelineCreateFlags::VIEW_INDEX_FROM_DEVICE_INDEX.0,
27992731
"VIEW_INDEX_FROM_DEVICE_INDEX",
@@ -2898,10 +2830,6 @@ impl fmt::Debug for PipelineRasterizationStateStreamCreateFlagsEXT {
28982830
impl fmt::Debug for PipelineShaderStageCreateFlags {
28992831
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
29002832
const KNOWN: &[(Flags, &str)] = &[
2901-
(
2902-
PipelineShaderStageCreateFlags::RESERVED_2_NV.0,
2903-
"RESERVED_2_NV",
2904-
),
29052833
(
29062834
PipelineShaderStageCreateFlags::ALLOW_VARYING_SUBGROUP_SIZE_EXT.0,
29072835
"ALLOW_VARYING_SUBGROUP_SIZE_EXT",
@@ -2910,10 +2838,6 @@ impl fmt::Debug for PipelineShaderStageCreateFlags {
29102838
PipelineShaderStageCreateFlags::REQUIRE_FULL_SUBGROUPS_EXT.0,
29112839
"REQUIRE_FULL_SUBGROUPS_EXT",
29122840
),
2913-
(
2914-
PipelineShaderStageCreateFlags::RESERVED_3_KHR.0,
2915-
"RESERVED_3_KHR",
2916-
),
29172841
];
29182842
debug_flags(f, KNOWN, self.0)
29192843
}
@@ -3369,10 +3293,8 @@ impl fmt::Debug for RayTracingShaderGroupTypeKHR {
33693293
}
33703294
impl fmt::Debug for RenderPassCreateFlags {
33713295
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
3372-
const KNOWN: &[(Flags, &str)] = &[
3373-
(RenderPassCreateFlags::RESERVED_0_KHR.0, "RESERVED_0_KHR"),
3374-
(RenderPassCreateFlags::TRANSFORM_QCOM.0, "TRANSFORM_QCOM"),
3375-
];
3296+
const KNOWN: &[(Flags, &str)] =
3297+
&[(RenderPassCreateFlags::TRANSFORM_QCOM.0, "TRANSFORM_QCOM")];
33763298
debug_flags(f, KNOWN, self.0)
33773299
}
33783300
}
@@ -3655,8 +3577,7 @@ impl fmt::Debug for ShaderInfoTypeAMD {
36553577
}
36563578
impl fmt::Debug for ShaderModuleCreateFlags {
36573579
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
3658-
const KNOWN: &[(Flags, &str)] =
3659-
&[(ShaderModuleCreateFlags::RESERVED_0_NV.0, "RESERVED_0_NV")];
3580+
const KNOWN: &[(Flags, &str)] = &[];
36603581
debug_flags(f, KNOWN, self.0)
36613582
}
36623583
}
@@ -4628,7 +4549,6 @@ impl fmt::Debug for StructureType {
46284549
Self::DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV => {
46294550
Some("DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV")
46304551
}
4631-
Self::RESERVED_QCOM => Some("RESERVED_QCOM"),
46324552
Self::MEMORY_BARRIER_2_KHR => Some("MEMORY_BARRIER_2_KHR"),
46334553
Self::BUFFER_MEMORY_BARRIER_2_KHR => Some("BUFFER_MEMORY_BARRIER_2_KHR"),
46344554
Self::IMAGE_MEMORY_BARRIER_2_KHR => Some("IMAGE_MEMORY_BARRIER_2_KHR"),

0 commit comments

Comments
 (0)