Commit Graph
8897 Commits
Author SHA1 Message Date
Mike Hommey 72091ace37 Add missing license in wgpu-remote/Cargo.toml 2019-12-06 13:41:42 +09:00
Mike Hommey 74d83fdedd Update smallvec to 1.0 2019-12-06 13:37:30 +09:00
bors[bot]andDzmitry Malyshau 8bdfb30562 Merge #396
396: Remote buffer destruction r=kvark a=kvark



Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-12-03 14:05:57 +00:00
Dzmitry Malyshau 486b1b6764 Remote buffer destruction 2019-12-03 08:59:22 -05:00
bors[bot]andDzmitry Malyshau 4fdb54d33a Merge #394
394: Get buffer sub data in wgpu-remote r=kvark a=kvark

Required for `mapReadAsync` implementation in Gecko.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-12-02 22:24:17 +00:00
Dzmitry Malyshau 97766ab300 Get buffer sub data in wgpu-remote 2019-12-02 17:23:04 -05:00
bors[bot]andDzmitry Malyshau a13e40ce5c Merge #391
391: Remote buffer mapping r=kvark a=kvark

Reflects the ongoing changes in Gecko.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-11-29 21:45:41 +00:00
Dzmitry Malyshau 2f74e227a8 Remote buffer mapping 2019-11-29 16:44:22 -05:00
bors[bot]andDzmitry Malyshau 2006c07a57 Merge #387
387: Stop dynamic offset iteration when the bind groups stop r=grovesNL a=kvark

Fixes #386 

I imagine the code is not performance-optimal and could be improved. This PR focuses on correctness.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-11-29 02:08:19 +00:00
bors[bot]andDzmitry Malyshau be600f3708 Merge #390
390: Buffer creation in wgpu-remote r=kvark a=kvark



Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-11-28 22:19:09 +00:00
Dzmitry Malyshau 605620b20c Buffer creation in wgpu-remote 2019-11-28 17:18:25 -05:00
Dzmitry Malyshau 0880986a97 Stop dynamic offset iteration when the bind groups stop 2019-11-28 14:36:36 -05:00
bors[bot]andLiJinlei 469c086a1a Merge #385
385: Fix build for iOS r=kvark a=grenlight

   ``` 
Compiling wgpu-native v0.4.0 (https://github.com/gfx-rs/wgpu?rev=b51053dc2dc3bbe9b2ba050fde42eeb6405fe092#b51053dc)
error[E0422]: cannot find struct, variant or union type `Surface` in this scope
  --> /Users/LiJinlei/.cargo/git/checkouts/wgpu-53e70f8674b08dd4/b51053d/wgpu-native/src/device.rs:24:24
   |
24 |         Rwh::IOS(h) => Surface {
   |                        ^^^^^^^ not found in this scope
help: possible candidate is found in another module, you can import it into scope
   ``` 

Co-authored-by: LiJinlei <grenlight@icloud.com>
2019-11-27 15:35:30 +00:00
LiJinlei 7a57b4590b Fix build for iOS 2019-11-27 17:37:05 +08:00
bors[bot]andDzmitry Malyshau fd477c4892 [rs] Merge #134
134: wgpu dependency update r=kvark a=kvark



Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-11-26 18:51:56 +00:00
Dzmitry Malyshau ea92f864c5 [rs] Dependency update 2019-11-26 10:28:33 -05:00
bors[bot]andDzmitry Malyshau b51053dc2d Merge #383
383: Fix STORAGE_READ support r=kvark a=kvark



Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-11-25 19:31:04 +00:00
Dzmitry Malyshau 1a2a37df7d Fix STORAGE_READ support 2019-11-25 14:30:03 -05:00
bors[bot]andDzmitry Malyshau e3038eacbf [rs] Merge #130
130: Export BIND_BUFFER_ALIGNMENT r=kvark a=kvark



Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-11-22 20:50:54 +00:00
Dzmitry Malyshau 073d3fe084 [rs] Export BIND_BUFFER_ALIGNMENT 2019-11-22 15:50:01 -05:00
bors[bot]andTristam MacDonald ccf9466a83 [rs] Merge #120
120: prototype of futures for buffer mapping r=grovesNL a=swiftcoder

This is largely in request-for-comment state right now, although it does work.

As written the `GpuFuture` implementation only works with types that are `Copy`, which rules out using a destructor to unmap the buffer. I'm assume it's possible to write a future type that can produce a non-Copy result, but I haven't sufficiently internalised how `Pin` works to see how.

Co-authored-by: Tristam MacDonald <swiftcoder@gmail.com>
2019-11-22 12:38:33 +00:00
Tristam MacDonald a85f95dfdd [rs] prototype of async/await for buffer mapping 2019-11-21 21:42:22 -08:00
bors[bot]andJacob Greenfield 1968eb81e7 [rs] Merge #127
127: Use u8 for buffer mapping r=kvark a=Coder-256

cc @kvark @grovesNL

This is a temporary solution for #119, and a follow-up for #126.

Co-authored-by: Jacob Greenfield <jacob@jacobgreenfield.me>
2019-11-22 01:41:56 +00:00
Jacob Greenfield a49219f0e6 [rs] Satisfy clippy 2019-11-21 20:35:19 -05:00
Jacob Greenfield 9cc89d6ccf [rs] Update examples and tests 2019-11-21 20:35:16 -05:00
Jacob Greenfield ae18c20fa2 [rs] Use u8 slices for buffer mapping 2019-11-21 20:34:39 -05:00
bors[bot]andJacob Greenfield b30045652c [rs] Merge #128
128: Small updates r=kvark a=Coder-256

