Commit Graph

403 Commits

Author SHA1 Message Date
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
bors[bot]
0d807b7d26 [rs] 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]
fa5b6bd6d7 [rs] 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
24a4faf065 [rs] Update with minBufferBindingSize 2020-06-17 00:13:47 -04:00
bors[bot]
4043a10fbc [rs] 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
6a0a4d6c9d [rs] Add debug markers and debug markers example 2020-06-16 11:13:03 +03:00
OptimisticPeach
2ad472538c [rs] Add water example 2020-06-16 02:33:14 -04:00
bors[bot]
6fa9f46fbc [rs] 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
06f4c122c6 [rs] Revert "API update for RODS2"
This reverts commit edb3610530.
2020-06-15 18:16:14 -04:00
bors[bot]
f340882712 [rs] 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
Connor Fitzgerald
8b60da572f [rs] Implement SAMPLED_TEXTURE_ARRAY_NON_UNIFORM_INDEXING 2020-06-15 15:09:06 -04:00
bors[bot]
4804fe496b [rs] Merge #373
373: add test case for empty buffer r=kvark a=rukai

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

Co-authored-by: Rukai <rubickent@gmail.com>
2020-06-15 02:26:27 +00:00
Rukai
4b0534949b [rs] add test case for empty buffer 2020-06-15 12:18:58 +10:00
bors[bot]
ee7e1c7705 [rs] Merge #370
370: API update for RODS2 r=cwfitzgerald a=kvark

Reflects upstream changes in https://github.com/gfx-rs/wgpu/pull/716
I'm not too happy about the API just yet, has another idea that I'm going to discuss with the group on Monday, hopefully. But we need to get going and not block other wgpu-rs changes, so this should land in some way.

Co-authored-by: Dzmitry Malyshau <dmalyshau@mozilla.com>
2020-06-14 13:25:59 +00:00
Dzmitry Malyshau
6cf328f326 [rs] API update for RODS2 2020-06-14 09:25:13 -04:00
bors[bot]
91c4849be9 [rs] Merge #357
357: Render bundle support, use in msaa-line example r=cwfitzgerald a=kvark



Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-12 23:07:36 +00:00
Dzmitry Malyshau
5e2d0d7680 [rs] Render bundle support, use in msaa-line example 2020-06-11 22:59:40 -04:00
bors[bot]
55eec80920 [rs] Merge #360
360: Implement TEXTURE_BINDING_ARRAY extension r=kvark a=cwfitzgerald

This extends https://github.com/gfx-rs/wgpu/pull/711 into wgpu-rs.

Notable changes: 
- Added an example showing off both this extension and the future descriptor indexing extension.
- Changed the framework so there is a static function showing what extensions you need. This is provided by the trait,, which defaults to no extensions, so existing examples and new ones don't have to care about extensions.

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-11 20:37:46 +00:00
Connor Fitzgerald
200025e3cc [rs] Implement TEXTURE_BINDING_ARRAY extension 2020-06-11 16:36:53 -04:00
bors[bot]
9842d2065f [rs] Merge #366
366: Fix buffer mapping examples r=cwfitzgerald a=lachlansneff

Fixes #364 

Co-authored-by: Lachlan Sneff <lachlan.sneff@gmail.com>
2020-06-11 16:09:55 +00:00
Lachlan Sneff
5216fd3285 [rs] Fix buffer mapping examples 2020-06-11 12:07:47 -04:00
bors[bot]
031f6f58c5 [rs] Merge #356
356: Add generic ranges to buffer mapping api and make it safe. r=kvark a=lachlansneff

[Rendered](https://charted.space/notes/wgpu-rs/wgpu/struct.Buffer.html)

The safety issues with the current api (being able to unmap while still holding a slice to mapped data) are fixed by having `get_mapped_range` and `get_mapped_range_mut` return `BufferView` and `BufferViewMut`, which notify the buffer that those ranges are no longer being used when they're dropped. `Buffer.unmap` asserts that the list of mapped ranges is empty, therefore it is safe.

Co-authored-by: Lachlan Sneff <lachlan.sneff@gmail.com>
2020-06-10 17:46:36 +00:00
Lachlan Sneff
785f26bab3 [rs] Add BufferView and BufferViewMut and fix safety issues with mapped range. 2020-06-09 20:03:28 -04:00