Merge #381

381: Separate Native from the Core r=grovesNL a=kvark

Fixes #379 (haven't figured out how to build remote static lib to test the example, but that's not as important at this stage, since we have Gecko).
Fixes #168 
Related to #2 and #8

This is a major refactor that moves out the core Rust API into a separate crate. It also changes the export semantics of wgpu-core in a way that the modules are exposed, and all the functionality is now represented as methods of `Global`. The "local" feature is transformed into a type system as a generic parameter `<F>` on the hubs.

Pros:
  - "local" feature is gone
  - we can change the core API more often, this doesn't necessarily require the `native` breaking version bump, and it would be very handy when adding Gecko-related changes
  - Gecko needs less stuff to compile (remote + core)
  - no collision of library names (native with or without the local feature)
  - less problem with crate types
  - cleaner semantics: each crate is either C or Rust, but not both

Cons:
  - more generics, I wouldn't be surprised this regresses the build times visibly

Co-authored-by: Dzmitry Malyshau <[email protected]>

Author: bors[bot]

.travis.yml

@@ -58,8 +58,8 @@ before_install:
 script:
   - cargo test
   # TODO: enable GL backend
-  - (cd wgpu-native && cargo check --all-features)
-  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then (cd wgpu-native && cargo check --features gfx-backend-vulkan); fi
+  - (cd wgpu-core && cargo check --all-features)
+  - if [[ $TRAVIS_OS_NAME == "osx" ]]; then (cd wgpu-native && cargo check --features vulkan-portability); fi
   - if [[ $TRAVIS_OS_NAME == "linux" ]]; then cargo check --release; fi
   - if [[ $TRAVIS_RUST_VERSION == "nightly" ]]; then cargo +nightly install cbindgen; fi
   - if [[ $TRAVIS_RUST_VERSION == "nightly" ]] && [[ $TRAVIS_OS_NAME == "windows" ]]; then

Cargo.lock

@@ -1,5 +1,6 @@
 [workspace]
 members = [
+	"wgpu-core",
     "wgpu-native",
     "wgpu-remote",
 ]

Cargo.toml

@@ -8,8 +8,8 @@ BUILD_DIR:=build
 CLEAN_FFI_DIR:=
 CREATE_BUILD_DIR:=
 
-WILDCARD_WGPU_NATIVE:=$(wildcard wgpu-native/**/*.rs)
-WILDCARD_WGPU_NATIVE_AND_REMOTE:=$(wildcard wgpu-native/**/*.rs wgpu-remote/**/*.rs)
+WILDCARD_WGPU_NATIVE:=$(wildcard wgpu-native/**/*.rs wgpu-core/**/*.rs)
+WILDCARD_WGPU_REMOTE:=$(wildcard wgpu-remote/**/*.rs wgpu-core/**/*.rs)
 
 ifeq (,$(TARGET))
 	CHECK_TARGET_FLAG=
@@ -30,7 +30,8 @@ endif
 	example-compute example-triangle example-remote \
 	run-example-compute run-example-triangle run-example-remote
 
-all: example-compute example-triangle example-remote
+#TODO: example-remote
+all: example-compute example-triangle
 
 check:
 	cargo check --all
@@ -46,15 +47,15 @@ clear:
 	$(CLEAN_FFI_DIR)
 
 lib-native: Cargo.lock wgpu-native/Cargo.toml $(WILDCARD_WGPU_NATIVE)
-	cargo build --manifest-path wgpu-native/Cargo.toml --features local
+	cargo build --manifest-path wgpu-native/Cargo.toml
 
-lib-remote: Cargo.lock wgpu-remote/Cargo.toml $(WILDCARD_WGPU_NATIVE_AND_REMOTE)
+lib-remote: Cargo.lock wgpu-remote/Cargo.toml $(WILDCARD_WGPU_REMOTE)
 	cargo build --manifest-path wgpu-remote/Cargo.toml
 
 $(FFI_DIR)/wgpu.h: wgpu-native/cbindgen.toml $(WILDCARD_WGPU_NATIVE)
 	rustup run nightly cbindgen -o $(FFI_DIR)/wgpu.h wgpu-native
 
-$(FFI_DIR)/wgpu-remote.h: wgpu-remote/cbindgen.toml $(WILDCARD_WGPU_NATIVE_AND_REMOTE)
+$(FFI_DIR)/wgpu-remote.h: wgpu-remote/cbindgen.toml $(WILDCARD_WGPU_REMOTE)
 	rustup run nightly cbindgen -o $(FFI_DIR)/wgpu-remote.h wgpu-remote
 
 example-compute: lib-native $(FFI_DIR)/wgpu.h examples/compute/main.c

Makefile

@@ -9,9 +9,10 @@ This is an active GitHub mirror of the WebGPU native implementation in Rust, whi
 This is an experimental [WebGPU](https://www.w3.org/community/gpu/) implementation as a native static library. It's written in Rust and is based on [gfx-hal](https://github.com/gfx-rs/gfx) and [Rendy](https://github.com/amethyst/rendy) libraries. The corresponding WebIDL specification can be found at [gpuweb project](https://github.com/gpuweb/gpuweb/blob/master/spec/index.bs).
 
 The implementation consists of the following parts:
-  1. `wgpu-native` - the native implementation of WebGPU as a C API library
-  2. `wgpu-remote` - remoting layer to work with WebGPU across the process boundary
-  3. `ffi` - the C headers generated by [cbindgen](https://github.com/eqrion/cbindgen) for both of the libraries
+  1. `wgpu-core` - internal Rust API for WebGPU implementations to use
+  2. `wgpu-native` - the native implementation of WebGPU as a C API library
+  3. `wgpu-remote` - remoting layer to work with WebGPU across the process boundary
+  4. `ffi` - the C headers generated by [cbindgen](https://github.com/eqrion/cbindgen) for both of the libraries
 
 ## Supported Platforms
 

README.md

@@ -59,6 +59,7 @@ int main(
     WGPUAdapterId adapter = { 0 };
     wgpu_request_adapter_async(
         NULL,
+        2 | 4 | 8,
         request_adapter_callback,
         (void *) &adapter
     );

examples/compute/main.c

@@ -31,7 +31,6 @@ int main() {
 
         WGPURequestAdapterOptions options = {
             .power_preference = WGPUPowerPreference_LowPower,
-            .backends = 2 | 4 | 8,
         };
         char index = wgpu_server_instance_request_adapter(server, &options, ids, count);
         if (index < 0) {

examples/remote/main.c

@@ -46,8 +46,8 @@ int main() {
     wgpu_request_adapter_async(
         &(WGPURequestAdapterOptions){
             .power_preference = WGPUPowerPreference_LowPower,
-            .backends = 2 | 4 | 8,
         },
+        2 | 4 | 8,
         request_adapter_callback,
         (void *) &adapter
     );

examples/triangle/main.c

@@ -27,8 +27,6 @@ typedef enum {
 
 typedef struct WGPUClient WGPUClient;
 
-typedef struct WGPUGlobal WGPUGlobal;
-
 typedef uint64_t WGPUId_Adapter_Dummy;
 
 typedef WGPUId_Adapter_Dummy WGPUAdapterId;
@@ -55,11 +53,8 @@ typedef struct {
   WGPULimits limits;
 } WGPUDeviceDescriptor;
 
-typedef uint32_t WGPUBackendBit;
-
 typedef struct {
   WGPUPowerPreference power_preference;
-  WGPUBackendBit backends;
 } WGPURequestAdapterOptions;
 
 WGPU_INLINE