Enable Travis CI cache, disable [deprecated container-based builds](https://docs.travis-ci.com/user/reference/trusty/#container-based-infrastructure), and add `red.png` to `.gitignore` (output from `cargo run --example capture`).

Co-authored-by: Jacob Greenfield <jacob@jacobgreenfield.me>
2019-11-22 01:14:52 +00:00
Jacob Greenfield 3a3436dff6 [rs] Add red.png to .gitignore 2019-11-21 18:04:09 -05:00
Jacob Greenfield c826c712c7 [rs] Enable Travis cache 2019-11-21 18:02:44 -05:00
Dzmitry Malyshau d08118b535 Add missing license headers to wgpu-native 2019-11-21 16:53:51 -05:00
Dzmitry Malyshau b6e7b1f204 Add missing WGPUGlobal to wgpu-remote bindings 2019-11-21 15:25:02 -05:00
Jacob Greenfield 7c548b5edf [rs] cargo fmt 2019-11-21 00:20:28 -05:00
bors[bot]andDzmitry Malyshau 9e638fdee5 [rs] Merge #126
126: Fix generic bounds on buffer mapping r=grovesNL a=kvark

Smaller (and incomplete!) alternative to #119 while it's still discussed.
One missing piece here is alignment. cc @Coder-256

Also, importing `wgpu-core` as just "core" wasn't the best idea 😅 : it collides with the actual `core`.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-11-21 03:08:12 +00:00
Dzmitry Malyshau d0646a512e [rs] Fix generic bounds on buffer mapping 2019-11-20 21:25:46 -05:00
bors[bot]andCormac O'Brien 2689dfa460 [rs] Merge #125
125: Use count rather than size in map_read/write_async r=kvark a=cormac-obrien

Fixes #124.

Co-authored-by: Cormac O'Brien <cormac@c-obrien.org>
2019-11-20 15:00:15 +00:00
Cormac O'Brien 83f943cab7 [rs] Use count rather than size in map_read/write_async
Fixes #124
2019-11-20 04:29:09 -06:00
bors[bot]andDzmitry Malyshau fcc162a7aa [rs] Merge #122
122: Wholesome update for the git master of wgpu-native r=grovesNL a=kvark

Depends on https://github.com/gfx-rs/wgpu/pull/382

Co-authored-by: Dzmitry Malyshau <dmalyshau@mozilla.com>
2019-11-20 01:59:27 +00:00
Dzmitry Malyshau 46cead456c [rs] Wholesome update for the git master of wgpu-native 2019-11-19 20:58:32 -05:00
bors[bot]andDzmitry Malyshau 73b33ea76e Merge #382
382: Cleanup exports r=grovesNL a=kvark

This is a follow-up to #381 that cleans up the exports, such that `wgpu-core` doesn't deal with any raw C things.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-11-20 01:02:41 +00:00
Dzmitry Malyshau 3908d2b5a1 Cleanup exports 2019-11-19 10:59:24 -05:00
bors[bot]andDzmitry Malyshau 407cf69a8e Merge #378
378: Support for merged depth-stencil states r=grovesNL a=kvark

Fixes #376 
@Yatekii would you be able to test it and confirm the fix?

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-11-19 13:38:43 +00:00
Dzmitry Malyshau 98d28caffc Refactor internal texture tracking format 2019-11-18 22:07:15 -05:00
Dzmitry Malyshau 4e57c42c71 Initialize trackers with full selector - part 2 2019-11-18 09:20:16 -05:00
Dzmitry Malyshau 0569bc6956 Initialize trackers with full selector 2019-11-18 00:21:13 -05:00
bors[bot]andDzmitry Malyshau aa14f7f76d 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 <kvarkus@gmail.com>
2019-11-16 15:07:30 +00:00
Dzmitry Malyshau 6c632d1366 Separate native from the core 2019-11-16 00:36:23 -05:00
bors[bot]andDzmitry Malyshau f221a6592d Merge #380
380: More licenses for Gecko r=kvark a=kvark

These are all the last things we need to match Gecko, with an exception of #379 

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-11-15 16:53:13 +00:00
Dzmitry Malyshau b9aed69bed More licenses for Gecko 2019-11-15 11:51:46 -05:00
bors[bot]andJoshua Groves ae64e3aa0c Merge #375
375: Use callback for `request_adapter` r=kvark a=grovesNL

For now this is mostly a signature change which allows us to start using a callback for `request_adapter`. Once we have an event loop, the callback could be scheduled to make this asynchronous. At that point the examples and server would have to be updated, because they currently rely on the callback running immediately (inline).

The reason for this change is that `request_adapter` is supposed to return a `Promise` in JS, so we can represent it with callbacks at the C API, and `Future` in Rust (though we'll probably keep using callbacks initially).

I also changed `request_adapter` to provide an adapter with `AdapterId::ERROR` when no adapters are available, so we can add basic error handling to wgpu-rs (https://github.com/gfx-rs/wgpu-rs/issues/117).

Co-authored-by: Joshua Groves <josh@joshgroves.com>
2019-11-08 03:41:12 +00:00
Joshua Groves 7f25b8c318 Move adapter selection into separate function 2019-11-07 21:36:48 -06:00