Manual fixups

ash-rs · Aug 28, 2023 · bf94149 · bf94149
1 parent cc1c114
commit bf94149
Show file tree

Hide file tree

Showing 77 changed files with 225 additions and 241 deletions.
diff --git a/ash/src/extensions/amd/buffer_marker.rs b/ash/src/extensions/amd/buffer_marker.rs
@@ -3,6 +3,8 @@ use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::amd_buffer_marker::NAME;
+
 /// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_AMD_buffer_marker.html>
 #[derive(Clone)]
 pub struct BufferMarker {
@@ -36,8 +38,6 @@ impl BufferMarker {
         )
     }
 
-    pub const NAME: &'static CStr = vk::amd_buffer_marker::DeviceFn::NAME;
-
     #[inline]
     pub fn fp(&self) -> &vk::amd_buffer_marker::DeviceFn {
         &self.fp

diff --git a/ash/src/extensions/amd/shader_info.rs b/ash/src/extensions/amd/shader_info.rs
@@ -4,6 +4,8 @@ use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::amd_shader_info::NAME;
+
 /// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_AMD_shader_info.html>
 #[derive(Clone)]
 pub struct ShaderInfo {
@@ -64,8 +66,6 @@ impl ShaderInfo {
         }
     }
 
-    pub const NAME: &'static CStr = vk::amd_shader_info::DeviceFn::NAME;
-
     #[inline]
     pub fn fp(&self) -> &vk::amd_shader_info::DeviceFn {
         &self.fp

diff --git a/ash/src/extensions/amdx/shader_enqueue.rs b/ash/src/extensions/amdx/shader_enqueue.rs
@@ -5,6 +5,8 @@ use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::amdx_shader_enqueue::NAME;
+
 /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_AMDX_shader_enqueue.html>
 #[derive(Clone)]
 pub struct ShaderEnqueue {
@@ -116,8 +118,6 @@ impl ShaderEnqueue {
         (self.fp.cmd_dispatch_graph_indirect_count_amdx)(command_buffer, scratch, count_info)
     }
 
-    pub const NAME: &'static CStr = vk::amdx_shader_enqueue::DeviceFn::NAME;
-
     #[inline]
     pub fn fp(&self) -> &vk::amdx_shader_enqueue::DeviceFn {
         &self.fp

diff --git a/ash/src/extensions/android/external_memory_android_hardware_buffer.rs b/ash/src/extensions/android/external_memory_android_hardware_buffer.rs
@@ -4,6 +4,8 @@ use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::android_external_memory_android_hardware_buffer::NAME;
+
 /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_ANDROID_external_memory_android_hardware_buffer.html>
 #[derive(Clone)]
 pub struct ExternalMemoryAndroidHardwareBuffer {
@@ -43,9 +45,6 @@ impl ExternalMemoryAndroidHardwareBuffer {
             .result_with_success(buffer)
     }
 
-    pub const NAME: &'static CStr =
-        vk::android_external_memory_android_hardware_buffer::DeviceFn::NAME;
-
     #[inline]
     pub fn fp(&self) -> &vk::android_external_memory_android_hardware_buffer::DeviceFn {
         &self.fp

diff --git a/ash/src/extensions/ext/acquire_drm_display.rs b/ash/src/extensions/ext/acquire_drm_display.rs
@@ -4,16 +4,18 @@ use crate::{Entry, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::ext_acquire_drm_display::NAME;
+
 /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_EXT_acquire_drm_display.html>
 #[derive(Clone)]
 pub struct AcquireDrmDisplay {
-    fp: vk::ext_acquire_drm_display::DeviceFn,
+    fp: vk::ext_acquire_drm_display::InstanceFn,
 }
 
 impl AcquireDrmDisplay {
     pub fn new(entry: &Entry, instance: &Instance) -> Self {
         let handle = instance.handle();
-        let fp = vk::ext_acquire_drm_display::DeviceFn::load(|name| unsafe {
+        let fp = vk::ext_acquire_drm_display::InstanceFn::load(|name| unsafe {
             mem::transmute(entry.get_instance_proc_addr(handle, name.as_ptr()))
         });
         Self { fp }
@@ -43,10 +45,8 @@ impl AcquireDrmDisplay {
             .assume_init_on_success(display)
     }
 
-    pub const NAME: &'static CStr = vk::ext_acquire_drm_display::DeviceFn::NAME;
-
     #[inline]
-    pub fn fp(&self) -> &vk::ext_acquire_drm_display::DeviceFn {
+    pub fn fp(&self) -> &vk::ext_acquire_drm_display::InstanceFn {
         &self.fp
     }
 }
diff --git a/ash/src/extensions/ext/buffer_device_address.rs b/ash/src/extensions/ext/buffer_device_address.rs
@@ -3,6 +3,9 @@ use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::ext_buffer_device_address::NAME;
+
+/// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_KHR_buffer_device_address.html>
 #[derive(Clone)]
 pub struct BufferDeviceAddress {
     handle: vk::Device,
@@ -27,8 +30,6 @@ impl BufferDeviceAddress {
         (self.fp.get_buffer_device_address_ext)(self.handle, info)
     }
 
-    pub const NAME: &'static CStr = vk::ext_buffer_device_address::DeviceFn::NAME;
-
     #[inline]
     pub fn fp(&self) -> &vk::ext_buffer_device_address::DeviceFn {
         &self.fp

diff --git a/ash/src/extensions/ext/calibrated_timestamps.rs b/ash/src/extensions/ext/calibrated_timestamps.rs
@@ -4,7 +4,7 @@ use crate::{Device, Entry, Instance};
 use std::ffi::CStr;
 use std::mem;
 
-pub const NAME: &CStr = vk::ext_calibrated_timestamps::InstanceFn::NAME;
+pub const NAME: &CStr = vk::ext_calibrated_timestamps::NAME;
 
 /// High-level device function wrapper for
 /// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_calibrated_timestamps.html>

diff --git a/ash/src/extensions/ext/debug_marker.rs b/ash/src/extensions/ext/debug_marker.rs
@@ -4,6 +4,8 @@ use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::ext_debug_marker::NAME;
+
 #[derive(Clone)]
 pub struct DebugMarker {
     handle: vk::Device,
@@ -54,8 +56,6 @@ impl DebugMarker {
         (self.fp.cmd_debug_marker_insert_ext)(command_buffer, marker_info);
     }
 
-    pub const NAME: &'static CStr = vk::ext_debug_marker::DeviceFn::NAME;
-
     #[inline]
     pub fn fp(&self) -> &vk::ext_debug_marker::DeviceFn {
         &self.fp

diff --git a/ash/src/extensions/ext/debug_report.rs b/ash/src/extensions/ext/debug_report.rs
@@ -5,16 +5,19 @@ use crate::{Entry, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::ext_debug_report::NAME;
+
+/// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_debug_report.html>
 #[derive(Clone)]
 pub struct DebugReport {
     handle: vk::Instance,
-    fp: vk::ext_debug_report::DeviceFn,
+    fp: vk::ext_debug_report::InstanceFn,
 }
 
 impl DebugReport {
     pub fn new(entry: &Entry, instance: &Instance) -> Self {
         let handle = instance.handle();
-        let fp = vk::ext_debug_report::DeviceFn::load(|name| unsafe {
+        let fp = vk::ext_debug_report::InstanceFn::load(|name| unsafe {
             mem::transmute(entry.get_instance_proc_addr(handle, name.as_ptr()))
         });
         Self { handle, fp }
@@ -51,10 +54,8 @@ impl DebugReport {
         .result_with_success(debug_cb)
     }
 
-    pub const NAME: &'static CStr = vk::ext_debug_report::DeviceFn::NAME;
-
     #[inline]
-    pub fn fp(&self) -> &vk::ext_debug_report::DeviceFn {
+    pub fn fp(&self) -> &vk::ext_debug_report::InstanceFn {
         &self.fp
     }
 

diff --git a/ash/src/extensions/ext/debug_utils.rs b/ash/src/extensions/ext/debug_utils.rs
@@ -165,7 +165,7 @@ impl DebugUtilsInstance {
     }
 
     #[inline]
-    pub fn fp(&self) -> &vk::ext_debug_utils::DeviceFn {
+    pub fn fp(&self) -> &vk::ext_debug_utils::InstanceFn {
         &self.fp
     }
 

diff --git a/ash/src/extensions/ext/descriptor_buffer.rs b/ash/src/extensions/ext/descriptor_buffer.rs
@@ -4,6 +4,8 @@ use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::ext_descriptor_buffer::NAME;
+
 /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_EXT_descriptor_buffer.html>
 #[derive(Clone)]
 pub struct DescriptorBuffer {
@@ -194,8 +196,6 @@ impl DescriptorBuffer {
         .result()
     }
 
-    pub const NAME: &'static CStr = vk::ext_descriptor_buffer::DeviceFn::NAME;
-
     #[inline]
     pub fn fp(&self) -> &vk::ext_descriptor_buffer::DeviceFn {
         &self.fp

diff --git a/ash/src/extensions/ext/extended_dynamic_state.rs b/ash/src/extensions/ext/extended_dynamic_state.rs
@@ -4,6 +4,8 @@ use std::ffi::CStr;
 use std::mem;
 use std::ptr;
 
+pub const NAME: &CStr = vk::ext_extended_dynamic_state::NAME;
+
 #[derive(Clone)]
 pub struct ExtendedDynamicState {
     fp: vk::ext_extended_dynamic_state::DeviceFn,
@@ -184,8 +186,6 @@ impl ExtendedDynamicState {
         )
     }
 
-    pub const NAME: &'static CStr = vk::ext_extended_dynamic_state::DeviceFn::NAME;
-
     #[inline]
     pub fn fp(&self) -> &vk::ext_extended_dynamic_state::DeviceFn {
         &self.fp

diff --git a/ash/src/extensions/ext/extended_dynamic_state2.rs b/ash/src/extensions/ext/extended_dynamic_state2.rs
@@ -3,6 +3,8 @@ use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::ext_extended_dynamic_state2::NAME;
+
 /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_EXT_extended_dynamic_state2.html>
 #[derive(Clone)]
 pub struct ExtendedDynamicState2 {
@@ -73,8 +75,6 @@ impl ExtendedDynamicState2 {
         )
     }
 
-    pub const NAME: &'static CStr = vk::ext_extended_dynamic_state2::DeviceFn::NAME;
-
     #[inline]
     pub fn fp(&self) -> &vk::ext_extended_dynamic_state2::DeviceFn {
         &self.fp

diff --git a/ash/src/extensions/ext/extended_dynamic_state3.rs b/ash/src/extensions/ext/extended_dynamic_state3.rs
@@ -3,6 +3,8 @@ use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::ext_extended_dynamic_state3::NAME;
+
 /// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_extended_dynamic_state3.html>
 #[derive(Clone)]
 pub struct ExtendedDynamicState3 {
@@ -396,9 +398,6 @@ impl ExtendedDynamicState3 {
     ) {
         (self.fp.cmd_set_coverage_reduction_mode_nv)(command_buffer, coverage_reduction_mode)
     }
-
-    pub const NAME: &'static CStr = vk::ext_extended_dynamic_state3::DeviceFn::NAME;
-
     #[inline]
     pub fn fp(&self) -> &vk::ext_extended_dynamic_state3::DeviceFn {
         &self.fp

diff --git a/ash/src/extensions/ext/headless_surface.rs b/ash/src/extensions/ext/headless_surface.rs
@@ -5,17 +5,19 @@ use crate::{Entry, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::ext_headless_surface::NAME;
+
 /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_EXT_headless_surface.html>
 #[derive(Clone)]
 pub struct HeadlessSurface {
     handle: vk::Instance,
-    fp: vk::ext_headless_surface::DeviceFn,
+    fp: vk::ext_headless_surface::InstanceFn,
 }
 
 impl HeadlessSurface {
     pub fn new(entry: &Entry, instance: &Instance) -> Self {
         let handle = instance.handle();
-        let fp = vk::ext_headless_surface::DeviceFn::load(|name| unsafe {
+        let fp = vk::ext_headless_surface::InstanceFn::load(|name| unsafe {
             mem::transmute(entry.get_instance_proc_addr(handle, name.as_ptr()))
         });
         Self { handle, fp }
@@ -38,10 +40,8 @@ impl HeadlessSurface {
         .result_with_success(surface)
     }
 
-    pub const NAME: &'static CStr = vk::ext_headless_surface::DeviceFn::NAME;
-
     #[inline]
-    pub fn fp(&self) -> &vk::ext_headless_surface::DeviceFn {
+    pub fn fp(&self) -> &vk::ext_headless_surface::InstanceFn {
         &self.fp
     }
 

diff --git a/ash/src/extensions/ext/host_image_copy.rs b/ash/src/extensions/ext/host_image_copy.rs
@@ -6,6 +6,8 @@ use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::ext_host_image_copy::NAME;
+
 /// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_host_image_copy.html>
 #[derive(Clone)]
 pub struct HostImageCopy {
@@ -83,8 +85,6 @@ impl HostImageCopy {
         (self.fp.get_image_subresource_layout2_ext)(self.handle, image, subresource, layout)
     }
 
-    pub const NAME: &'static CStr = vk::ext_host_image_copy::DeviceFn::NAME;
-
     #[inline]
     pub fn fp(&self) -> &vk::ext_host_image_copy::DeviceFn {
         &self.fp

diff --git a/ash/src/extensions/ext/image_compression_control.rs b/ash/src/extensions/ext/image_compression_control.rs
@@ -5,6 +5,8 @@ use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::ext_image_compression_control::NAME;
+
 /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_EXT_image_compression_control.html>
 #[derive(Clone)]
 pub struct ImageCompressionControl {
@@ -41,8 +43,6 @@ impl ImageCompressionControl {
         (self.fp.get_image_subresource_layout2_ext)(self.handle, image, subresource, layout)
     }
 
-    pub const NAME: &'static CStr = vk::ext_image_compression_control::DeviceFn::NAME;
-
     #[inline]
     pub fn fp(&self) -> &vk::ext_image_compression_control::DeviceFn {
         &self.fp

diff --git a/ash/src/extensions/ext/image_drm_format_modifier.rs b/ash/src/extensions/ext/image_drm_format_modifier.rs
@@ -4,6 +4,8 @@ use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::ext_image_drm_format_modifier::NAME;
+
 /// <https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html/VK_EXT_image_drm_format_modifier.html>
 #[derive(Clone)]
 pub struct ImageDrmFormatModifier {
@@ -31,8 +33,6 @@ impl ImageDrmFormatModifier {
             .result()
     }
 
-    pub const NAME: &'static CStr = vk::ext_image_drm_format_modifier::DeviceFn::NAME;
-
     #[inline]
     pub fn fp(&self) -> &vk::ext_image_drm_format_modifier::DeviceFn {
         &self.fp

diff --git a/ash/src/extensions/ext/mesh_shader.rs b/ash/src/extensions/ext/mesh_shader.rs
@@ -3,6 +3,8 @@ use crate::{Device, Instance};
 use std::ffi::CStr;
 use std::mem;
 
+pub const NAME: &CStr = vk::ext_mesh_shader::NAME;
+
 /// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/VK_EXT_mesh_shader.html>
 #[derive(Clone)]
 pub struct MeshShader {
@@ -82,8 +84,6 @@ impl MeshShader {
         );
     }
 
-    pub const NAME: &'static CStr = vk::ext_mesh_shader::DeviceFn::NAME;
-
     #[inline]
     pub fn fp(&self) -> &vk::ext_mesh_shader::DeviceFn {
         &self.fp