Commit Graph

425 Commits

Author SHA1 Message Date
bors[bot]
b288ce0a64 [rs] Merge #426
426: wgpu dependency update with memory fixes r=trivial a=kvark

Fixes #423 (mostly!)

Co-authored-by: Dzmitry Malyshau <dmalyshau@mozilla.com>
2020-07-07 21:30:21 +00:00
Dzmitry Malyshau
8ffbcadcde [rs] wgpu dependency update with memory fixes 2020-07-07 17:29:03 -04:00
bors[bot]
362cde96a7 [rs] Merge #425
425: Update to new `wgpu-core` render pipeline API r=kvark a=GabrielMajeri

Picks up the changes from https://github.com/gfx-rs/wgpu/pull/763

Co-authored-by: Gabriel Majeri <gabriel.majeri6@gmail.com>
2020-07-07 19:31:35 +00:00
Gabriel Majeri
54d4532dae [rs] Update to new wgpu-core render pipeline API 2020-07-07 21:02:11 +03:00
bors[bot]
33afed68f6 [rs] Merge #417
417: add replay feature r=kvark a=gzp-crey

Resolves #284 

Co-authored-by: gzp-crey <gzp@creygames.com>
2020-06-29 14:46:07 +00:00
gzp-crey
73ebff129b [rs] add replay feature 2020-06-29 09:20:14 +02:00
bors[bot]
7c1f090c85 [rs] Merge #416
416: Allow trailing comma in vertex_attr_array! r=cwfitzgerald a=benfrankel



Co-authored-by: Ben Frankel <ben.frankel7@gmail.com>
2020-06-28 21:24:54 +00:00
Ben Frankel
a4c96231fe [rs] Allow trailing comma in vertex_attr_array! 2020-06-28 14:23:23 -07:00
bors[bot]
ef8edbb4bc [rs] Merge #414
414: Implement MultiDrawIndirect Extensions r=kvark a=cwfitzgerald

The wgpu-rs component of https://github.com/gfx-rs/wgpu/pull/754.

I didn't include the modifications to the example as they are particularly awful and ugly. One of my next steps following this is to make an example of both binding indexing and these multi-draw extensions.

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-28 15:12:32 +00:00
Connor Fitzgerald
8a8ed1b705 [rs] Implement MultiDrawIndirect Extensions 2020-06-28 01:39:17 -04:00
bors[bot]
a568ae07b8 [rs] Merge #413
413: Improve docs for main crate and `hello-triangle` example r=cwfitzgerald,kvark a=GabrielMajeri

Some minor fixes for the main crate docs, as well as some comments in the `hello-triangle` example.

Co-authored-by: Gabriel Majeri <gabriel.majeri6@gmail.com>
2020-06-27 18:26:24 +00:00
Gabriel Majeri
f0f481bbda [rs] Improve hello-triangle docs 2020-06-27 21:25:22 +03:00
Gabriel Majeri
e2d072fb59 [rs] Improve crate docs 2020-06-27 21:25:19 +03:00
bors[bot]
13211508ba [rs] Merge #412
412: Convert Extensions + Capabilities into Features r=kvark a=cwfitzgerald

https://github.com/gfx-rs/wgpu/pull/751 but rusty.

Nothing much more to say about it, pretty banal.

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-26 13:51:01 +00:00
Connor Fitzgerald
cd4baab400 [rs] Convert Extensions + Capabilities into Features 2020-06-26 01:27:57 -04:00
bors[bot]
d73d471085 [rs] Merge #408
408: Staging belt r=kyren a=kvark

Implementing the belt itself isn't too hard, but integrating it with the example framework and winit's event loop is somewhat challenging. Perhaps, there needs to be a `LocalSpawner` parameter to `render()` like I did [in vange-rs](e7bc944ef5/bin/boilerplate.rs (L26))?

Edit: code is all ready and shiny... but it does NOT work. Buffers don't come back from mapping for some reason.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
Co-authored-by: kyren <kerriganw@gmail.com>
2020-06-25 17:44:04 +00:00
kyren
aae1f216e0 [rs] A different attempt at the example framework 2020-06-25 13:13:13 -04:00
kyren
6fb12c0537 [rs] Get event loop + futures working on native, untested on web 2020-06-25 13:13:13 -04:00
bors[bot]
81a7ba6267 [rs] Merge #400
400: Added test for "capture" example r=kvark a=bfrazho

I've added a test to validate the capture example. I was planning on using the existing "screenshot.png" that was in there for the assertion for the test, but apparently was slightly different from the one that I was generating. I ended up replacing the screenshot.png with what the test was generating.

I'm a little concerned that they were different from the start, but maybe the png generating library made some small changes over time. I did check to make sure that it generated the same png on Windows and Linux on the same computer.

Let me know if there is anything that you would like me to change!

