Commit Graph
416 Commits
Author SHA1 Message Date
Connor Fitzgerald cc5ff8e992 Implement MultiDrawIndirect Extensions 2020-06-28 01:39:17 -04:00
bors[bot]andGabriel Majeri 18be98d4bb 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 a801f64789 Improve hello-triangle docs 2020-06-27 21:25:22 +03:00
Gabriel Majeri 3720e96321 Improve crate docs 2020-06-27 21:25:19 +03:00
bors[bot]andConnor Fitzgerald 9d2747f4a4 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 5529b60da4 Convert Extensions + Capabilities into Features 2020-06-26 01:27:57 -04:00
b67d3f43e7 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](https://github.com/kvark/vange-rs/blob/e7bc944ef5a5a47d04cedd1c4d299295a1693fd3/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 e6ec327689 A different attempt at the example framework 2020-06-25 13:13:13 -04:00
kyren f05496fa59 Get event loop + futures working on native, untested on web 2020-06-25 13:13:13 -04:00
bors[bot]andBrian fb0f231045 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 aef72d7fd7 Refactor examples API, improve belt documentation and logic 2020-06-23 23:51:47 -04:00
Dzmitry Malyshau 4aa7abdff8 Staging belt, use LocalSpawner for the framework 2020-06-23 23:15:47 -04:00
Brian b3381bc7e3 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]andConnor Fitzgerald 90307b6715 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 a185bdc489 Build Docs with Nightly 2020-06-23 09:19:40 -04:00
bors[bot]andConnor Fitzgerald 445a9ecbe3 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 741644d252 Add Tracing 2020-06-22 23:14:29 -04:00
Joshua Groves 5a0b38c518 Make actions more consistent and use GITHUB_TOKEN 2020-06-22 23:23:50 -02:30
bors[bot]andDavid Komer b1137e9dcd 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]andDzmitry Malyshau 54eaa31f77 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 1b211fd0da wgpu update with RODS and memory fixes 2020-06-21 23:25:41 -04:00
6464852226 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 4ff921232c Re-enable auto-deploy from gecko branch 2020-06-20 21:45:20 -02:30
bors[bot]andDzmitry Malyshau 68461b1857 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 4b97de0237 Readme updates about the Gecko branch 2020-06-20 19:14:39 -04:00
Dzmitry Malyshau 3f57811e7a Another refactor of RenderPassDescriptor API 2020-06-20 19:07:06 -04:00
Dzmitry Malyshau 330986bc66 Update wgpu without peek-poke 2020-06-20 17:20:20 -04:00
bors[bot]andMarvin Löbel 5a7beb6e6c 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 693abce446 Move backends: BackendBit paramter to Instance::new() 2020-06-19 01:25:38 +02:00
bors[bot]andNathan Kent 4b34fda677 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 3984737743 Change SpirV macro from expr to tt
As suggested in the pull request.
2020-06-18 13:56:48 -04:00
Nathan Kent b0b577c9a3 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]andDzmitry Malyshau 214e49725c 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 262ac84f2c Example feature matrix 2020-06-18 13:15:41 -04:00
David Komer ac7b1a72a8 build master docs
Deploys to gh_pages branch in `doc/` folder

* closes #379
2020-06-18 19:22:25 +03:00
bors[bot]andConnor Fitzgerald 1c09f3d99e 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 ffde811da2 wgpu-rs documentation pass 2020-06-18 11:10:18 -04:00
bors[bot]andDzmitry Malyshau 69797d5421 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 65718c1e25 Add include_spirv macro 2020-06-18 01:04:42 -04:00
bors[bot]andDzmitry Malyshau 4e7d043a91 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 3f0e11fe47 Remove interface blocks from the water shaders 2020-06-17 11:03:02 -04:00
bors[bot]andNikita Krupitskas ddfe8d67d2 Merge #374
374: Add debug markers and debug markers example r=kvark a=krupitskas

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

Co-authored-by: Nikita Krupitskas <krupitskas@icloud.com>
2020-06-17 13:54:00 +00:00
bors[bot]andDzmitry Malyshau 0f55a67af2 Merge #377
377: Update with minBufferBindingSize r=cwfitzgerald a=kvark

Depends on https://github.com/gfx-rs/wgpu/pull/726
Also reverts #373 : buffer bindings now have to include at least one element of an unsized struct portion, so they can't be zero-sized.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-17 04:19:47 +00:00
Dzmitry Malyshau 47cbde6782 Update with minBufferBindingSize 2020-06-17 00:13:47 -04:00
bors[bot]andOptimisticPeach 715685988e Merge #375
375: Add water example.  r=kvark,cwfitzgerald a=OptimisticPeach

Solves #329, water example requested by @kvark.

I tuned it to my personal preference of visuals, however it might be different for you. 

Note: I used https://github.com/ashima/webgl-noise for 3D open simplex noise.

I've commented to explain what most of the things in the rust side of the example mean. However, I'm not 100% sure I did the best job at giving a brief overview, and wouldn't mind someone making sure my terminology/definitions are correct. 

Thanks!
Patrik

Co-authored-by: OptimisticPeach <patrikbuhring@yahoo.com>
2020-06-17 02:02:43 +00:00
Nikita Krupitskas f9ae9be70a Add debug markers and debug markers example 2020-06-16 11:13:03 +03:00
OptimisticPeach 2501a06cdd Add water example 2020-06-16 02:33:14 -04:00
bors[bot]andDzmitry Malyshau 0e2b612c5f Merge #376
376: Revert "API update for RODS2" r=kvark a=kvark

This reverts commit edb3610530.
It also update `wgpu` dependency to https://github.com/gfx-rs/wgpu/pull/723

Co-authored-by: Dzmitry Malyshau <dmalyshau@mozilla.com>
2020-06-15 22:17:32 +00:00
Dzmitry Malyshau fe42169e2e Revert "API update for RODS2"
This reverts commit edb3610530.
2020-06-15 18:16:14 -04:00
bors[bot]andConnor Fitzgerald b91513396a Merge #369
369: Implement SAMPLED_TEXTURE_ARRAY_NON_UNIFORM_INDEXING r=kvark a=cwfitzgerald

This implements https://github.com/gfx-rs/wgpu/pull/715 in wgpu-rs. I haven't changed the example, as I want to actually think up a better example to use and didn't want that to block this. It will change in the future however.

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-15 20:44:20 +00:00