diff --git a/ash/src/extensions/experimental/amd.rs b/ash/src/extensions/experimental/amd.rs index a5229fb..6de41bc 100644 --- a/ash/src/extensions/experimental/amd.rs +++ b/ash/src/extensions/experimental/amd.rs @@ -34,11 +34,7 @@ use std::os::raw::*; #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] pub struct GpaSqShaderStageFlags(pub(crate) Flags); -vk_bitflags_wrapped!( - GpaSqShaderStageFlags, - 0b1111111111111111111111111111111, - Flags -); +vk_bitflags_wrapped!(GpaSqShaderStageFlags, Flags); impl fmt::Debug for GpaSqShaderStageFlags { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { const KNOWN: &[(Flags, &str)] = &[ diff --git a/ash/src/vk/bitflags.rs b/ash/src/vk/bitflags.rs index 728e330..1edce27 100644 --- a/ash/src/vk/bitflags.rs +++ b/ash/src/vk/bitflags.rs @@ -3,13 +3,13 @@ use crate::vk::definitions::*; #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineCacheCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineCacheCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(PipelineCacheCreateFlags, Flags); impl PipelineCacheCreateFlags {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct QueueFlags(pub(crate) Flags); -vk_bitflags_wrapped!(QueueFlags, 0b1111, Flags); +vk_bitflags_wrapped!(QueueFlags, Flags); impl QueueFlags { #[doc = "Queue supports graphics operations"] pub const GRAPHICS: Self = Self(0b1); @@ -24,7 +24,7 @@ impl QueueFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct CullModeFlags(pub(crate) Flags); -vk_bitflags_wrapped!(CullModeFlags, 0b11, Flags); +vk_bitflags_wrapped!(CullModeFlags, Flags); impl CullModeFlags { pub const NONE: Self = Self(0); pub const FRONT: Self = Self(0b1); @@ -35,19 +35,19 @@ impl CullModeFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct RenderPassCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(RenderPassCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(RenderPassCreateFlags, Flags); impl RenderPassCreateFlags {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DeviceQueueCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(DeviceQueueCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(DeviceQueueCreateFlags, Flags); impl DeviceQueueCreateFlags {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct MemoryPropertyFlags(pub(crate) Flags); -vk_bitflags_wrapped!(MemoryPropertyFlags, 0b1_1111, Flags); +vk_bitflags_wrapped!(MemoryPropertyFlags, Flags); impl MemoryPropertyFlags { #[doc = "If otherwise stated, then allocate memory on device"] pub const DEVICE_LOCAL: Self = Self(0b1); @@ -64,7 +64,7 @@ impl MemoryPropertyFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct MemoryHeapFlags(pub(crate) Flags); -vk_bitflags_wrapped!(MemoryHeapFlags, 0b1, Flags); +vk_bitflags_wrapped!(MemoryHeapFlags, Flags); impl MemoryHeapFlags { #[doc = "If set, heap represents device memory"] pub const DEVICE_LOCAL: Self = Self(0b1); @@ -73,7 +73,7 @@ impl MemoryHeapFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct AccessFlags(pub(crate) Flags); -vk_bitflags_wrapped!(AccessFlags, 0b1_1111_1111_1111_1111, Flags); +vk_bitflags_wrapped!(AccessFlags, Flags); impl AccessFlags { #[doc = "Controls coherency of indirect command reads"] pub const INDIRECT_COMMAND_READ: Self = Self(0b1); @@ -114,7 +114,7 @@ impl AccessFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct BufferUsageFlags(pub(crate) Flags); -vk_bitflags_wrapped!(BufferUsageFlags, 0b1_1111_1111, Flags); +vk_bitflags_wrapped!(BufferUsageFlags, Flags); impl BufferUsageFlags { #[doc = "Can be used as a source of transfer operations"] pub const TRANSFER_SRC: Self = Self(0b1); @@ -139,7 +139,7 @@ impl BufferUsageFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct BufferCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(BufferCreateFlags, 0b111, Flags); +vk_bitflags_wrapped!(BufferCreateFlags, Flags); impl BufferCreateFlags { #[doc = "Buffer should support sparse backing"] pub const SPARSE_BINDING: Self = Self(0b1); @@ -152,11 +152,7 @@ impl BufferCreateFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ShaderStageFlags(pub(crate) Flags); -vk_bitflags_wrapped!( - ShaderStageFlags, - 0b111_1111_1111_1111_1111_1111_1111_1111, - Flags -); +vk_bitflags_wrapped!(ShaderStageFlags, Flags); impl ShaderStageFlags { pub const VERTEX: Self = Self(0b1); pub const TESSELLATION_CONTROL: Self = Self(0b10); @@ -171,7 +167,7 @@ impl ShaderStageFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ImageUsageFlags(pub(crate) Flags); -vk_bitflags_wrapped!(ImageUsageFlags, 0b1111_1111, Flags); +vk_bitflags_wrapped!(ImageUsageFlags, Flags); impl ImageUsageFlags { #[doc = "Can be used as a source of transfer operations"] pub const TRANSFER_SRC: Self = Self(0b1); @@ -194,7 +190,7 @@ impl ImageUsageFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ImageCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(ImageCreateFlags, 0b1_1111, Flags); +vk_bitflags_wrapped!(ImageCreateFlags, Flags); impl ImageCreateFlags { #[doc = "Image should support sparse backing"] pub const SPARSE_BINDING: Self = Self(0b1); @@ -211,19 +207,19 @@ impl ImageCreateFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ImageViewCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(ImageViewCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(ImageViewCreateFlags, Flags); impl ImageViewCreateFlags {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct SamplerCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(SamplerCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(SamplerCreateFlags, Flags); impl SamplerCreateFlags {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineCreateFlags, 0b111, Flags); +vk_bitflags_wrapped!(PipelineCreateFlags, Flags); impl PipelineCreateFlags { pub const DISABLE_OPTIMIZATION: Self = Self(0b1); pub const ALLOW_DERIVATIVES: Self = Self(0b10); @@ -233,13 +229,13 @@ impl PipelineCreateFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineShaderStageCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineShaderStageCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(PipelineShaderStageCreateFlags, Flags); impl PipelineShaderStageCreateFlags {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ColorComponentFlags(pub(crate) Flags); -vk_bitflags_wrapped!(ColorComponentFlags, 0b1111, Flags); +vk_bitflags_wrapped!(ColorComponentFlags, Flags); impl ColorComponentFlags { pub const R: Self = Self(0b1); pub const G: Self = Self(0b10); @@ -250,7 +246,7 @@ impl ColorComponentFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct FenceCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(FenceCreateFlags, 0b1, Flags); +vk_bitflags_wrapped!(FenceCreateFlags, Flags); impl FenceCreateFlags { pub const SIGNALED: Self = Self(0b1); } @@ -258,13 +254,13 @@ impl FenceCreateFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct SemaphoreCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(SemaphoreCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(SemaphoreCreateFlags, Flags); impl SemaphoreCreateFlags {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct FormatFeatureFlags(pub(crate) Flags); -vk_bitflags_wrapped!(FormatFeatureFlags, 0b1_1111_1111_1111, Flags); +vk_bitflags_wrapped!(FormatFeatureFlags, Flags); impl FormatFeatureFlags { #[doc = "Format can be used for sampled images (SAMPLED_IMAGE and COMBINED_IMAGE_SAMPLER descriptor types)"] pub const SAMPLED_IMAGE: Self = Self(0b1); @@ -297,7 +293,7 @@ impl FormatFeatureFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct QueryControlFlags(pub(crate) Flags); -vk_bitflags_wrapped!(QueryControlFlags, 0b1, Flags); +vk_bitflags_wrapped!(QueryControlFlags, Flags); impl QueryControlFlags { #[doc = "Require precise results to be collected by the query"] pub const PRECISE: Self = Self(0b1); @@ -306,7 +302,7 @@ impl QueryControlFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct QueryResultFlags(pub(crate) Flags); -vk_bitflags_wrapped!(QueryResultFlags, 0b1111, Flags); +vk_bitflags_wrapped!(QueryResultFlags, Flags); impl QueryResultFlags { #[doc = "Results of the queries are written to the destination buffer as 64-bit values"] pub const TYPE_64: Self = Self(0b1); @@ -321,7 +317,7 @@ impl QueryResultFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct CommandBufferUsageFlags(pub(crate) Flags); -vk_bitflags_wrapped!(CommandBufferUsageFlags, 0b111, Flags); +vk_bitflags_wrapped!(CommandBufferUsageFlags, Flags); impl CommandBufferUsageFlags { pub const ONE_TIME_SUBMIT: Self = Self(0b1); pub const RENDER_PASS_CONTINUE: Self = Self(0b10); @@ -332,7 +328,7 @@ impl CommandBufferUsageFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct QueryPipelineStatisticFlags(pub(crate) Flags); -vk_bitflags_wrapped!(QueryPipelineStatisticFlags, 0b111_1111_1111, Flags); +vk_bitflags_wrapped!(QueryPipelineStatisticFlags, Flags); impl QueryPipelineStatisticFlags { #[doc = "Optional"] pub const INPUT_ASSEMBLY_VERTICES: Self = Self(0b1); @@ -361,7 +357,7 @@ impl QueryPipelineStatisticFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ImageAspectFlags(pub(crate) Flags); -vk_bitflags_wrapped!(ImageAspectFlags, 0b1111, Flags); +vk_bitflags_wrapped!(ImageAspectFlags, Flags); impl ImageAspectFlags { pub const COLOR: Self = Self(0b1); pub const DEPTH: Self = Self(0b10); @@ -372,7 +368,7 @@ impl ImageAspectFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct SparseImageFormatFlags(pub(crate) Flags); -vk_bitflags_wrapped!(SparseImageFormatFlags, 0b111, Flags); +vk_bitflags_wrapped!(SparseImageFormatFlags, Flags); impl SparseImageFormatFlags { #[doc = "Image uses a single mip tail region for all array layers"] pub const SINGLE_MIPTAIL: Self = Self(0b1); @@ -385,7 +381,7 @@ impl SparseImageFormatFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct SparseMemoryBindFlags(pub(crate) Flags); -vk_bitflags_wrapped!(SparseMemoryBindFlags, 0b1, Flags); +vk_bitflags_wrapped!(SparseMemoryBindFlags, Flags); impl SparseMemoryBindFlags { #[doc = "Operation binds resource metadata to memory"] pub const METADATA: Self = Self(0b1); @@ -394,7 +390,7 @@ impl SparseMemoryBindFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineStageFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineStageFlags, 0b1_1111_1111_1111_1111, Flags); +vk_bitflags_wrapped!(PipelineStageFlags, Flags); impl PipelineStageFlags { #[doc = "Before subsequent commands are processed"] pub const TOP_OF_PIPE: Self = Self(0b1); @@ -435,7 +431,7 @@ impl PipelineStageFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct CommandPoolCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(CommandPoolCreateFlags, 0b11, Flags); +vk_bitflags_wrapped!(CommandPoolCreateFlags, Flags); impl CommandPoolCreateFlags { #[doc = "Command buffers have a short lifetime"] pub const TRANSIENT: Self = Self(0b1); @@ -446,7 +442,7 @@ impl CommandPoolCreateFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct CommandPoolResetFlags(pub(crate) Flags); -vk_bitflags_wrapped!(CommandPoolResetFlags, 0b1, Flags); +vk_bitflags_wrapped!(CommandPoolResetFlags, Flags); impl CommandPoolResetFlags { #[doc = "Release resources owned by the pool"] pub const RELEASE_RESOURCES: Self = Self(0b1); @@ -455,7 +451,7 @@ impl CommandPoolResetFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct CommandBufferResetFlags(pub(crate) Flags); -vk_bitflags_wrapped!(CommandBufferResetFlags, 0b1, Flags); +vk_bitflags_wrapped!(CommandBufferResetFlags, Flags); impl CommandBufferResetFlags { #[doc = "Release resources owned by the buffer"] pub const RELEASE_RESOURCES: Self = Self(0b1); @@ -464,7 +460,7 @@ impl CommandBufferResetFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct SampleCountFlags(pub(crate) Flags); -vk_bitflags_wrapped!(SampleCountFlags, 0b111_1111, Flags); +vk_bitflags_wrapped!(SampleCountFlags, Flags); impl SampleCountFlags { #[doc = "Sample count 1 supported"] pub const TYPE_1: Self = Self(0b1); @@ -485,7 +481,7 @@ impl SampleCountFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct AttachmentDescriptionFlags(pub(crate) Flags); -vk_bitflags_wrapped!(AttachmentDescriptionFlags, 0b1, Flags); +vk_bitflags_wrapped!(AttachmentDescriptionFlags, Flags); impl AttachmentDescriptionFlags { #[doc = "The attachment may alias physical memory of another attachment in the same render pass"] pub const MAY_ALIAS: Self = Self(0b1); @@ -494,7 +490,7 @@ impl AttachmentDescriptionFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct StencilFaceFlags(pub(crate) Flags); -vk_bitflags_wrapped!(StencilFaceFlags, 0b11, Flags); +vk_bitflags_wrapped!(StencilFaceFlags, Flags); impl StencilFaceFlags { #[doc = "Front face"] pub const FRONT: Self = Self(0b1); @@ -509,7 +505,7 @@ impl StencilFaceFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DescriptorPoolCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(DescriptorPoolCreateFlags, 0b1, Flags); +vk_bitflags_wrapped!(DescriptorPoolCreateFlags, Flags); impl DescriptorPoolCreateFlags { #[doc = "Descriptor sets may be freed individually"] pub const FREE_DESCRIPTOR_SET: Self = Self(0b1); @@ -518,7 +514,7 @@ impl DescriptorPoolCreateFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DependencyFlags(pub(crate) Flags); -vk_bitflags_wrapped!(DependencyFlags, 0b1, Flags); +vk_bitflags_wrapped!(DependencyFlags, Flags); impl DependencyFlags { #[doc = "Dependency is per pixel region "] pub const BY_REGION: Self = Self(0b1); @@ -527,7 +523,7 @@ impl DependencyFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct SemaphoreWaitFlags(pub(crate) Flags); -vk_bitflags_wrapped!(SemaphoreWaitFlags, 0b1, Flags); +vk_bitflags_wrapped!(SemaphoreWaitFlags, Flags); impl SemaphoreWaitFlags { pub const ANY: Self = Self(0b1); } @@ -535,7 +531,7 @@ impl SemaphoreWaitFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DisplayPlaneAlphaFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(DisplayPlaneAlphaFlagsKHR, 0b1111, Flags); +vk_bitflags_wrapped!(DisplayPlaneAlphaFlagsKHR, Flags); impl DisplayPlaneAlphaFlagsKHR { pub const OPAQUE: Self = Self(0b1); pub const GLOBAL: Self = Self(0b10); @@ -546,7 +542,7 @@ impl DisplayPlaneAlphaFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct CompositeAlphaFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(CompositeAlphaFlagsKHR, 0b1111, Flags); +vk_bitflags_wrapped!(CompositeAlphaFlagsKHR, Flags); impl CompositeAlphaFlagsKHR { pub const OPAQUE: Self = Self(0b1); pub const PRE_MULTIPLIED: Self = Self(0b10); @@ -557,7 +553,7 @@ impl CompositeAlphaFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct SurfaceTransformFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(SurfaceTransformFlagsKHR, 0b1_1111_1111, Flags); +vk_bitflags_wrapped!(SurfaceTransformFlagsKHR, Flags); impl SurfaceTransformFlagsKHR { pub const IDENTITY: Self = Self(0b1); pub const ROTATE_90: Self = Self(0b10); @@ -573,7 +569,7 @@ impl SurfaceTransformFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct SwapchainImageUsageFlagsANDROID(pub(crate) Flags); -vk_bitflags_wrapped!(SwapchainImageUsageFlagsANDROID, 0b1, Flags); +vk_bitflags_wrapped!(SwapchainImageUsageFlagsANDROID, Flags); impl SwapchainImageUsageFlagsANDROID { pub const SHARED: Self = Self(0b1); } @@ -581,7 +577,7 @@ impl SwapchainImageUsageFlagsANDROID { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DebugReportFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(DebugReportFlagsEXT, 0b1_1111, Flags); +vk_bitflags_wrapped!(DebugReportFlagsEXT, Flags); impl DebugReportFlagsEXT { pub const INFORMATION: Self = Self(0b1); pub const WARNING: Self = Self(0b10); @@ -593,7 +589,7 @@ impl DebugReportFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ExternalMemoryHandleTypeFlagsNV(pub(crate) Flags); -vk_bitflags_wrapped!(ExternalMemoryHandleTypeFlagsNV, 0b1111, Flags); +vk_bitflags_wrapped!(ExternalMemoryHandleTypeFlagsNV, Flags); impl ExternalMemoryHandleTypeFlagsNV { pub const OPAQUE_WIN32: Self = Self(0b1); pub const OPAQUE_WIN32_KMT: Self = Self(0b10); @@ -604,7 +600,7 @@ impl ExternalMemoryHandleTypeFlagsNV { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ExternalMemoryFeatureFlagsNV(pub(crate) Flags); -vk_bitflags_wrapped!(ExternalMemoryFeatureFlagsNV, 0b111, Flags); +vk_bitflags_wrapped!(ExternalMemoryFeatureFlagsNV, Flags); impl ExternalMemoryFeatureFlagsNV { pub const DEDICATED_ONLY: Self = Self(0b1); pub const EXPORTABLE: Self = Self(0b10); @@ -614,7 +610,7 @@ impl ExternalMemoryFeatureFlagsNV { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct SubgroupFeatureFlags(pub(crate) Flags); -vk_bitflags_wrapped!(SubgroupFeatureFlags, 0b1111_1111, Flags); +vk_bitflags_wrapped!(SubgroupFeatureFlags, Flags); impl SubgroupFeatureFlags { #[doc = "Basic subgroup operations"] pub const BASIC: Self = Self(0b1); @@ -637,7 +633,7 @@ impl SubgroupFeatureFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct IndirectCommandsLayoutUsageFlagsNV(pub(crate) Flags); -vk_bitflags_wrapped!(IndirectCommandsLayoutUsageFlagsNV, 0b111, Flags); +vk_bitflags_wrapped!(IndirectCommandsLayoutUsageFlagsNV, Flags); impl IndirectCommandsLayoutUsageFlagsNV { pub const EXPLICIT_PREPROCESS: Self = Self(0b1); pub const INDEXED_SEQUENCES: Self = Self(0b10); @@ -647,7 +643,7 @@ impl IndirectCommandsLayoutUsageFlagsNV { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct IndirectStateFlagsNV(pub(crate) Flags); -vk_bitflags_wrapped!(IndirectStateFlagsNV, 0b1, Flags); +vk_bitflags_wrapped!(IndirectStateFlagsNV, Flags); impl IndirectStateFlagsNV { pub const FLAG_FRONTFACE: Self = Self(0b1); } @@ -655,19 +651,19 @@ impl IndirectStateFlagsNV { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PrivateDataSlotCreateFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(PrivateDataSlotCreateFlagsEXT, 0b0, Flags); +vk_bitflags_wrapped!(PrivateDataSlotCreateFlagsEXT, Flags); impl PrivateDataSlotCreateFlagsEXT {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DescriptorSetLayoutCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(DescriptorSetLayoutCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(DescriptorSetLayoutCreateFlags, Flags); impl DescriptorSetLayoutCreateFlags {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ExternalMemoryHandleTypeFlags(pub(crate) Flags); -vk_bitflags_wrapped!(ExternalMemoryHandleTypeFlags, 0b111_1111, Flags); +vk_bitflags_wrapped!(ExternalMemoryHandleTypeFlags, Flags); impl ExternalMemoryHandleTypeFlags { pub const OPAQUE_FD: Self = Self(0b1); pub const OPAQUE_WIN32: Self = Self(0b10); @@ -681,7 +677,7 @@ impl ExternalMemoryHandleTypeFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ExternalMemoryFeatureFlags(pub(crate) Flags); -vk_bitflags_wrapped!(ExternalMemoryFeatureFlags, 0b111, Flags); +vk_bitflags_wrapped!(ExternalMemoryFeatureFlags, Flags); impl ExternalMemoryFeatureFlags { pub const DEDICATED_ONLY: Self = Self(0b1); pub const EXPORTABLE: Self = Self(0b10); @@ -691,7 +687,7 @@ impl ExternalMemoryFeatureFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ExternalSemaphoreHandleTypeFlags(pub(crate) Flags); -vk_bitflags_wrapped!(ExternalSemaphoreHandleTypeFlags, 0b1_1111, Flags); +vk_bitflags_wrapped!(ExternalSemaphoreHandleTypeFlags, Flags); impl ExternalSemaphoreHandleTypeFlags { pub const OPAQUE_FD: Self = Self(0b1); pub const OPAQUE_WIN32: Self = Self(0b10); @@ -704,7 +700,7 @@ impl ExternalSemaphoreHandleTypeFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ExternalSemaphoreFeatureFlags(pub(crate) Flags); -vk_bitflags_wrapped!(ExternalSemaphoreFeatureFlags, 0b11, Flags); +vk_bitflags_wrapped!(ExternalSemaphoreFeatureFlags, Flags); impl ExternalSemaphoreFeatureFlags { pub const EXPORTABLE: Self = Self(0b1); pub const IMPORTABLE: Self = Self(0b10); @@ -713,7 +709,7 @@ impl ExternalSemaphoreFeatureFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct SemaphoreImportFlags(pub(crate) Flags); -vk_bitflags_wrapped!(SemaphoreImportFlags, 0b1, Flags); +vk_bitflags_wrapped!(SemaphoreImportFlags, Flags); impl SemaphoreImportFlags { pub const TEMPORARY: Self = Self(0b1); } @@ -721,7 +717,7 @@ impl SemaphoreImportFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ExternalFenceHandleTypeFlags(pub(crate) Flags); -vk_bitflags_wrapped!(ExternalFenceHandleTypeFlags, 0b1111, Flags); +vk_bitflags_wrapped!(ExternalFenceHandleTypeFlags, Flags); impl ExternalFenceHandleTypeFlags { pub const OPAQUE_FD: Self = Self(0b1); pub const OPAQUE_WIN32: Self = Self(0b10); @@ -732,7 +728,7 @@ impl ExternalFenceHandleTypeFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ExternalFenceFeatureFlags(pub(crate) Flags); -vk_bitflags_wrapped!(ExternalFenceFeatureFlags, 0b11, Flags); +vk_bitflags_wrapped!(ExternalFenceFeatureFlags, Flags); impl ExternalFenceFeatureFlags { pub const EXPORTABLE: Self = Self(0b1); pub const IMPORTABLE: Self = Self(0b10); @@ -741,7 +737,7 @@ impl ExternalFenceFeatureFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct FenceImportFlags(pub(crate) Flags); -vk_bitflags_wrapped!(FenceImportFlags, 0b1, Flags); +vk_bitflags_wrapped!(FenceImportFlags, Flags); impl FenceImportFlags { pub const TEMPORARY: Self = Self(0b1); } @@ -749,7 +745,7 @@ impl FenceImportFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct SurfaceCounterFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(SurfaceCounterFlagsEXT, 0b1, Flags); +vk_bitflags_wrapped!(SurfaceCounterFlagsEXT, Flags); impl SurfaceCounterFlagsEXT { pub const VBLANK: Self = Self(0b1); } @@ -757,7 +753,7 @@ impl SurfaceCounterFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PeerMemoryFeatureFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PeerMemoryFeatureFlags, 0b1111, Flags); +vk_bitflags_wrapped!(PeerMemoryFeatureFlags, Flags); impl PeerMemoryFeatureFlags { #[doc = "Can read with vkCmdCopy commands"] pub const COPY_SRC: Self = Self(0b1); @@ -772,7 +768,7 @@ impl PeerMemoryFeatureFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct MemoryAllocateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(MemoryAllocateFlags, 0b1, Flags); +vk_bitflags_wrapped!(MemoryAllocateFlags, Flags); impl MemoryAllocateFlags { #[doc = "Force allocation on specific devices"] pub const DEVICE_MASK: Self = Self(0b1); @@ -781,7 +777,7 @@ impl MemoryAllocateFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DeviceGroupPresentModeFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(DeviceGroupPresentModeFlagsKHR, 0b1111, Flags); +vk_bitflags_wrapped!(DeviceGroupPresentModeFlagsKHR, Flags); impl DeviceGroupPresentModeFlagsKHR { #[doc = "Present from local memory"] pub const LOCAL: Self = Self(0b1); @@ -796,19 +792,19 @@ impl DeviceGroupPresentModeFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct SwapchainCreateFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(SwapchainCreateFlagsKHR, 0b0, Flags); +vk_bitflags_wrapped!(SwapchainCreateFlagsKHR, Flags); impl SwapchainCreateFlagsKHR {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct SubpassDescriptionFlags(pub(crate) Flags); -vk_bitflags_wrapped!(SubpassDescriptionFlags, 0b0, Flags); +vk_bitflags_wrapped!(SubpassDescriptionFlags, Flags); impl SubpassDescriptionFlags {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DebugUtilsMessageSeverityFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(DebugUtilsMessageSeverityFlagsEXT, 0b1_0001_0001_0001, Flags); +vk_bitflags_wrapped!(DebugUtilsMessageSeverityFlagsEXT, Flags); impl DebugUtilsMessageSeverityFlagsEXT { pub const VERBOSE: Self = Self(0b1); pub const INFO: Self = Self(0b1_0000); @@ -819,7 +815,7 @@ impl DebugUtilsMessageSeverityFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DebugUtilsMessageTypeFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(DebugUtilsMessageTypeFlagsEXT, 0b111, Flags); +vk_bitflags_wrapped!(DebugUtilsMessageTypeFlagsEXT, Flags); impl DebugUtilsMessageTypeFlagsEXT { pub const GENERAL: Self = Self(0b1); pub const VALIDATION: Self = Self(0b10); @@ -829,7 +825,7 @@ impl DebugUtilsMessageTypeFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DescriptorBindingFlags(pub(crate) Flags); -vk_bitflags_wrapped!(DescriptorBindingFlags, 0b1111, Flags); +vk_bitflags_wrapped!(DescriptorBindingFlags, Flags); impl DescriptorBindingFlags { pub const UPDATE_AFTER_BIND: Self = Self(0b1); pub const UPDATE_UNUSED_WHILE_PENDING: Self = Self(0b10); @@ -840,7 +836,7 @@ impl DescriptorBindingFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ConditionalRenderingFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(ConditionalRenderingFlagsEXT, 0b1, Flags); +vk_bitflags_wrapped!(ConditionalRenderingFlagsEXT, Flags); impl ConditionalRenderingFlagsEXT { pub const INVERTED: Self = Self(0b1); } @@ -848,7 +844,7 @@ impl ConditionalRenderingFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ResolveModeFlags(pub(crate) Flags); -vk_bitflags_wrapped!(ResolveModeFlags, 0b1111, Flags); +vk_bitflags_wrapped!(ResolveModeFlags, Flags); impl ResolveModeFlags { pub const NONE: Self = Self(0); pub const SAMPLE_ZERO: Self = Self(0b1); @@ -860,7 +856,7 @@ impl ResolveModeFlags { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct GeometryInstanceFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(GeometryInstanceFlagsKHR, 0b1111, Flags); +vk_bitflags_wrapped!(GeometryInstanceFlagsKHR, Flags); impl GeometryInstanceFlagsKHR { pub const TRIANGLE_FACING_CULL_DISABLE: Self = Self(0b1); pub const TRIANGLE_FLIP_FACING: Self = Self(0b10); @@ -872,7 +868,7 @@ impl GeometryInstanceFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct GeometryFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(GeometryFlagsKHR, 0b11, Flags); +vk_bitflags_wrapped!(GeometryFlagsKHR, Flags); impl GeometryFlagsKHR { pub const OPAQUE: Self = Self(0b1); pub const NO_DUPLICATE_ANY_HIT_INVOCATION: Self = Self(0b10); @@ -881,7 +877,7 @@ impl GeometryFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct BuildAccelerationStructureFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(BuildAccelerationStructureFlagsKHR, 0b1_1111, Flags); +vk_bitflags_wrapped!(BuildAccelerationStructureFlagsKHR, Flags); impl BuildAccelerationStructureFlagsKHR { pub const ALLOW_UPDATE: Self = Self(0b1); pub const ALLOW_COMPACTION: Self = Self(0b10); @@ -893,7 +889,7 @@ impl BuildAccelerationStructureFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct AccelerationStructureCreateFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(AccelerationStructureCreateFlagsKHR, 0b1, Flags); +vk_bitflags_wrapped!(AccelerationStructureCreateFlagsKHR, Flags); impl AccelerationStructureCreateFlagsKHR { pub const DEVICE_ADDRESS_CAPTURE_REPLAY: Self = Self(0b1); } @@ -901,13 +897,13 @@ impl AccelerationStructureCreateFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct FramebufferCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(FramebufferCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(FramebufferCreateFlags, Flags); impl FramebufferCreateFlags {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DeviceDiagnosticsConfigFlagsNV(pub(crate) Flags); -vk_bitflags_wrapped!(DeviceDiagnosticsConfigFlagsNV, 0b111, Flags); +vk_bitflags_wrapped!(DeviceDiagnosticsConfigFlagsNV, Flags); impl DeviceDiagnosticsConfigFlagsNV { pub const ENABLE_SHADER_DEBUG_INFO: Self = Self(0b1); pub const ENABLE_RESOURCE_TRACKING: Self = Self(0b10); @@ -917,7 +913,7 @@ impl DeviceDiagnosticsConfigFlagsNV { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineCreationFeedbackFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineCreationFeedbackFlagsEXT, 0b111, Flags); +vk_bitflags_wrapped!(PipelineCreationFeedbackFlagsEXT, Flags); impl PipelineCreationFeedbackFlagsEXT { pub const VALID: Self = Self(0b1); pub const APPLICATION_PIPELINE_CACHE_HIT: Self = Self(0b10); @@ -927,7 +923,7 @@ impl PipelineCreationFeedbackFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PerformanceCounterDescriptionFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(PerformanceCounterDescriptionFlagsKHR, 0b11, Flags); +vk_bitflags_wrapped!(PerformanceCounterDescriptionFlagsKHR, Flags); impl PerformanceCounterDescriptionFlagsKHR { pub const PERFORMANCE_IMPACTING: Self = Self(0b1); pub const CONCURRENTLY_IMPACTED: Self = Self(0b10); @@ -936,31 +932,31 @@ impl PerformanceCounterDescriptionFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct AcquireProfilingLockFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(AcquireProfilingLockFlagsKHR, 0b0, Flags); +vk_bitflags_wrapped!(AcquireProfilingLockFlagsKHR, Flags); impl AcquireProfilingLockFlagsKHR {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ShaderCorePropertiesFlagsAMD(pub(crate) Flags); -vk_bitflags_wrapped!(ShaderCorePropertiesFlagsAMD, 0b0, Flags); +vk_bitflags_wrapped!(ShaderCorePropertiesFlagsAMD, Flags); impl ShaderCorePropertiesFlagsAMD {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ShaderModuleCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(ShaderModuleCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(ShaderModuleCreateFlags, Flags); impl ShaderModuleCreateFlags {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineCompilerControlFlagsAMD(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineCompilerControlFlagsAMD, 0b0, Flags); +vk_bitflags_wrapped!(PipelineCompilerControlFlagsAMD, Flags); impl PipelineCompilerControlFlagsAMD {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ToolPurposeFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(ToolPurposeFlagsEXT, 0b1_1111, Flags); +vk_bitflags_wrapped!(ToolPurposeFlagsEXT, Flags); impl ToolPurposeFlagsEXT { pub const VALIDATION: Self = Self(0b1); pub const PROFILING: Self = Self(0b10); @@ -972,11 +968,7 @@ impl ToolPurposeFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct AccessFlags2KHR(pub(crate) Flags64); -vk_bitflags_wrapped!( - AccessFlags2KHR, - 0b111_0000_0000_0000_0001_1111_1111_1111_1111, - Flags64 -); +vk_bitflags_wrapped!(AccessFlags2KHR, Flags64); impl AccessFlags2KHR { pub const NONE: Self = Self(0); pub const INDIRECT_COMMAND_READ: Self = Self(0b1); @@ -1004,11 +996,7 @@ impl AccessFlags2KHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineStageFlags2KHR(pub(crate) Flags64); -vk_bitflags_wrapped!( - PipelineStageFlags2KHR, - 0b111_1111_0000_0000_0000_0001_1111_1111_1111_1111, - Flags64 -); +vk_bitflags_wrapped!(PipelineStageFlags2KHR, Flags64); impl PipelineStageFlags2KHR { pub const NONE: Self = Self(0); pub const TOP_OF_PIPE: Self = Self(0b1); @@ -1043,7 +1031,7 @@ impl PipelineStageFlags2KHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct SubmitFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(SubmitFlagsKHR, 0b1, Flags); +vk_bitflags_wrapped!(SubmitFlagsKHR, Flags); impl SubmitFlagsKHR { pub const PROTECTED: Self = Self(0b1); } @@ -1051,19 +1039,19 @@ impl SubmitFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct EventCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(EventCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(EventCreateFlags, Flags); impl EventCreateFlags {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineLayoutCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineLayoutCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(PipelineLayoutCreateFlags, Flags); impl PipelineLayoutCreateFlags {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoCodecOperationFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(VideoCodecOperationFlagsKHR, 0b0, Flags); +vk_bitflags_wrapped!(VideoCodecOperationFlagsKHR, Flags); impl VideoCodecOperationFlagsKHR { pub const INVALID: Self = Self(0); } @@ -1071,7 +1059,7 @@ impl VideoCodecOperationFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoChromaSubsamplingFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(VideoChromaSubsamplingFlagsKHR, 0b1111, Flags); +vk_bitflags_wrapped!(VideoChromaSubsamplingFlagsKHR, Flags); impl VideoChromaSubsamplingFlagsKHR { pub const INVALID: Self = Self(0); pub const MONOCHROME: Self = Self(0b1); @@ -1083,7 +1071,7 @@ impl VideoChromaSubsamplingFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoComponentBitDepthFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(VideoComponentBitDepthFlagsKHR, 0b1_0101, Flags); +vk_bitflags_wrapped!(VideoComponentBitDepthFlagsKHR, Flags); impl VideoComponentBitDepthFlagsKHR { pub const INVALID: Self = Self(0); pub const TYPE_8: Self = Self(0b1); @@ -1094,7 +1082,7 @@ impl VideoComponentBitDepthFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoCapabilityFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(VideoCapabilityFlagsKHR, 0b11, Flags); +vk_bitflags_wrapped!(VideoCapabilityFlagsKHR, Flags); impl VideoCapabilityFlagsKHR { pub const PROTECTED_CONTENT: Self = Self(0b1); pub const SEPARATE_REFERENCE_IMAGES: Self = Self(0b10); @@ -1103,7 +1091,7 @@ impl VideoCapabilityFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoSessionCreateFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(VideoSessionCreateFlagsKHR, 0b1, Flags); +vk_bitflags_wrapped!(VideoSessionCreateFlagsKHR, Flags); impl VideoSessionCreateFlagsKHR { pub const DEFAULT: Self = Self(0); pub const PROTECTED_CONTENT: Self = Self(0b1); @@ -1112,7 +1100,7 @@ impl VideoSessionCreateFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoCodingQualityPresetFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(VideoCodingQualityPresetFlagsKHR, 0b111, Flags); +vk_bitflags_wrapped!(VideoCodingQualityPresetFlagsKHR, Flags); impl VideoCodingQualityPresetFlagsKHR { pub const NORMAL: Self = Self(0b1); pub const POWER: Self = Self(0b10); @@ -1122,7 +1110,7 @@ impl VideoCodingQualityPresetFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoDecodeH264PictureLayoutFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(VideoDecodeH264PictureLayoutFlagsEXT, 0b11, Flags); +vk_bitflags_wrapped!(VideoDecodeH264PictureLayoutFlagsEXT, Flags); impl VideoDecodeH264PictureLayoutFlagsEXT { pub const PROGRESSIVE: Self = Self(0); pub const INTERLACED_INTERLEAVED_LINES: Self = Self(0b1); @@ -1132,7 +1120,7 @@ impl VideoDecodeH264PictureLayoutFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoCodingControlFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(VideoCodingControlFlagsKHR, 0b1, Flags); +vk_bitflags_wrapped!(VideoCodingControlFlagsKHR, Flags); impl VideoCodingControlFlagsKHR { pub const DEFAULT: Self = Self(0); pub const RESET: Self = Self(0b1); @@ -1141,7 +1129,7 @@ impl VideoCodingControlFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoDecodeFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(VideoDecodeFlagsKHR, 0b1, Flags); +vk_bitflags_wrapped!(VideoDecodeFlagsKHR, Flags); impl VideoDecodeFlagsKHR { pub const DEFAULT: Self = Self(0); pub const RESERVED_0: Self = Self(0b1); @@ -1150,7 +1138,7 @@ impl VideoDecodeFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoEncodeFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(VideoEncodeFlagsKHR, 0b1, Flags); +vk_bitflags_wrapped!(VideoEncodeFlagsKHR, Flags); impl VideoEncodeFlagsKHR { pub const DEFAULT: Self = Self(0); pub const RESERVED_0: Self = Self(0b1); @@ -1159,7 +1147,7 @@ impl VideoEncodeFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoEncodeRateControlFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(VideoEncodeRateControlFlagsKHR, 0b1, Flags); +vk_bitflags_wrapped!(VideoEncodeRateControlFlagsKHR, Flags); impl VideoEncodeRateControlFlagsKHR { pub const DEFAULT: Self = Self(0); pub const RESET: Self = Self(0b1); @@ -1168,7 +1156,7 @@ impl VideoEncodeRateControlFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoEncodeRateControlModeFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(VideoEncodeRateControlModeFlagsKHR, 0b11, Flags); +vk_bitflags_wrapped!(VideoEncodeRateControlModeFlagsKHR, Flags); impl VideoEncodeRateControlModeFlagsKHR { pub const NONE: Self = Self(0); pub const CBR: Self = Self(1); @@ -1178,7 +1166,7 @@ impl VideoEncodeRateControlModeFlagsKHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoEncodeH264CapabilityFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(VideoEncodeH264CapabilityFlagsEXT, 0b111_1111_1111, Flags); +vk_bitflags_wrapped!(VideoEncodeH264CapabilityFlagsEXT, Flags); impl VideoEncodeH264CapabilityFlagsEXT { pub const CABAC: Self = Self(0b1); pub const CAVLC: Self = Self(0b10); @@ -1196,7 +1184,7 @@ impl VideoEncodeH264CapabilityFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoEncodeH264InputModeFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(VideoEncodeH264InputModeFlagsEXT, 0b111, Flags); +vk_bitflags_wrapped!(VideoEncodeH264InputModeFlagsEXT, Flags); impl VideoEncodeH264InputModeFlagsEXT { pub const FRAME: Self = Self(0b1); pub const SLICE: Self = Self(0b10); @@ -1206,7 +1194,7 @@ impl VideoEncodeH264InputModeFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoEncodeH264OutputModeFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(VideoEncodeH264OutputModeFlagsEXT, 0b111, Flags); +vk_bitflags_wrapped!(VideoEncodeH264OutputModeFlagsEXT, Flags); impl VideoEncodeH264OutputModeFlagsEXT { pub const FRAME: Self = Self(0b1); pub const SLICE: Self = Self(0b10); @@ -1216,7 +1204,7 @@ impl VideoEncodeH264OutputModeFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoEncodeH264CreateFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(VideoEncodeH264CreateFlagsEXT, 0b1, Flags); +vk_bitflags_wrapped!(VideoEncodeH264CreateFlagsEXT, Flags); impl VideoEncodeH264CreateFlagsEXT { pub const DEFAULT: Self = Self(0); pub const RESERVED_0: Self = Self(0b1); @@ -1225,13 +1213,13 @@ impl VideoEncodeH264CreateFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ImageFormatConstraintsFlagsFUCHSIA(pub(crate) Flags); -vk_bitflags_wrapped!(ImageFormatConstraintsFlagsFUCHSIA, 0b0, Flags); +vk_bitflags_wrapped!(ImageFormatConstraintsFlagsFUCHSIA, Flags); impl ImageFormatConstraintsFlagsFUCHSIA {} #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ImageConstraintsInfoFlagsFUCHSIA(pub(crate) Flags); -vk_bitflags_wrapped!(ImageConstraintsInfoFlagsFUCHSIA, 0b1_1111, Flags); +vk_bitflags_wrapped!(ImageConstraintsInfoFlagsFUCHSIA, Flags); impl ImageConstraintsInfoFlagsFUCHSIA { pub const CPU_READ_RARELY: Self = Self(0b1); pub const CPU_READ_OFTEN: Self = Self(0b10); @@ -1243,11 +1231,7 @@ impl ImageConstraintsInfoFlagsFUCHSIA { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct FormatFeatureFlags2KHR(pub(crate) Flags64); -vk_bitflags_wrapped!( - FormatFeatureFlags2KHR, - 0b11_1000_0000_1111_1111_1111_1111_1111_1111, - Flags64 -); +vk_bitflags_wrapped!(FormatFeatureFlags2KHR, Flags64); impl FormatFeatureFlags2KHR { pub const SAMPLED_IMAGE: Self = Self(0b1); pub const STORAGE_IMAGE: Self = Self(0b10); @@ -1286,7 +1270,7 @@ impl FormatFeatureFlags2KHR { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoEncodeH265InputModeFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(VideoEncodeH265InputModeFlagsEXT, 0b111, Flags); +vk_bitflags_wrapped!(VideoEncodeH265InputModeFlagsEXT, Flags); impl VideoEncodeH265InputModeFlagsEXT { pub const FRAME: Self = Self(0b1); pub const SLICE: Self = Self(0b10); @@ -1296,7 +1280,7 @@ impl VideoEncodeH265InputModeFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoEncodeH265OutputModeFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(VideoEncodeH265OutputModeFlagsEXT, 0b111, Flags); +vk_bitflags_wrapped!(VideoEncodeH265OutputModeFlagsEXT, Flags); impl VideoEncodeH265OutputModeFlagsEXT { pub const FRAME: Self = Self(0b1); pub const SLICE: Self = Self(0b10); @@ -1306,7 +1290,7 @@ impl VideoEncodeH265OutputModeFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoEncodeH265CtbSizeFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(VideoEncodeH265CtbSizeFlagsEXT, 0b1111, Flags); +vk_bitflags_wrapped!(VideoEncodeH265CtbSizeFlagsEXT, Flags); impl VideoEncodeH265CtbSizeFlagsEXT { pub const TYPE_8: Self = Self(0b1); pub const TYPE_16: Self = Self(0b10); @@ -1317,7 +1301,7 @@ impl VideoEncodeH265CtbSizeFlagsEXT { #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct RenderingFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(RenderingFlagsKHR, 0b111, Flags); +vk_bitflags_wrapped!(RenderingFlagsKHR, Flags); impl RenderingFlagsKHR { pub const CONTENTS_SECONDARY_COMMAND_BUFFERS: Self = Self(0b1); pub const SUSPENDING: Self = Self(0b10); diff --git a/ash/src/vk/definitions.rs b/ash/src/vk/definitions.rs index ee27c7a..a99559f 100644 --- a/ash/src/vk/definitions.rs +++ b/ash/src/vk/definitions.rs @@ -73,275 +73,267 @@ pub type DeviceAddress = u64; #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct QueryPoolCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(QueryPoolCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(QueryPoolCreateFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineDepthStencilStateCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineDepthStencilStateCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(PipelineDepthStencilStateCreateFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineDynamicStateCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineDynamicStateCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(PipelineDynamicStateCreateFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineColorBlendStateCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineColorBlendStateCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(PipelineColorBlendStateCreateFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineMultisampleStateCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineMultisampleStateCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(PipelineMultisampleStateCreateFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineRasterizationStateCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineRasterizationStateCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(PipelineRasterizationStateCreateFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineViewportStateCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineViewportStateCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(PipelineViewportStateCreateFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineTessellationStateCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineTessellationStateCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(PipelineTessellationStateCreateFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineInputAssemblyStateCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineInputAssemblyStateCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(PipelineInputAssemblyStateCreateFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineVertexInputStateCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineVertexInputStateCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(PipelineVertexInputStateCreateFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct BufferViewCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(BufferViewCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(BufferViewCreateFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct InstanceCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(InstanceCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(InstanceCreateFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DeviceCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(DeviceCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(DeviceCreateFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct MemoryMapFlags(pub(crate) Flags); -vk_bitflags_wrapped!(MemoryMapFlags, 0b0, Flags); +vk_bitflags_wrapped!(MemoryMapFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DescriptorPoolResetFlags(pub(crate) Flags); -vk_bitflags_wrapped!(DescriptorPoolResetFlags, 0b0, Flags); +vk_bitflags_wrapped!(DescriptorPoolResetFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DescriptorUpdateTemplateCreateFlags(pub(crate) Flags); -vk_bitflags_wrapped!(DescriptorUpdateTemplateCreateFlags, 0b0, Flags); +vk_bitflags_wrapped!(DescriptorUpdateTemplateCreateFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct AccelerationStructureMotionInfoFlagsNV(pub(crate) Flags); -vk_bitflags_wrapped!(AccelerationStructureMotionInfoFlagsNV, 0b0, Flags); +vk_bitflags_wrapped!(AccelerationStructureMotionInfoFlagsNV, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct AccelerationStructureMotionInstanceFlagsNV(pub(crate) Flags); -vk_bitflags_wrapped!(AccelerationStructureMotionInstanceFlagsNV, 0b0, Flags); +vk_bitflags_wrapped!(AccelerationStructureMotionInstanceFlagsNV, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DisplayModeCreateFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(DisplayModeCreateFlagsKHR, 0b0, Flags); +vk_bitflags_wrapped!(DisplayModeCreateFlagsKHR, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DisplaySurfaceCreateFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(DisplaySurfaceCreateFlagsKHR, 0b0, Flags); +vk_bitflags_wrapped!(DisplaySurfaceCreateFlagsKHR, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct AndroidSurfaceCreateFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(AndroidSurfaceCreateFlagsKHR, 0b0, Flags); +vk_bitflags_wrapped!(AndroidSurfaceCreateFlagsKHR, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ViSurfaceCreateFlagsNN(pub(crate) Flags); -vk_bitflags_wrapped!(ViSurfaceCreateFlagsNN, 0b0, Flags); +vk_bitflags_wrapped!(ViSurfaceCreateFlagsNN, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct WaylandSurfaceCreateFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(WaylandSurfaceCreateFlagsKHR, 0b0, Flags); +vk_bitflags_wrapped!(WaylandSurfaceCreateFlagsKHR, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct Win32SurfaceCreateFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(Win32SurfaceCreateFlagsKHR, 0b0, Flags); +vk_bitflags_wrapped!(Win32SurfaceCreateFlagsKHR, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct XlibSurfaceCreateFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(XlibSurfaceCreateFlagsKHR, 0b0, Flags); +vk_bitflags_wrapped!(XlibSurfaceCreateFlagsKHR, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct XcbSurfaceCreateFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(XcbSurfaceCreateFlagsKHR, 0b0, Flags); +vk_bitflags_wrapped!(XcbSurfaceCreateFlagsKHR, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DirectFBSurfaceCreateFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(DirectFBSurfaceCreateFlagsEXT, 0b0, Flags); +vk_bitflags_wrapped!(DirectFBSurfaceCreateFlagsEXT, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct IOSSurfaceCreateFlagsMVK(pub(crate) Flags); -vk_bitflags_wrapped!(IOSSurfaceCreateFlagsMVK, 0b0, Flags); +vk_bitflags_wrapped!(IOSSurfaceCreateFlagsMVK, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct MacOSSurfaceCreateFlagsMVK(pub(crate) Flags); -vk_bitflags_wrapped!(MacOSSurfaceCreateFlagsMVK, 0b0, Flags); +vk_bitflags_wrapped!(MacOSSurfaceCreateFlagsMVK, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct MetalSurfaceCreateFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(MetalSurfaceCreateFlagsEXT, 0b0, Flags); +vk_bitflags_wrapped!(MetalSurfaceCreateFlagsEXT, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ImagePipeSurfaceCreateFlagsFUCHSIA(pub(crate) Flags); -vk_bitflags_wrapped!(ImagePipeSurfaceCreateFlagsFUCHSIA, 0b0, Flags); +vk_bitflags_wrapped!(ImagePipeSurfaceCreateFlagsFUCHSIA, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct StreamDescriptorSurfaceCreateFlagsGGP(pub(crate) Flags); -vk_bitflags_wrapped!(StreamDescriptorSurfaceCreateFlagsGGP, 0b0, Flags); +vk_bitflags_wrapped!(StreamDescriptorSurfaceCreateFlagsGGP, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct HeadlessSurfaceCreateFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(HeadlessSurfaceCreateFlagsEXT, 0b0, Flags); +vk_bitflags_wrapped!(HeadlessSurfaceCreateFlagsEXT, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ScreenSurfaceCreateFlagsQNX(pub(crate) Flags); -vk_bitflags_wrapped!(ScreenSurfaceCreateFlagsQNX, 0b0, Flags); +vk_bitflags_wrapped!(ScreenSurfaceCreateFlagsQNX, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct CommandPoolTrimFlags(pub(crate) Flags); -vk_bitflags_wrapped!(CommandPoolTrimFlags, 0b0, Flags); +vk_bitflags_wrapped!(CommandPoolTrimFlags, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineViewportSwizzleStateCreateFlagsNV(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineViewportSwizzleStateCreateFlagsNV, 0b0, Flags); +vk_bitflags_wrapped!(PipelineViewportSwizzleStateCreateFlagsNV, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineDiscardRectangleStateCreateFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineDiscardRectangleStateCreateFlagsEXT, 0b0, Flags); +vk_bitflags_wrapped!(PipelineDiscardRectangleStateCreateFlagsEXT, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineCoverageToColorStateCreateFlagsNV(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineCoverageToColorStateCreateFlagsNV, 0b0, Flags); +vk_bitflags_wrapped!(PipelineCoverageToColorStateCreateFlagsNV, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineCoverageModulationStateCreateFlagsNV(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineCoverageModulationStateCreateFlagsNV, 0b0, Flags); +vk_bitflags_wrapped!(PipelineCoverageModulationStateCreateFlagsNV, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineCoverageReductionStateCreateFlagsNV(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineCoverageReductionStateCreateFlagsNV, 0b0, Flags); +vk_bitflags_wrapped!(PipelineCoverageReductionStateCreateFlagsNV, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct ValidationCacheCreateFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(ValidationCacheCreateFlagsEXT, 0b0, Flags); +vk_bitflags_wrapped!(ValidationCacheCreateFlagsEXT, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DebugUtilsMessengerCreateFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(DebugUtilsMessengerCreateFlagsEXT, 0b0, Flags); +vk_bitflags_wrapped!(DebugUtilsMessengerCreateFlagsEXT, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DebugUtilsMessengerCallbackDataFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(DebugUtilsMessengerCallbackDataFlagsEXT, 0b0, Flags); +vk_bitflags_wrapped!(DebugUtilsMessengerCallbackDataFlagsEXT, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct DeviceMemoryReportFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(DeviceMemoryReportFlagsEXT, 0b0, Flags); +vk_bitflags_wrapped!(DeviceMemoryReportFlagsEXT, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineRasterizationConservativeStateCreateFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!( - PipelineRasterizationConservativeStateCreateFlagsEXT, - 0b0, - Flags -); +vk_bitflags_wrapped!(PipelineRasterizationConservativeStateCreateFlagsEXT, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineRasterizationStateStreamCreateFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(PipelineRasterizationStateStreamCreateFlagsEXT, 0b0, Flags); +vk_bitflags_wrapped!(PipelineRasterizationStateStreamCreateFlagsEXT, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct PipelineRasterizationDepthClipStateCreateFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!( - PipelineRasterizationDepthClipStateCreateFlagsEXT, - 0b0, - Flags -); +vk_bitflags_wrapped!(PipelineRasterizationDepthClipStateCreateFlagsEXT, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoBeginCodingFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(VideoBeginCodingFlagsKHR, 0b0, Flags); +vk_bitflags_wrapped!(VideoBeginCodingFlagsKHR, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoEndCodingFlagsKHR(pub(crate) Flags); -vk_bitflags_wrapped!(VideoEndCodingFlagsKHR, 0b0, Flags); +vk_bitflags_wrapped!(VideoEndCodingFlagsKHR, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoDecodeH264CreateFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(VideoDecodeH264CreateFlagsEXT, 0b0, Flags); +vk_bitflags_wrapped!(VideoDecodeH264CreateFlagsEXT, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoDecodeH265CreateFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(VideoDecodeH265CreateFlagsEXT, 0b0, Flags); +vk_bitflags_wrapped!(VideoDecodeH265CreateFlagsEXT, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoEncodeH265CapabilityFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(VideoEncodeH265CapabilityFlagsEXT, 0b0, Flags); +vk_bitflags_wrapped!(VideoEncodeH265CapabilityFlagsEXT, Flags); #[repr(transparent)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = ""] pub struct VideoEncodeH265CreateFlagsEXT(pub(crate) Flags); -vk_bitflags_wrapped!(VideoEncodeH265CreateFlagsEXT, 0b0, Flags); +vk_bitflags_wrapped!(VideoEncodeH265CreateFlagsEXT, Flags); define_handle!( Instance, INSTANCE, diff --git a/ash/src/vk/macros.rs b/ash/src/vk/macros.rs index 1756786..b0e9a1a 100644 --- a/ash/src/vk/macros.rs +++ b/ash/src/vk/macros.rs @@ -1,6 +1,6 @@ #[macro_export] macro_rules! vk_bitflags_wrapped { - ($ name : ident , $ all : expr , $ flag_type : ty) => { + ($ name : ident , $ flag_type : ty) => { impl Default for $name { fn default() -> Self { Self(0) @@ -12,10 +12,6 @@ macro_rules! vk_bitflags_wrapped { Self(0) } #[inline] - pub const fn all() -> Self { - Self($all) - } - #[inline] pub const fn from_raw(x: $flag_type) -> Self { Self(x) } @@ -28,10 +24,6 @@ macro_rules! vk_bitflags_wrapped { self == Self::empty() } #[inline] - pub fn is_all(self) -> bool { - self & Self::all() == Self::all() - } - #[inline] pub fn intersects(self, other: Self) -> bool { self & other != Self::empty() } @@ -80,24 +72,11 @@ macro_rules! vk_bitflags_wrapped { *self = *self ^ rhs } } - impl ::std::ops::Sub for $name { - type Output = Self; - #[inline] - fn sub(self, rhs: Self) -> Self { - self & !rhs - } - } - impl ::std::ops::SubAssign for $name { - #[inline] - fn sub_assign(&mut self, rhs: Self) { - *self = *self - rhs - } - } impl ::std::ops::Not for $name { type Output = Self; #[inline] fn not(self) -> Self { - self ^ Self::all() + Self(!self.0) } } }; diff --git a/examples/src/bin/texture.rs b/examples/src/bin/texture.rs index 0377159..902be28 100644 --- a/examples/src/bin/texture.rs +++ b/examples/src/bin/texture.rs @@ -667,7 +667,10 @@ fn main() { src_alpha_blend_factor: vk::BlendFactor::ZERO, dst_alpha_blend_factor: vk::BlendFactor::ZERO, alpha_blend_op: vk::BlendOp::ADD, - color_write_mask: vk::ColorComponentFlags::all(), + color_write_mask: vk::ColorComponentFlags::R + | vk::ColorComponentFlags::G + | vk::ColorComponentFlags::B + | vk::ColorComponentFlags::A, }]; let color_blend_state = vk::PipelineColorBlendStateCreateInfo::builder() .logic_op(vk::LogicOp::CLEAR) diff --git a/examples/src/bin/triangle.rs b/examples/src/bin/triangle.rs index 9e5ed96..03488e5 100644 --- a/examples/src/bin/triangle.rs +++ b/examples/src/bin/triangle.rs @@ -324,7 +324,10 @@ fn main() { src_alpha_blend_factor: vk::BlendFactor::ZERO, dst_alpha_blend_factor: vk::BlendFactor::ZERO, alpha_blend_op: vk::BlendOp::ADD, - color_write_mask: vk::ColorComponentFlags::all(), + color_write_mask: vk::ColorComponentFlags::R + | vk::ColorComponentFlags::G + | vk::ColorComponentFlags::B + | vk::ColorComponentFlags::A, }]; let color_blend_state = vk::PipelineColorBlendStateCreateInfo::builder() .logic_op(vk::LogicOp::CLEAR) diff --git a/examples/src/lib.rs b/examples/src/lib.rs index 1c37f8b..f93e797 100644 --- a/examples/src/lib.rs +++ b/examples/src/lib.rs @@ -242,7 +242,11 @@ impl ExampleBase { | vk::DebugUtilsMessageSeverityFlagsEXT::WARNING | vk::DebugUtilsMessageSeverityFlagsEXT::INFO, ) - .message_type(vk::DebugUtilsMessageTypeFlagsEXT::all()) + .message_type( + vk::DebugUtilsMessageTypeFlagsEXT::GENERAL + | vk::DebugUtilsMessageTypeFlagsEXT::VALIDATION + | vk::DebugUtilsMessageTypeFlagsEXT::PERFORMANCE, + ) .pfn_user_callback(Some(vulkan_debug_callback)); let debug_utils_loader = DebugUtils::new(&entry, &instance); diff --git a/generator/src/lib.rs b/generator/src/lib.rs index b93869d..e9e512f 100644 --- a/generator/src/lib.rs +++ b/generator/src/lib.rs @@ -224,7 +224,7 @@ pub fn vk_bitflags_wrapped_macro() -> TokenStream { quote! { #[macro_export] macro_rules! vk_bitflags_wrapped { - ($name: ident, $all: expr, $flag_type: ty) => { + ($name: ident, $flag_type: ty) => { impl Default for $name { fn default() -> Self { @@ -238,11 +238,6 @@ pub fn vk_bitflags_wrapped_macro() -> TokenStream { Self(0) } - #[inline] - pub const fn all() -> Self { - Self($all) - } - #[inline] pub const fn from_raw(x: $flag_type) -> Self { Self(x) } @@ -254,11 +249,6 @@ pub fn vk_bitflags_wrapped_macro() -> TokenStream { self == Self::empty() } - #[inline] - pub fn is_all(self) -> bool { - self & Self::all() == Self::all() - } - #[inline] pub fn intersects(self, other: Self) -> bool { self & other != Self::empty() @@ -319,28 +309,12 @@ pub fn vk_bitflags_wrapped_macro() -> TokenStream { } } - impl ::std::ops::Sub for $name { - type Output = Self; - - #[inline] - fn sub(self, rhs: Self) -> Self { - self & !rhs - } - } - - impl ::std::ops::SubAssign for $name { - #[inline] - fn sub_assign(&mut self, rhs: Self) { - *self = *self - rhs - } - } - impl ::std::ops::Not for $name { type Output = Self; #[inline] fn not(self) -> Self { - self ^ Self::all() + Self(!self.0) } } } @@ -1359,7 +1333,7 @@ pub fn generate_bitmask( #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = #khronos_link] pub struct #ident(pub(crate) #type_); - vk_bitflags_wrapped!(#ident, 0b0, #type_); + vk_bitflags_wrapped!(#ident, #type_); }) } @@ -1538,19 +1512,12 @@ pub fn generate_enum<'a>( if clean_name.contains("Bit") { let ident = format_ident!("{}", _name.as_str()); - let all_bits = constants - .iter() - .filter_map(|constant| constant.constant(name).value()) - .fold(0, |acc, next| acc | next.bits()); let type_ = if enum_.bitwidth == Some(64u32) { quote!(Flags64) } else { quote!(Flags) }; - let bit_string = format!("{:b}", all_bits); - let bit_string = interleave_number('_', 4, &bit_string); - let all_bits_term = syn::LitInt::new(&format!("0b{}", bit_string), Span::call_site()); if !bitflags_cache.insert(ident.clone()) { EnumType::Bitflags(quote! {}) @@ -1561,7 +1528,7 @@ pub fn generate_enum<'a>( #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)] #[doc = #khronos_link] pub struct #ident(pub(crate) #type_); - vk_bitflags_wrapped!(#ident, #all_bits_term, #type_); + vk_bitflags_wrapped!(#ident, #type_); #impl_bitflags }; EnumType::Bitflags(q)