Skip to content

Commit

Permalink
Update Vulkan-Headers to 1.2.174 (#429)
Browse files Browse the repository at this point in the history
* 1.2.171 new types

* generator: Keep platform_types checked in to git only

This static content is better kept in the platform_types.rs file only,
where it can be edited directly.

(Perhaps we should be more clear about generated versus manual files
 within the ash crate, by storing generated outputs in an auto/
 module/subdirectory that is reexported, like glib and friends?)

* Update Vulkan-Headers to 12.171

* Update Vulkan-Headers to 12.172

* Update Vulkan-Headers to 12.173

* Update Vulkan-Headers to 12.174

* generator: Generalize C number parsing

Co-authored-by: [email protected] <[email protected]>
  • Loading branch information
MarijnS95 and lothran authored May 10, 2021
1 parent 28b6253 commit 498b8d8
Show file tree
Hide file tree
Showing 7 changed files with 1,004 additions and 126 deletions.
40 changes: 35 additions & 5 deletions ash/src/vk/const_debugs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,6 @@ impl fmt::Debug for AccessFlags {
(AccessFlags::HOST_WRITE.0, "HOST_WRITE"),
(AccessFlags::MEMORY_READ.0, "MEMORY_READ"),
(AccessFlags::MEMORY_WRITE.0, "MEMORY_WRITE"),
(AccessFlags::RESERVED_30_KHR.0, "RESERVED_30_KHR"),
(AccessFlags::RESERVED_28_KHR.0, "RESERVED_28_KHR"),
(AccessFlags::RESERVED_29_KHR.0, "RESERVED_29_KHR"),
(
AccessFlags::TRANSFORM_FEEDBACK_WRITE_EXT.0,
"TRANSFORM_FEEDBACK_WRITE_EXT",
Expand Down Expand Up @@ -249,6 +246,10 @@ impl fmt::Debug for AccessFlags2KHR {
AccessFlags2KHR::SHADER_STORAGE_WRITE.0,
"SHADER_STORAGE_WRITE",
),
(AccessFlags2KHR::RESERVED_READ_35.0, "RESERVED_READ_35"),
(AccessFlags2KHR::RESERVED_WRITE_36.0, "RESERVED_WRITE_36"),
(AccessFlags2KHR::RESERVED_READ_37.0, "RESERVED_READ_37"),
(AccessFlags2KHR::RESERVED_WRITE_38.0, "RESERVED_WRITE_38"),
(
AccessFlags2KHR::TRANSFORM_FEEDBACK_WRITE_EXT.0,
"TRANSFORM_FEEDBACK_WRITE_EXT",
Expand Down Expand Up @@ -1430,6 +1431,10 @@ impl fmt::Debug for ExternalMemoryHandleTypeFlags {
ExternalMemoryHandleTypeFlags::HOST_MAPPED_FOREIGN_MEMORY_EXT.0,
"HOST_MAPPED_FOREIGN_MEMORY_EXT",
),
(
ExternalMemoryHandleTypeFlags::ZIRCON_VMO_FUCHSIA.0,
"ZIRCON_VMO_FUCHSIA",
),
];
debug_flags(f, KNOWN, self.0)
}
Expand Down Expand Up @@ -1483,6 +1488,10 @@ impl fmt::Debug for ExternalSemaphoreHandleTypeFlags {
"D3D12_FENCE",
),
(ExternalSemaphoreHandleTypeFlags::SYNC_FD.0, "SYNC_FD"),
(
ExternalSemaphoreHandleTypeFlags::ZIRCON_EVENT_FUCHSIA.0,
"ZIRCON_EVENT_FUCHSIA",
),
(
ExternalSemaphoreHandleTypeFlags::RESERVED_5_NV.0,
"RESERVED_5_NV",
Expand Down Expand Up @@ -2895,8 +2904,6 @@ impl fmt::Debug for PipelineStageFlags {
(PipelineStageFlags::HOST.0, "HOST"),
(PipelineStageFlags::ALL_GRAPHICS.0, "ALL_GRAPHICS"),
(PipelineStageFlags::ALL_COMMANDS.0, "ALL_COMMANDS"),
(PipelineStageFlags::RESERVED_27_KHR.0, "RESERVED_27_KHR"),
(PipelineStageFlags::RESERVED_26_KHR.0, "RESERVED_26_KHR"),
(
PipelineStageFlags::TRANSFORM_FEEDBACK_EXT.0,
"TRANSFORM_FEEDBACK_EXT",
Expand Down Expand Up @@ -2981,6 +2988,8 @@ impl fmt::Debug for PipelineStageFlags2KHR {
PipelineStageFlags2KHR::PRE_RASTERIZATION_SHADERS.0,
"PRE_RASTERIZATION_SHADERS",
),
(PipelineStageFlags2KHR::RESERVED_26.0, "RESERVED_26"),
(PipelineStageFlags2KHR::RESERVED_27.0, "RESERVED_27"),
(
PipelineStageFlags2KHR::TRANSFORM_FEEDBACK_EXT.0,
"TRANSFORM_FEEDBACK_EXT",
Expand Down Expand Up @@ -3487,6 +3496,12 @@ impl fmt::Debug for ScopeNV {
}
}
}
impl fmt::Debug for ScreenSurfaceCreateFlagsQNX {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
const KNOWN: &[(Flags, &str)] = &[];
debug_flags(f, KNOWN, self.0)
}
}
impl fmt::Debug for SemaphoreCreateFlags {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
const KNOWN: &[(Flags, &str)] = &[];
Expand Down Expand Up @@ -4522,6 +4537,21 @@ impl fmt::Debug for StructureType {
Self::MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE => {
Some("MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_VALVE")
}
Self::IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA => {
Some("IMPORT_MEMORY_ZIRCON_HANDLE_INFO_FUCHSIA")
}
Self::MEMORY_ZIRCON_HANDLE_PROPERTIES_FUCHSIA => {
Some("MEMORY_ZIRCON_HANDLE_PROPERTIES_FUCHSIA")
}
Self::MEMORY_GET_ZIRCON_HANDLE_INFO_FUCHSIA => {
Some("MEMORY_GET_ZIRCON_HANDLE_INFO_FUCHSIA")
}
Self::IMPORT_SEMAPHORE_ZIRCON_HANDLE_INFO_FUCHSIA => {
Some("IMPORT_SEMAPHORE_ZIRCON_HANDLE_INFO_FUCHSIA")
}
Self::SEMAPHORE_GET_ZIRCON_HANDLE_INFO_FUCHSIA => {
Some("SEMAPHORE_GET_ZIRCON_HANDLE_INFO_FUCHSIA")
}
Self::SCREEN_SURFACE_CREATE_INFO_QNX => Some("SCREEN_SURFACE_CREATE_INFO_QNX"),
Self::PHYSICAL_DEVICE_SUBGROUP_PROPERTIES => {
Some("PHYSICAL_DEVICE_SUBGROUP_PROPERTIES")
Expand Down
4 changes: 2 additions & 2 deletions ash/src/vk/constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ pub const ATTACHMENT_UNUSED: u32 = !0;
pub const TRUE: Bool32 = 1;
pub const FALSE: Bool32 = 0;
pub const QUEUE_FAMILY_IGNORED: u32 = !0;
pub const QUEUE_FAMILY_EXTERNAL: u32 = !0 - 1;
pub const QUEUE_FAMILY_FOREIGN_EXT: u32 = !0 - 2;
pub const QUEUE_FAMILY_EXTERNAL: u32 = !1;
pub const QUEUE_FAMILY_FOREIGN_EXT: u32 = !2;
pub const SUBPASS_EXTERNAL: u32 = !0;
pub const MAX_DEVICE_GROUP_SIZE: usize = 32;
pub const MAX_DRIVER_NAME_SIZE: usize = 256;
Expand Down
Loading

0 comments on commit 498b8d8

Please sign in to comment.