Co-authored-by: Brian <brian@linux-ccip.lan>
2020-06-24 14:46:52 +00:00
Dzmitry Malyshau
f042b4a7e9 [rs] Refactor examples API, improve belt documentation and logic 2020-06-23 23:51:47 -04:00
Dzmitry Malyshau
3397750c4d [rs] Staging belt, use LocalSpawner for the framework 2020-06-23 23:15:47 -04:00
Brian
6b4ee0d6d0 [rs] added test to validate that the capture example's png matches the screenshot.png that is in there
removed some warnings in the capture test about not handling results, and put expect messages around them

separated png logic from the rest of gpu logic in the capture example

refactored capture test to do assertion based on data rather than the output png

switched assertion for capture test to only check for red pixels instead of comparing to a raw buffer as a file

cleaned up capture example test to get rid of warnings
2020-06-23 20:24:48 -04:00
bors[bot]
24dbd6ab9e [rs] Merge #407
407: Build Docs with Nightly r=kvark a=cwfitzgerald

This builds docs with nightly by default. We use intra-doc links which is currently only supported with nightly. docs.rs also uses the latest nightly to build our code, so this will match behavior with docs.rs. I added a fallback to stable in case nightly has issues so we still have working docs.

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-23 13:22:24 +00:00
Connor Fitzgerald
355c7662dd [rs] Build Docs with Nightly 2020-06-23 09:19:40 -04:00
bors[bot]
7db29bf773 [rs] Merge #395
395: First Phase of Tracing Transition  r=kvark a=cwfitzgerald

## Connections

This is the wgpu-rs component of https://github.com/gfx-rs/wgpu/pull/740.

## Notable Changes
- Added annotations for non-trivial wrapper functions
- Enabled building all features on docs.rs
- Took a dep on tracing.
- Fixes an assert that randomly stopped compiling.
- Added env variable WGPU_CHROME_TRACING which will be a path to the output chrome trace, if the feature is enabled.
- Added feature which corresponds directly to wgc feature.

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-23 12:53:15 +00:00
Connor Fitzgerald
78fa7ba0a6 [rs] Add Tracing 2020-06-22 23:14:29 -04:00
Joshua Groves
7d671389a1 [rs] Make actions more consistent and use GITHUB_TOKEN 2020-06-22 23:23:50 -02:30
bors[bot]
6947184d55 [rs] Merge #389
389: build master docs r=grovesNL,kvark a=dakom

builds docs and deploys to `doc/` folder on gh_pages branch

doesn't interfere with other gh_pages contents.

