Hardware Abstraction Layer

Cargo.toml

@@ -4,9 +4,10 @@ members = [
     "player",
     "wgpu",
     "wgpu-core",
+    "wgpu-hal",
     "wgpu-types",
 ]
-default-members = ["wgpu"]
+default-members = ["wgpu", "player"]
 
 [patch."https://github.com/gfx-rs/naga"]
 #naga = { path = "../naga" }

README.md

@@ -7,12 +7,13 @@
 [![codecov.io](https://codecov.io/gh/gfx-rs/wgpu/branch/master/graph/badge.svg?token=84qJTesmeS)](https://codecov.io/gh/gfx-rs/wgpu)
 
 This is an implementation of [WebGPU](https://www.w3.org/community/gpu/) API in Rust, targeting both native and the Web.
-It's written in Rust and is based on [gfx-hal](https://github.com/gfx-rs/gfx) with help of [gpu-alloc](https://github.com/zakarumych/gpu-alloc) and [gpu-descriptor](https://github.com/zakarumych/gpu-descriptor). See the upstream [WebGPU specification](https://gpuweb.github.io/gpuweb/) (work in progress).
+See the upstream [WebGPU specification](https://gpuweb.github.io/gpuweb/) (work in progress).
 
 The repository hosts the following parts:
 
   - [![Crates.io](https://img.shields.io/crates/v/wgpu.svg?label=wgpu)](https://crates.io/crates/wgpu) [![docs.rs](https://docs.rs/wgpu/badge.svg)](https://docs.rs/wgpu/) - public Rust API for users
   - [![Crates.io](https://img.shields.io/crates/v/wgpu-core.svg?label=wgpu-core)](https://crates.io/crates/wgpu-core) [![docs.rs](https://docs.rs/wgpu-core/badge.svg)](https://docs.rs/wgpu-core/) - internal Rust API for WebGPU implementations to use
+  - [![Crates.io](https://img.shields.io/crates/v/wgpu-hal.svg?label=wgpu-hal)](https://crates.io/crates/wgpu-hal) [![docs.rs](https://docs.rs/wgpu-hal/badge.svg)](https://docs.rs/wgpu-hal/) - internal unsafe GPU abstraction API
   - [![Crates.io](https://img.shields.io/crates/v/wgpu-types.svg?label=wgpu-types)](https://crates.io/crates/wgpu-types) [![docs.rs](https://docs.rs/wgpu-types/badge.svg)](https://docs.rs/wgpu-types/) - Rust types shared between `wgpu-core` and `wgpu-rs`
   - `player` - standalone application for replaying the API traces, uses `winit`
 

player/Cargo.toml

@@ -13,7 +13,6 @@ license = "MPL-2.0"
 publish = false
 
 [features]
-cross = ["wgc/cross"]
 
 [dependencies]
 env_logger = "0.8"

wgpu-core/Cargo.toml

@@ -13,8 +13,6 @@ license = "MPL-2.0"
 
 [features]
 default = []
-# Enable SPIRV-Cross
-cross = ["gfx-backend-metal/cross", "gfx-backend-gl/cross"]
 # Enable API tracing
 trace = ["ron", "serde", "wgt/trace", "arrayvec/serde"]
 # Enable API replaying
@@ -36,38 +34,21 @@ serde = { version = "1.0", features = ["serde_derive"], optional = true }
 smallvec = "1"
 thiserror = "1"
 
-gpu-alloc = "0.4"
-gpu-descriptor = "0.1"
-
-hal = { package = "gfx-hal", git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
-gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
-
-[target.'cfg(all(not(target_arch = "wasm32"), all(unix, not(target_os = "ios"), not(target_os = "macos"))))'.dependencies]
-gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521", features = ["naga"] }
-gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
-
-[target.'cfg(all(not(target_arch = "wasm32"), any(target_os = "ios", target_os = "macos")))'.dependencies]
-gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
-#TODO: could also depend on gfx-backend-vulkan for Vulkan Portability
-
-[target.'cfg(all(not(target_arch = "wasm32"), windows))'.dependencies]
-gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
-gfx-backend-dx11 = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
-gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521", features = ["naga"] }
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-gfx-backend-gl = { git = "https://github.com/gfx-rs/gfx", rev = "27a1dae3796d33d23812f2bb8c7e3b5aea18b521" }
-
 [dependencies.naga]
 git = "https://github.com/gfx-rs/naga"
 tag = "gfx-25"
-features = ["spv-in", "spv-out", "wgsl-in"]
+features = ["spv-in", "wgsl-in"]
 
 [dependencies.wgt]
 path = "../wgpu-types"
 package = "wgpu-types"
 version = "0.8"
 
+[dependencies.hal]
+path = "../wgpu-hal"
+package = "wgpu-hal"
+version = "0.1"
+
 [dev-dependencies]
 loom = "0.3"
 

wgpu-core/src/binding_model.rs

@@ -3,16 +3,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use crate::{
-    device::{
-        descriptor::{DescriptorSet, DescriptorTotalCount},
-        DeviceError, MissingFeatures, SHADER_STAGE_COUNT,
-    },
+    device::{DeviceError, MissingFeatures, SHADER_STAGE_COUNT},
     hub::Resource,
     id::{BindGroupLayoutId, BufferId, DeviceId, SamplerId, TextureViewId, Valid},
     memory_init_tracker::MemoryInitTrackerAction,
     track::{TrackerSet, UsageConflict, DUMMY_SELECTOR},
     validation::{MissingBufferUsageError, MissingTextureUsageError},
-    FastHashMap, Label, LifeGuard, MultiRefCount, Stored, MAX_BIND_GROUPS,
+    FastHashMap, Label, LifeGuard, MultiRefCount, Stored,
 };
 
 use arrayvec::ArrayVec;
@@ -389,19 +386,18 @@ pub struct BindGroupLayoutDescriptor<'a> {
 pub(crate) type BindEntryMap = FastHashMap<u32, wgt::BindGroupLayoutEntry>;
 
 #[derive(Debug)]
-pub struct BindGroupLayout<B: hal::Backend> {
-    pub(crate) raw: B::DescriptorSetLayout,
+pub struct BindGroupLayout<A: hal::Api> {
+    pub(crate) raw: A::BindGroupLayout,
     pub(crate) device_id: Stored<DeviceId>,
     pub(crate) multi_ref_count: MultiRefCount,
     pub(crate) entries: BindEntryMap,
-    pub(crate) desc_count: DescriptorTotalCount,
     pub(crate) dynamic_count: usize,
     pub(crate) count_validator: BindingTypeMaxCountValidator,
     #[cfg(debug_assertions)]
     pub(crate) label: String,
 }
 
-impl<B: hal::Backend> Resource for BindGroupLayout<B> {
+impl<A: hal::Api> Resource for BindGroupLayout<A> {
     const TYPE: &'static str = "BindGroupLayout";
 
     fn life_guard(&self) -> &LifeGuard {
@@ -498,15 +494,15 @@ pub struct PipelineLayoutDescriptor<'a> {
 }
 
 #[derive(Debug)]
-pub struct PipelineLayout<B: hal::Backend> {
-    pub(crate) raw: B::PipelineLayout,
+pub struct PipelineLayout<A: hal::Api> {
+    pub(crate) raw: A::PipelineLayout,
     pub(crate) device_id: Stored<DeviceId>,
     pub(crate) life_guard: LifeGuard,
-    pub(crate) bind_group_layout_ids: ArrayVec<[Valid<BindGroupLayoutId>; MAX_BIND_GROUPS]>,
+    pub(crate) bind_group_layout_ids: ArrayVec<[Valid<BindGroupLayoutId>; hal::MAX_BIND_GROUPS]>,
     pub(crate) push_constant_ranges: ArrayVec<[wgt::PushConstantRange; SHADER_STAGE_COUNT]>,
 }
 
-impl<B: hal::Backend> PipelineLayout<B> {
+impl<A: hal::Api> PipelineLayout<A> {
     /// Validate push constants match up with expected ranges.
     pub(crate) fn validate_push_constant_ranges(
         &self,
@@ -586,7 +582,7 @@ impl<B: hal::Backend> PipelineLayout<B> {
     }
 }
 
-impl<B: hal::Backend> Resource for PipelineLayout<B> {
+impl<A: hal::Api> Resource for PipelineLayout<A> {
     const TYPE: &'static str = "PipelineLayout";
 
     fn life_guard(&self) -> &LifeGuard {
@@ -636,8 +632,8 @@ pub struct BindGroupDynamicBindingData {
 }
 
 #[derive(Debug)]
-pub struct BindGroup<B: hal::Backend> {
-    pub(crate) raw: DescriptorSet<B>,
+pub struct BindGroup<A: hal::Api> {
+    pub(crate) raw: A::BindGroup,
     pub(crate) device_id: Stored<DeviceId>,
     pub(crate) layout_id: Valid<BindGroupLayoutId>,
     pub(crate) life_guard: LifeGuard,
@@ -646,7 +642,7 @@ pub struct BindGroup<B: hal::Backend> {
     pub(crate) dynamic_binding_info: Vec<BindGroupDynamicBindingData>,
 }
 
-impl<B: hal::Backend> BindGroup<B> {
+impl<A: hal::Api> BindGroup<A> {
     pub(crate) fn validate_dynamic_bindings(
         &self,
         offsets: &[wgt::DynamicOffset],
@@ -681,13 +677,13 @@ impl<B: hal::Backend> BindGroup<B> {
     }
 }
 
-impl<B: hal::Backend> Borrow<()> for BindGroup<B> {
+impl<A: hal::Api> Borrow<()> for BindGroup<A> {
     fn borrow(&self) -> &() {
         &DUMMY_SELECTOR
     }
 }
 
-impl<B: hal::Backend> Resource for BindGroup<B> {
+impl<A: hal::Api> Resource for BindGroup<A> {
     const TYPE: &'static str = "BindGroup";
 
     fn life_guard(&self) -> &LifeGuard {