diff --git a/ash/src/vk.rs b/ash/src/vk.rs index e76cf87..cba491d 100644 --- a/ash/src/vk.rs +++ b/ash/src/vk.rs @@ -5008,8 +5008,8 @@ pub struct PhysicalDeviceProperties { pub vendor_id: uint32_t, pub device_id: uint32_t, pub device_type: PhysicalDeviceType, - pub device_name: [c_char; VK_MAX_PHYSICAL_DEVICE_NAME_SIZE], - pub pipeline_cache_uuid: [uint8_t; VK_UUID_SIZE], + pub device_name: [c_char; MAX_PHYSICAL_DEVICE_NAME_SIZE], + pub pipeline_cache_uuid: [uint8_t; UUID_SIZE], pub limits: PhysicalDeviceLimits, pub sparse_properties: PhysicalDeviceSparseProperties, } @@ -5050,7 +5050,7 @@ impl ::std::default::Default for PhysicalDeviceProperties { #[repr(C)] #[derive(Copy, Clone)] pub struct ExtensionProperties { - pub extension_name: [c_char; VK_MAX_EXTENSION_NAME_SIZE], + pub extension_name: [c_char; MAX_EXTENSION_NAME_SIZE], pub spec_version: uint32_t, } impl ::std::fmt::Debug for ExtensionProperties { @@ -5074,10 +5074,10 @@ impl ::std::default::Default for ExtensionProperties { #[repr(C)] #[derive(Copy, Clone)] pub struct LayerProperties { - pub layer_name: [c_char; VK_MAX_EXTENSION_NAME_SIZE], + pub layer_name: [c_char; MAX_EXTENSION_NAME_SIZE], pub spec_version: uint32_t, pub implementation_version: uint32_t, - pub description: [c_char; VK_MAX_DESCRIPTION_SIZE], + pub description: [c_char; MAX_DESCRIPTION_SIZE], } impl ::std::fmt::Debug for LayerProperties { fn fmt(&self, fmt: &mut ::std::fmt::Formatter) -> ::std::result::Result<(), ::std::fmt::Error> { @@ -5254,9 +5254,9 @@ pub struct QueueFamilyProperties { #[derive(Copy, Clone)] pub struct PhysicalDeviceMemoryProperties { pub memory_type_count: uint32_t, - pub memory_types: [MemoryType; VK_MAX_MEMORY_TYPES], + pub memory_types: [MemoryType; MAX_MEMORY_TYPES], pub memory_heap_count: uint32_t, - pub memory_heaps: [MemoryHeap; VK_MAX_MEMORY_HEAPS], + pub memory_heaps: [MemoryHeap; MAX_MEMORY_HEAPS], } impl ::std::fmt::Debug for PhysicalDeviceMemoryProperties { fn fmt(&self, fmt: &mut ::std::fmt::Formatter) -> ::std::result::Result<(), ::std::fmt::Error> { @@ -8642,9 +8642,9 @@ pub struct ExternalBufferPropertiesKHR {} pub struct PhysicalDeviceIDProperties { pub s_type: StructureType, pub p_next: *mut c_void, - pub device_uuid: [uint8_t; VK_UUID_SIZE], - pub driver_uuid: [uint8_t; VK_UUID_SIZE], - pub device_luid: [uint8_t; VK_LUID_SIZE], + pub device_uuid: [uint8_t; UUID_SIZE], + pub driver_uuid: [uint8_t; UUID_SIZE], + pub device_luid: [uint8_t; LUID_SIZE], pub device_node_mask: uint32_t, pub device_luid_valid: Bool32, } @@ -9421,7 +9421,7 @@ pub struct PhysicalDeviceGroupProperties { pub s_type: StructureType, pub p_next: *mut c_void, pub physical_device_count: uint32_t, - pub physical_devices: [PhysicalDevice; VK_MAX_DEVICE_GROUP_SIZE], + pub physical_devices: [PhysicalDevice; MAX_DEVICE_GROUP_SIZE], pub subset_allocation: Bool32, } impl ::std::fmt::Debug for PhysicalDeviceGroupProperties { @@ -9661,7 +9661,7 @@ pub struct DeviceGroupBindSparseInfoKHR {} pub struct DeviceGroupPresentCapabilitiesKHR { pub s_type: StructureType, pub p_next: *const c_void, - pub present_mask: [uint32_t; VK_MAX_DEVICE_GROUP_SIZE], + pub present_mask: [uint32_t; MAX_DEVICE_GROUP_SIZE], pub modes: DeviceGroupPresentModeFlagsKHR, } impl ::std::fmt::Debug for DeviceGroupPresentCapabilitiesKHR { diff --git a/examples/src/bin/texture.rs b/examples/src/bin/texture.rs index bce408c..e089bc0 100644 --- a/examples/src/bin/texture.rs +++ b/examples/src/bin/texture.rs @@ -67,7 +67,7 @@ fn main() { }; let dependency = vk::SubpassDependency { dependency_flags: Default::default(), - src_subpass: vk::VK_SUBPASS_EXTERNAL, + src_subpass: vk::SUBPASS_EXTERNAL, dst_subpass: Default::default(), src_stage_mask: vk::PipelineStageFlags::COLOR_ATTACHMENT_OUTPUT, src_access_mask: Default::default(), @@ -418,8 +418,8 @@ fn main() { dst_access_mask: vk::AccessFlags::TRANSFER_WRITE, old_layout: vk::ImageLayout::UNDEFINED, new_layout: vk::ImageLayout::TRANSFER_DST_OPTIMAL, - src_queue_family_index: vk::VK_QUEUE_FAMILY_IGNORED, - dst_queue_family_index: vk::VK_QUEUE_FAMILY_IGNORED, + src_queue_family_index: vk::QUEUE_FAMILY_IGNORED, + dst_queue_family_index: vk::QUEUE_FAMILY_IGNORED, image: texture_image, subresource_range: vk::ImageSubresourceRange { aspect_mask: vk::ImageAspectFlags::COLOR, @@ -470,8 +470,8 @@ fn main() { dst_access_mask: vk::AccessFlags::SHADER_READ, old_layout: vk::ImageLayout::TRANSFER_DST_OPTIMAL, new_layout: vk::ImageLayout::SHADER_READ_ONLY_OPTIMAL, - src_queue_family_index: vk::VK_QUEUE_FAMILY_IGNORED, - dst_queue_family_index: vk::VK_QUEUE_FAMILY_IGNORED, + src_queue_family_index: vk::QUEUE_FAMILY_IGNORED, + dst_queue_family_index: vk::QUEUE_FAMILY_IGNORED, image: texture_image, subresource_range: vk::ImageSubresourceRange { aspect_mask: vk::ImageAspectFlags::COLOR, diff --git a/examples/src/bin/triangle.rs b/examples/src/bin/triangle.rs index d84d142..12a3b85 100644 --- a/examples/src/bin/triangle.rs +++ b/examples/src/bin/triangle.rs @@ -57,7 +57,7 @@ fn main() { }; let dependency = vk::SubpassDependency { dependency_flags: Default::default(), - src_subpass: vk::VK_SUBPASS_EXTERNAL, + src_subpass: vk::SUBPASS_EXTERNAL, dst_subpass: Default::default(), src_stage_mask: vk::PipelineStageFlags::COLOR_ATTACHMENT_OUTPUT, src_access_mask: Default::default(), diff --git a/examples/src/lib.rs b/examples/src/lib.rs index 9cee8eb..e0df121 100644 --- a/examples/src/lib.rs +++ b/examples/src/lib.rs @@ -559,8 +559,8 @@ impl ExampleBase { | vk::AccessFlags::DEPTH_STENCIL_ATTACHMENT_WRITE, old_layout: vk::ImageLayout::UNDEFINED, new_layout: vk::ImageLayout::DEPTH_STENCIL_ATTACHMENT_OPTIMAL, - src_queue_family_index: vk::VK_QUEUE_FAMILY_IGNORED, - dst_queue_family_index: vk::VK_QUEUE_FAMILY_IGNORED, + src_queue_family_index: vk::QUEUE_FAMILY_IGNORED, + dst_queue_family_index: vk::QUEUE_FAMILY_IGNORED, image: depth_image, subresource_range: vk::ImageSubresourceRange { aspect_mask: vk::ImageAspectFlags::DEPTH, diff --git a/generator/src/lib.rs b/generator/src/lib.rs index 40996d9..a071bf9 100644 --- a/generator/src/lib.rs +++ b/generator/src/lib.rs @@ -637,7 +637,10 @@ impl FieldExt for vkxml::Field { .as_ref() .or_else(|| self.size_enumref.as_ref()) .expect("Should have size"); - let size = Term::intern(size); + // Make sure we also rename the constant, that is + // used inside the static array + let size = constant_name(size); + let size = Term::intern(&size); Some(quote!{ [#ty; #size] }) @@ -1393,13 +1396,17 @@ pub fn generate_feature(feature: &vkxml::Feature, commands: &CommandMap) -> quot #device } } +pub fn constant_name(name: &str) -> String { + name.replace("VK_", "") +} + pub fn generate_constant<'a>( constant: &'a vkxml::Constant, cache: &mut HashSet<&'a str>, ) -> Tokens { cache.insert(constant.name.as_str()); let c = Constant::from_constant(constant); - let name =constant.name.replace("VK_", ""); + let name = constant_name(&constant.name); let ident = Ident::from(name.as_str()); let value = c.to_tokens(); let ty = c.ty().to_tokens();