Merge #371

371: Don't depend on gfx-auxil r=straightforward a=kvark

Problem with gfx-auxil is that version 0.1 drags spirv_cross dependency (not needed on Vulkan), and the published crates haven't been switched to gfx-auxil-0.2

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>

Author: bors[bot]

Cargo.lock

@@ -26,10 +26,10 @@ metal-auto-capture = ["gfx-backend-metal/auto-capture"]
 arrayvec = "0.5"
 bitflags = "1.0"
 copyless = "0.1"
+fxhash = "0.2"
 lazy_static = { version = "1.1.0", optional = true }
 log = "0.4"
 hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "46386475f7e823e807ec984c372ffe04dcc0a22b" }
-gfx-auxil = { git = "https://github.com/gfx-rs/gfx", rev = "46386475f7e823e807ec984c372ffe04dcc0a22b" }
 gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "46386475f7e823e807ec984c372ffe04dcc0a22b" }
 parking_lot = "0.9"
 raw-window-handle = { version = "0.3", optional = true }

wgpu-native/Cargo.toml

@@ -25,6 +25,7 @@ use crate::{
     CommandEncoderId,
     ComputePipelineId,
     DeviceId,
+    FastHashMap,
     Features,
     LifeGuard,
     PipelineLayoutId,
@@ -48,7 +49,6 @@ use crate::{gfx_select, hub::GLOBAL};
 
 use arrayvec::ArrayVec;
 use copyless::VecHelper as _;
-use gfx_auxil::FastHashMap;
 use hal::{
     self,
     command::CommandBuffer as _,

wgpu-native/src/device.rs

@@ -229,3 +229,6 @@ pub(crate) struct Features {
     pub max_bind_groups: u32,
     pub supports_texture_d24_s8: bool,
 }
+
+/// Fast hash map used internally.
+type FastHashMap<K, V> = std::collections::HashMap<K, V, std::hash::BuildHasherDefault<fxhash::FxHasher>>;

wgpu-native/src/lib.rs

@@ -11,15 +11,14 @@ use crate::{
     Backend,
     BindGroupId,
     Epoch,
+    FastHashMap,
     Index,
     RefCount,
     SamplerId,
     TextureViewId,
     TypedId,
 };
 
-use gfx_auxil::FastHashMap;
-
 use std::{
     borrow::Borrow,
     collections::hash_map::Entry,