Fix missing validation when binding memory to buffers with the shader_device_address usage

vulkano/src/buffer/cpu_access.rs

@@ -77,6 +77,8 @@ where
     /// # Panics
     ///
     /// - Panics if `T` has zero size.
+    /// - Panics if `usage.shader_device_address` is `true`.
+    // TODO: ^
     pub fn from_data(
         device: Arc<Device>,
         usage: BufferUsage,
@@ -130,6 +132,8 @@ where
     ///
     /// - Panics if `T` has zero size.
     /// - Panics if `data` is empty.
+    /// - Panics if `usage.shader_device_address` is `true`.
+    // TODO: ^
     pub fn from_iter<I>(
         device: Arc<Device>,
         usage: BufferUsage,
@@ -172,6 +176,8 @@ where
     ///
     /// - Panics if `T` has zero size.
     /// - Panics if `len` is zero.
+    /// - Panics if `usage.shader_device_address` is `true`.
+    // TODO: ^
     pub unsafe fn uninitialized_array(
         device: Arc<Device>,
         len: DeviceSize,
@@ -201,6 +207,8 @@ where
     /// # Panics
     ///
     /// - Panics if `size` is zero.
+    /// - Panics if `usage.shader_device_address` is `true`.
+    // TODO: ^
     pub unsafe fn raw(
         device: Arc<Device>,
         size: DeviceSize,

vulkano/src/buffer/cpu_pool.rs

@@ -197,9 +197,12 @@ where
     /// # Panics
     ///
     /// - Panics if `T` has zero size.
+    /// - Panics if `usage.shader_device_address` is `true`.
+    // TODO: ^
     #[inline]
     pub fn new(device: Arc<Device>, usage: BufferUsage) -> CpuBufferPool<T> {
         assert!(size_of::<T>() > 0);
+        assert!(!usage.shader_device_address);
         let pool = device.standard_memory_pool();
 
         CpuBufferPool {

vulkano/src/buffer/device_local.rs

@@ -181,6 +181,11 @@ where
     /// the initial upload operation. In order to be allowed to use the `DeviceLocalBuffer`, you
     /// must either submit your operation after this future, or execute this future and wait for it
     /// to be finished before submitting your own operation.
+    ///
+    /// # Panics
+    ///
+    /// - Panics if `usage.shader_device_address` is `true`.
+    // TODO: ^
     pub fn from_buffer<B, L, A>(
         source: Arc<B>,
         usage: BufferUsage,
@@ -235,6 +240,8 @@ where
     /// # Panics
     ///
     /// - Panics if `T` has zero size.
+    /// - Panics if `usage.shader_device_address` is `true`.
+    // TODO: ^
     pub fn from_data<L, A>(
         data: T,
         usage: BufferUsage,
@@ -264,6 +271,8 @@ where
     ///
     /// - Panics if `T` has zero size.
     /// - Panics if `data` is empty.
+    /// - Panics if `usage.shader_device_address` is `true`.
+    // TODO: ^
     pub fn from_iter<D, L, A>(
         data: D,
         usage: BufferUsage,
@@ -297,6 +306,8 @@ where
     ///
     /// - Panics if `T` has zero size.
     /// - Panics if `len` is zero.
+    /// - Panics if `usage.shader_device_address` is `true`.
+    // TODO: ^
     pub fn array(
         device: Arc<Device>,
         len: DeviceSize,
@@ -327,6 +338,8 @@ where
     /// # Panics
     ///
     /// - Panics if `size` is zero.
+    /// - Panics if `usage.shader_device_address` is `true`.
+    // TODO: ^
     pub unsafe fn raw(
         device: Arc<Device>,
         size: DeviceSize,
@@ -367,6 +380,8 @@ where
     /// # Panics
     ///
     /// - Panics if `size` is zero.
+    /// - Panics if `usage.shader_device_address` is `true`.
+    // TODO: ^
     pub unsafe fn raw_with_exportable_fd(
         device: Arc<Device>,
         size: DeviceSize,

vulkano/src/buffer/sys.rs

@@ -399,6 +399,15 @@ impl UnsafeBuffer {
     }
 
     /// Binds device memory to this buffer.
+    ///
+    /// # Panics
+    ///
+    /// - Panics if `self.usage.shader_device_address` is `true` and the `memory` was not allocated
+    ///   with the [`device_address`] flag set and the [`ext_buffer_device_address`] extension is
+    ///   not enabled on the device.
+    ///
+    /// [`device_address`]: crate::memory::MemoryAllocateFlags::device_address
+    /// [`ext_buffer_device_address`]: crate::device::DeviceExtensions::ext_buffer_device_address
     pub unsafe fn bind_memory(
         &self,
         memory: &DeviceMemory,
@@ -435,6 +444,13 @@ impl UnsafeBuffer {
             }
         }
 
+        // VUID-vkBindBufferMemory-bufferDeviceAddress-03339
+        if self.usage.shader_device_address
+            && !self.device.enabled_extensions().ext_buffer_device_address
+        {
+            assert!(memory.flags().device_address);
+        }
+
         (fns.v1_0.bind_buffer_memory)(
             self.device.internal_object(),
             self.handle,

vulkano/src/buffer/traits.rs

@@ -8,7 +8,7 @@
 // according to those terms.
 
 use super::{sys::UnsafeBuffer, BufferContents, BufferSlice, BufferUsage};
-use crate::{device::DeviceOwned, DeviceSize, RequiresOneOf, SafeDeref, VulkanObject};
+use crate::{device::DeviceOwned, DeviceSize, RequiresOneOf, SafeDeref, Version, VulkanObject};
 use std::{
     error::Error,
     fmt::{Debug, Display, Error as FmtError, Formatter},
@@ -100,13 +100,17 @@ pub unsafe trait BufferAccess: DeviceOwned + Send + Sync {
                 ..Default::default()
             };
             let fns = device.fns();
-            let ptr = (fns.ext_buffer_device_address.get_buffer_device_address_ext)(
-                device.internal_object(),
-                &info,
-            );
+            let f = if device.api_version() >= Version::V1_2 {
+                fns.v1_2.get_buffer_device_address
+            } else if device.enabled_extensions().khr_buffer_device_address {
+                fns.khr_buffer_device_address.get_buffer_device_address_khr
+            } else {
+                fns.ext_buffer_device_address.get_buffer_device_address_ext
+            };
+            let ptr = f(device.internal_object(), &info);
 
             if ptr == 0 {
-                panic!("got null ptr from a valid GetBufferDeviceAddressEXT call");
+                panic!("got null ptr from a valid GetBufferDeviceAddress call");
             }
 
             Ok(NonZeroU64::new_unchecked(ptr + inner.offset))

vulkano/src/buffer/usage.rs

@@ -44,6 +44,13 @@ vulkan_bitflags! {
     indirect_buffer = INDIRECT_BUFFER,
 
     /// The buffer's device address can be retrieved.
+    ///
+    /// A buffer created with this usage can only be bound to device memory allocated with the
+    /// [`device_address`] flag set unless the [`ext_buffer_device_address`] extension is enabled
+    /// on the device.
+    ///
+    /// [`device_address`]: crate::memory::MemoryAllocateFlags::device_address
+    /// [`ext_buffer_device_address`]: crate::device::DeviceExtensions::ext_buffer_device_address
     shader_device_address = SHADER_DEVICE_ADDRESS {
         api_version: V1_2,
         device_extensions: [khr_buffer_device_address, ext_buffer_device_address],