debug_printf: Enable debug_printf validation feature

wgpu-hal/src/vulkan/instance.rs

@@ -611,7 +611,7 @@ impl crate::Instance<super::Api> for super::Instance {
  },
  );
 
- let extensions = Self::desired_extensions(&entry, instance_api_version, desc.flags)?;
+ let mut extensions = Self::desired_extensions(&entry, instance_api_version, desc.flags)?;
 
  let instance_layers = {
  profiling::scope!("vkEnumerateInstanceLayerProperties");
@@ -644,6 +644,7 @@ impl crate::Instance<super::Api> for super::Instance {
 
  // Request validation layer if asked.
  let mut debug_utils = None;
+ let mut validation_features = None;
  if desc.flags.contains(wgt::InstanceFlags::VALIDATION) {
  let validation_layer_name =
  CStr::from_bytes_with_nul(b"VK_LAYER_KHRONOS_validation\0").unwrap();
@@ -689,6 +690,28 @@ impl crate::Instance<super::Api> for super::Instance {
 
  debug_utils = Some((create_info, vk_create_info));
  }
+
+ if let Some(validation_extensions) = entry
+ .enumerate_instance_extension_properties(Some(validation_layer_name))
+ .map_err(|e| {
+ log::warn!(
+ "enumerate_instance_extension_properties() failed for validation layer: {:?}", e
+ )
+ })
+ .ok()
+ {
+ if validation_extensions.iter().any(|inst_ext| {
+ cstr_from_bytes_until_nul(&inst_ext.extension_name)
+ == Some(vk::ExtValidationFeaturesFn::name())
+ }) {
+ extensions.push(vk::ExtValidationFeaturesFn::name());
+ validation_features = Some(
+ vk::ValidationFeaturesEXT::builder().enabled_validation_features(&[
+ vk::ValidationFeatureEnableEXT::DEBUG_PRINTF,
+ ]),
+ );
+ }
+ }
  } else {
  log::warn!(
  "InstanceFlags::VALIDATION requested, but unable to find layer: {}",
@@ -743,6 +766,10 @@ impl crate::Instance<super::Api> for super::Instance {
  .enabled_layer_names(&str_pointers[..layers.len()])
  .enabled_extension_names(&str_pointers[layers.len()..]);
 
+ if let Some(validation_features) = validation_features.as_mut() {
+ create_info = create_info.push_next(validation_features);
+ }
+
  if let Some(&mut (_, ref mut vk_create_info)) = debug_utils.as_mut() {
  create_info = create_info.push_next(vk_create_info);
  }