Update dependencies (#1793)

vulkano-shaders/Cargo.toml

@@ -16,7 +16,7 @@ proc-macro = true
 
 [dependencies]
 fnv = "1.0"
-heck = "0.3"
+heck = "0.4"
 proc-macro2 = "1.0"
 quote = "1.0"
 shaderc = "0.7"

vulkano-shaders/src/structs.rs

@@ -8,7 +8,7 @@
 // according to those terms.
 
 use crate::{RegisteredType, TypesMeta};
-use heck::CamelCase;
+use heck::ToUpperCamelCase;
 use proc_macro2::{Span, TokenStream};
 use std::borrow::Cow;
 use std::collections::HashMap;
@@ -780,7 +780,7 @@ pub(super) fn write_specialization_constants<'a>(
     let struct_name = if shared_constants {
         format_ident!("SpecializationConstants")
     } else {
-        format_ident!("{}SpecializationConstants", shader.to_camel_case())
+        format_ident!("{}SpecializationConstants", shader.to_upper_camel_case())
     };
 
     // For multi-constants mode registration mechanism skipped

vulkano/Cargo.toml

@@ -15,8 +15,8 @@ build = "build.rs"
 
 [dependencies]
 # When updating Ash, also update vk.xml to the same Vulkan patch version that Ash uses.
-# All versions of vk.xml can be found at https://github.com/KhronosGroup/Vulkan-Headers/commits/master/registry/vk.xml.
-ash = "0.33.3"
+# All versions of vk.xml can be found at https://github.com/KhronosGroup/Vulkan-Headers/commits/main/registry/vk.xml.
+ash = "0.35.0"
 crossbeam-queue = "0.3"
 fnv = "1.0"
 half = "1.8"
@@ -27,12 +27,12 @@ shared_library = "0.1"
 smallvec = "1.7"
 
 [build-dependencies]
-heck = "0.3"
-indexmap = "1.7"
+heck = "0.4"
+indexmap = "1.8"
 lazy_static = "1.4"
 proc-macro2 = "1.0"
 quote = "1.0"
 regex = "1.5"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-vk-parse = "0.6"
+vk-parse = "0.7"

vulkano/autogen/extensions.rs

@@ -8,7 +8,7 @@
 // according to those terms.
 
 use super::{write_file, VkRegistryData};
-use heck::SnakeCase;
+use heck::ToSnakeCase;
 use indexmap::IndexMap;
 use proc_macro2::{Ident, Literal, TokenStream};
 use quote::{format_ident, quote};

vulkano/autogen/features.rs

@@ -8,7 +8,7 @@
 // according to those terms.
 
 use super::{write_file, VkRegistryData};
-use heck::SnakeCase;
+use heck::ToSnakeCase;
 use indexmap::IndexMap;
 use proc_macro2::{Ident, TokenStream};
 use quote::{format_ident, quote};

vulkano/autogen/fns.rs

@@ -8,7 +8,7 @@
 // according to those terms.
 
 use super::{write_file, VkRegistryData};
-use heck::{CamelCase, SnakeCase};
+use heck::{ToSnakeCase, ToUpperCamelCase};
 use indexmap::IndexMap;
 use proc_macro2::{Ident, TokenStream};
 use quote::{format_ident, quote};
@@ -96,7 +96,7 @@ fn extension_fns_members(ty: &str, extensions: &IndexMap<&str, &Extension>) -> V
         .map(|ext| {
             let base = ext.name.strip_prefix("VK_").unwrap().to_snake_case();
             let name = format_ident!("{}", base);
-            let fn_struct = format_ident!("{}Fn", base.to_camel_case());
+            let fn_struct = format_ident!("{}Fn", base.to_upper_camel_case());
             FnsMember { name, fn_struct }
         })
         .collect()

vulkano/autogen/properties.rs

@@ -8,7 +8,7 @@
 // according to those terms.
 
 use super::{write_file, VkRegistryData};
-use heck::SnakeCase;
+use heck::ToSnakeCase;
 use indexmap::IndexMap;
 use proc_macro2::{Ident, TokenStream};
 use quote::{format_ident, quote};

vulkano/autogen/spirv_parse.rs

@@ -8,7 +8,7 @@
 // according to those terms.
 
 use super::{write_file, SpirvGrammar};
-use heck::SnakeCase;
+use heck::ToSnakeCase;
 use lazy_static::lazy_static;
 use proc_macro2::{Ident, TokenStream};
 use quote::{format_ident, quote};

vulkano/autogen/spirv_reqs.rs

@@ -11,7 +11,7 @@ use super::{
     spirv_grammar::{SpirvGrammar, SpirvKindEnumerant},
     write_file, VkRegistryData,
 };
-use heck::SnakeCase;
+use heck::ToSnakeCase;
 use indexmap::{map::Entry, IndexMap};
 use lazy_static::lazy_static;
 use proc_macro2::{Ident, TokenStream};
@@ -207,13 +207,13 @@ lazy_static! {
 }
 
 fn make_enable(enable: &vk_parse::Enable) -> Option<(Enable, String)> {
-    if matches!(enable, vk_parse::Enable::Version(version) if version == "VK_API_VERSION_1_0") {
+    if matches!(enable, vk_parse::Enable::Version(version) if version == "VK_VERSION_1_0") {
         return None;
     }
 
     Some(match enable {
         vk_parse::Enable::Version(version) => {
-            let version = version.strip_prefix("VK_API_VERSION_").unwrap();
+            let version = version.strip_prefix("VK_VERSION_").unwrap();
             let (major, minor) = version.split_once('_').unwrap();
 
             (

vulkano/src/swapchain/capabilities.rs

@@ -536,7 +536,7 @@ pub enum ColorSpace {
     DisplayP3NonLinear = ash::vk::ColorSpaceKHR::DISPLAY_P3_NONLINEAR_EXT.as_raw(),
     ExtendedSrgbLinear = ash::vk::ColorSpaceKHR::EXTENDED_SRGB_LINEAR_EXT.as_raw(),
     ExtendedSrgbNonLinear = ash::vk::ColorSpaceKHR::EXTENDED_SRGB_NONLINEAR_EXT.as_raw(),
-    DciP3Linear = ash::vk::ColorSpaceKHR::DCI_P3_LINEAR_EXT.as_raw(),
+    DisplayP3Linear = ash::vk::ColorSpaceKHR::DISPLAY_P3_LINEAR_EXT.as_raw(),
     DciP3NonLinear = ash::vk::ColorSpaceKHR::DCI_P3_NONLINEAR_EXT.as_raw(),
     Bt709Linear = ash::vk::ColorSpaceKHR::BT709_LINEAR_EXT.as_raw(),
     Bt709NonLinear = ash::vk::ColorSpaceKHR::BT709_NONLINEAR_EXT.as_raw(),
@@ -567,7 +567,7 @@ impl From<ash::vk::ColorSpaceKHR> for ColorSpace {
             ash::vk::ColorSpaceKHR::EXTENDED_SRGB_NONLINEAR_EXT => {
                 ColorSpace::ExtendedSrgbNonLinear
             }
-            ash::vk::ColorSpaceKHR::DCI_P3_LINEAR_EXT => ColorSpace::DciP3Linear,
+            ash::vk::ColorSpaceKHR::DISPLAY_P3_LINEAR_EXT => ColorSpace::DisplayP3Linear,
             ash::vk::ColorSpaceKHR::DCI_P3_NONLINEAR_EXT => ColorSpace::DciP3NonLinear,
             ash::vk::ColorSpaceKHR::BT709_LINEAR_EXT => ColorSpace::Bt709Linear,
             ash::vk::ColorSpaceKHR::BT709_NONLINEAR_EXT => ColorSpace::Bt709NonLinear,