assumes `ACCESS_TOKEN` is set as a github secret (if it isn't, please see https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line)

see live example on my fork: https://dakom.github.io/wgpu-rs/doc/wgpu/index.html

* closes #379



Co-authored-by: David Komer <david.komer@gmail.com>
2020-06-22 13:23:49 +00:00
bors[bot]
5055ffd408 [rs] Merge #404
404: wgpu update with RODS and memory fixes r=kvark a=kvark

Includes https://github.com/gfx-rs/wgpu/pull/741, https://github.com/gfx-rs/wgpu/pull/745, and https://github.com/gfx-rs/wgpu/pull/746

Co-authored-by: Dzmitry Malyshau <dmalyshau@mozilla.com>
2020-06-22 03:27:47 +00:00
Dzmitry Malyshau
1aee746232 [rs] wgpu update with RODS and memory fixes 2020-06-21 23:25:41 -04:00
bors[bot]
60615d68ac [rs] Merge #401 #402
401: Readme updates about the Gecko branch r=grovesNL a=kvark



402: Re-enable auto-deploy from gecko branch r=kvark a=grovesNL

As mentioned on Matrix, the `gecko` branch should be safe to use for auto-deployment to GitHub pages for the wgpu-rs examples on wasm.

We can use the `gecko` branch for now and eventually switch back to `master`.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
Co-authored-by: Joshua Groves <josh@joshgroves.com>
2020-06-21 00:23:05 +00:00
Joshua Groves
8c3778c2b4 [rs] Re-enable auto-deploy from gecko branch 2020-06-20 21:45:20 -02:30
bors[bot]
abd2dae241 [rs] Merge #396
396: Update wgpu without peek-poke r=cwfitzgerald a=kvark

Depends on https://github.com/gfx-rs/wgpu/pull/739
Everything works, however I think it's worth changing the render pass color/depth/stencil descriptors to be more rusty, e.g.
```rust
struct ColorAttachmentDescriptor {
  attachment: &'a TextureView,
  resolve_target: Option<&'a TextureView>,
  clear_color: Option<Color>,
  store_result: bool,
}

enum DepthStencilChannel<T> {
  ReadOnly,
  Mutable { clear_value: Option<T>, store_result: bool },
}
struct DepthStencilAttachmentDescriptor {
}
```
This would also involve wgpu-type/wgpu-core changes, but can be done as a follow-up (don't want to block on them).

There is a value in doing it in this PR, so that end users don't get multiple disruptions, but we need to find a proper shape first.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-20 23:26:00 +00:00
Dzmitry Malyshau
b4941b1939 [rs] Readme updates about the Gecko branch 2020-06-20 19:14:39 -04:00
Dzmitry Malyshau
dcca52a177 [rs] Another refactor of RenderPassDescriptor API 2020-06-20 19:07:06 -04:00
Dzmitry Malyshau
f8d6ab273b [rs] Update wgpu without peek-poke 2020-06-20 17:20:20 -04:00
bors[bot]
15fb850842 [rs] Merge #385
385: Move `backends: BackendBit` parameter to `Instance::new()` r=kvark a=Kimundi

Fixes #337
Blocked on https://github.com/gfx-rs/wgpu/pull/730.


Co-authored-by: Marvin Löbel <loebel.marvin@gmail.com>
2020-06-19 00:13:30 +00:00
Marvin Löbel
3404a12b76 [rs] Move backends: BackendBit paramter to Instance::new() 2020-06-19 01:25:38 +02:00
bors[bot]
581d725856 [rs] Merge #391
391: Change `include_spirv` macro to accept tokens r=cwfitzgerald a=neachdainn

The `include_spirv` macros was set to accept literals only. Unfortunately, this means that other macros, such as `concat` and `env` aren't accepted, making it unusable with build script-compiled shaders. This change allows those macros to be used to load the SpirV at the expense of a potentially less helpful error message as the `literal` requirement is differed to the `include_bytes` invocation.

Co-authored-by: Nathan Kent <nkent2@cs.rochester.edu>
2020-06-18 18:09:00 +00:00
Nathan Kent
b2eca13fcc [rs] Change SpirV macro from expr to tt
As suggested in the pull request.
2020-06-18 13:56:48 -04:00
Nathan Kent
c0a97b6224 [rs] Allow concat in SpirV macro
The `include_spirv` macros was set to accept literals only.
Unfortunately, this means that other macros, such as `concat` and `env`
aren't accepted, making it unusable with build script-compiled shaders.
This change allows those macros to be used to load the SpirV at the
expense of a potentially less helpful error message as the `literal`
requirement is differed to the `include_bytes` invocation.
2020-06-18 13:47:29 -04:00
bors[bot]
8e9d4778cd [rs] Merge #390
390: Example feature matrix r=cwfitzgerald a=kvark

This PR introduces a feature matrix to show what feature can be found in which example. I expect we'll be linking to it a lot :)

It also renames the `describe` example so that we can distinguish easily between ones that are framework-based and standalone ones (starting with "hello").

Concerns:
- the star may be a bit too bleak... I haven't found a better one that would be short to type (choosing a long one means editing is uncomfortable).
- sometimes hard to figure out what deserves a feature in the table and what not... still a win to have at least something here
- we need to do something with `capture`, see #387, but I haven't figured out what exactly

also r? @rukai 

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-18 17:16:42 +00:00
Dzmitry Malyshau
d121c7237e [rs] Example feature matrix 2020-06-18 13:15:41 -04:00
David Komer
ffd2ffbf45 [rs] build master docs
Deploys to gh_pages branch in `doc/` folder

* closes #379
2020-06-18 19:22:25 +03:00
bors[bot]
8bceed45a8 [rs] Merge #380
380: Documentation Pass r=kvark a=cwfitzgerald

The wgpu-rs component of https://github.com/gfx-rs/wgpu/pull/728.

Closes #378.

Notable changes not mentioned in wgpu PR:
- Reexported the wgt-local types whenever we have a type definition. These are reexported as `ThingBase`. This is unfortunately the only way to actually get their documentation to show up, aliases have no way of "inheriting" the documentation.
- Added wgpu logo to docs!
- Hid vertex_format_size macro.

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-18 15:11:00 +00:00
Connor Fitzgerald
63c8a60185 [rs] wgpu-rs documentation pass 2020-06-18 11:10:18 -04:00
bors[bot]
32f7dd744a [rs] Merge #384
384: Add include_spirv macro r=cwfitzgerald,rukai a=kvark

Depends on https://github.com/gfx-rs/wgpu/pull/729
Makes out shader loading in the examples a bit tidier.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-18 05:05:41 +00:00
Dzmitry Malyshau
c97a859387 [rs] Add include_spirv macro 2020-06-18 01:04:42 -04:00
bors[bot]
2369c74c99 [rs] Merge #382
382: Remove interface blocks from the water shaders r=kvark a=kvark

Fixes https://github.com/gfx-rs/gfx/issues/3274

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-17 15:04:08 +00:00
Dzmitry Malyshau
9cd109e67c [rs] Remove interface blocks from the water shaders 2020-06-17 11:03:02 -04:00