Skip to content

Commit

Permalink
Update Vulkan-Headers to 1.3.294
Browse files Browse the repository at this point in the history
  • Loading branch information
MarijnS95 committed Aug 23, 2024
1 parent 97f953a commit 5066786
Show file tree
Hide file tree
Showing 9 changed files with 759 additions and 7 deletions.
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ members = [
"generator",
"generator-rewrite",
]

[patch.crates-io]
vk-parse = { git = "https://github.com/MarijnS95/vk-parse", rev = "e39d0c7" }
151 changes: 151 additions & 0 deletions ash/src/extensions_generated.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16562,6 +16562,157 @@ pub mod khr {
crate::vk::KHR_RAY_TRACING_POSITION_FETCH_SPEC_VERSION as SPEC_VERSION,
};
}
#[doc = "VK_KHR_pipeline_binary"]
pub mod pipeline_binary {
use super::super::*;
pub use {
crate::vk::KHR_PIPELINE_BINARY_NAME as NAME,
crate::vk::KHR_PIPELINE_BINARY_SPEC_VERSION as SPEC_VERSION,
};
#[doc = "VK_KHR_pipeline_binary device-level functions"]
#[derive(Clone)]
pub struct Device {
pub(crate) fp: DeviceFn,
pub(crate) handle: crate::vk::Device,
}
impl Device {
pub fn new(instance: &crate::Instance, device: &crate::Device) -> Self {
let handle = device.handle();
let fp = DeviceFn::load(|name| unsafe {
core::mem::transmute(instance.get_device_proc_addr(handle, name.as_ptr()))
});
Self { handle, fp }
}
#[inline]
pub fn fp(&self) -> &DeviceFn {
&self.fp
}
#[inline]
pub fn device(&self) -> crate::vk::Device {
self.handle
}
}
#[derive(Clone)]
#[doc = "Raw VK_KHR_pipeline_binary device-level function pointers"]
pub struct DeviceFn {
pub create_pipeline_binaries_khr: PFN_vkCreatePipelineBinariesKHR,
pub destroy_pipeline_binary_khr: PFN_vkDestroyPipelineBinaryKHR,
pub get_pipeline_key_khr: PFN_vkGetPipelineKeyKHR,
pub get_pipeline_binary_data_khr: PFN_vkGetPipelineBinaryDataKHR,
pub release_captured_pipeline_data_khr: PFN_vkReleaseCapturedPipelineDataKHR,
}
unsafe impl Send for DeviceFn {}
unsafe impl Sync for DeviceFn {}
impl DeviceFn {
pub fn load<F: FnMut(&CStr) -> *const c_void>(mut f: F) -> Self {
Self::load_erased(&mut f)
}
fn load_erased(_f: &mut dyn FnMut(&CStr) -> *const c_void) -> Self {
Self {
create_pipeline_binaries_khr: unsafe {
unsafe extern "system" fn create_pipeline_binaries_khr(
_device: crate::vk::Device,
_p_create_info: *const PipelineBinaryCreateInfoKHR<'_>,
_p_allocator: *const AllocationCallbacks<'_>,
_p_binaries: *mut PipelineBinaryHandlesInfoKHR<'_>,
) -> Result {
panic!(concat!(
"Unable to load ",
stringify!(create_pipeline_binaries_khr)
))
}
let cname =
CStr::from_bytes_with_nul_unchecked(b"vkCreatePipelineBinariesKHR\0");
let val = _f(cname);
if val.is_null() {
create_pipeline_binaries_khr
} else {
::core::mem::transmute(val)
}
},
destroy_pipeline_binary_khr: unsafe {
unsafe extern "system" fn destroy_pipeline_binary_khr(
_device: crate::vk::Device,
_pipeline_binary: PipelineBinaryKHR,
_p_allocator: *const AllocationCallbacks<'_>,
) {
panic!(concat!(
"Unable to load ",
stringify!(destroy_pipeline_binary_khr)
))
}
let cname =
CStr::from_bytes_with_nul_unchecked(b"vkDestroyPipelineBinaryKHR\0");
let val = _f(cname);
if val.is_null() {
destroy_pipeline_binary_khr
} else {
::core::mem::transmute(val)
}
},
get_pipeline_key_khr: unsafe {
unsafe extern "system" fn get_pipeline_key_khr(
_device: crate::vk::Device,
_p_pipeline_create_info: *const PipelineCreateInfoKHR<'_>,
_p_pipeline_key: *mut PipelineBinaryKeyKHR<'_>,
) -> Result {
panic!(concat!("Unable to load ", stringify!(get_pipeline_key_khr)))
}
let cname = CStr::from_bytes_with_nul_unchecked(b"vkGetPipelineKeyKHR\0");
let val = _f(cname);
if val.is_null() {
get_pipeline_key_khr
} else {
::core::mem::transmute(val)
}
},
get_pipeline_binary_data_khr: unsafe {
unsafe extern "system" fn get_pipeline_binary_data_khr(
_device: crate::vk::Device,
_p_info: *const PipelineBinaryDataInfoKHR<'_>,
_p_pipeline_binary_key: *mut PipelineBinaryKeyKHR<'_>,
_p_pipeline_binary_data_size: *mut usize,
_p_pipeline_binary_data: *mut c_void,
) -> Result {
panic!(concat!(
"Unable to load ",
stringify!(get_pipeline_binary_data_khr)
))
}
let cname =
CStr::from_bytes_with_nul_unchecked(b"vkGetPipelineBinaryDataKHR\0");
let val = _f(cname);
if val.is_null() {
get_pipeline_binary_data_khr
} else {
::core::mem::transmute(val)
}
},
release_captured_pipeline_data_khr: unsafe {
unsafe extern "system" fn release_captured_pipeline_data_khr(
_device: crate::vk::Device,
_p_info: *const ReleaseCapturedPipelineDataInfoKHR<'_>,
_p_allocator: *const AllocationCallbacks<'_>,
) -> Result {
panic!(concat!(
"Unable to load ",
stringify!(release_captured_pipeline_data_khr)
))
}
let cname = CStr::from_bytes_with_nul_unchecked(
b"vkReleaseCapturedPipelineDataKHR\0",
);
let val = _f(cname);
if val.is_null() {
release_captured_pipeline_data_khr
} else {
::core::mem::transmute(val)
}
},
}
}
}
}
#[doc = "VK_KHR_cooperative_matrix"]
pub mod cooperative_matrix {
use super::super::*;
Expand Down
6 changes: 6 additions & 0 deletions ash/src/vk/bitflags.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1736,3 +1736,9 @@ impl ShaderCreateFlagsEXT {
pub struct MemoryUnmapFlagsKHR(pub(crate) Flags);
vk_bitflags_wrapped!(MemoryUnmapFlagsKHR, Flags);
impl MemoryUnmapFlagsKHR {}
#[repr(transparent)]
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
#[doc = "<https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VkWaylandSurfaceCreateFlagBitsKHR.html>"]
pub struct WaylandSurfaceCreateFlagsKHR(pub(crate) Flags);
vk_bitflags_wrapped!(WaylandSurfaceCreateFlagsKHR, Flags);
impl WaylandSurfaceCreateFlagsKHR {}
19 changes: 19 additions & 0 deletions ash/src/vk/const_debugs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3868,6 +3868,7 @@ impl fmt::Debug for PipelineCreateFlags2KHR {
PipelineCreateFlags2KHR::DESCRIPTOR_BUFFER_EXT.0,
"DESCRIPTOR_BUFFER_EXT",
),
(PipelineCreateFlags2KHR::CAPTURE_DATA.0, "CAPTURE_DATA"),
];
debug_flags(f, KNOWN, self.0)
}
Expand Down Expand Up @@ -6492,6 +6493,24 @@ impl fmt::Debug for StructureType {
Some("PHYSICAL_DEVICE_SHADER_OBJECT_PROPERTIES_EXT")
}
Self::SHADER_CREATE_INFO_EXT => Some("SHADER_CREATE_INFO_EXT"),
Self::PHYSICAL_DEVICE_PIPELINE_BINARY_FEATURES_KHR => {
Some("PHYSICAL_DEVICE_PIPELINE_BINARY_FEATURES_KHR")
}
Self::PIPELINE_BINARY_CREATE_INFO_KHR => Some("PIPELINE_BINARY_CREATE_INFO_KHR"),
Self::PIPELINE_BINARY_INFO_KHR => Some("PIPELINE_BINARY_INFO_KHR"),
Self::PIPELINE_BINARY_KEY_KHR => Some("PIPELINE_BINARY_KEY_KHR"),
Self::PHYSICAL_DEVICE_PIPELINE_BINARY_PROPERTIES_KHR => {
Some("PHYSICAL_DEVICE_PIPELINE_BINARY_PROPERTIES_KHR")
}
Self::RELEASE_CAPTURED_PIPELINE_DATA_INFO_KHR => {
Some("RELEASE_CAPTURED_PIPELINE_DATA_INFO_KHR")
}
Self::PIPELINE_BINARY_DATA_INFO_KHR => Some("PIPELINE_BINARY_DATA_INFO_KHR"),
Self::PIPELINE_CREATE_INFO_KHR => Some("PIPELINE_CREATE_INFO_KHR"),
Self::DEVICE_PIPELINE_BINARY_INTERNAL_CACHE_CONTROL_KHR => {
Some("DEVICE_PIPELINE_BINARY_INTERNAL_CACHE_CONTROL_KHR")
}
Self::PIPELINE_BINARY_HANDLES_INFO_KHR => Some("PIPELINE_BINARY_HANDLES_INFO_KHR"),
Self::PHYSICAL_DEVICE_TILE_PROPERTIES_FEATURES_QCOM => {
Some("PHYSICAL_DEVICE_TILE_PROPERTIES_FEATURES_QCOM")
}
Expand Down
1 change: 1 addition & 0 deletions ash/src/vk/constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ pub const MAX_DRIVER_INFO_SIZE: usize = 256;
pub const SHADER_UNUSED_KHR: u32 = !0;
pub const MAX_GLOBAL_PRIORITY_SIZE_KHR: usize = 16;
pub const MAX_SHADER_MODULE_IDENTIFIER_SIZE_EXT: usize = 32;
pub const MAX_PIPELINE_BINARY_KEY_SIZE_KHR: usize = 32;
pub const MAX_VIDEO_AV1_REFERENCES_PER_FRAME_KHR: usize = 7;
pub const SHADER_INDEX_UNUSED_AMDX: u32 = !0;
pub const SHADER_UNUSED_NV: u32 = SHADER_UNUSED_KHR;
Loading

0 comments on commit 5066786

Please sign in to comment.