Commit Graph

384 Commits

Author SHA1 Message Date
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
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
bors[bot]
72eb0c7450 [rs] Merge #354
354: Update to wgpu with shader validation r=cwfitzgerald a=kvark

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

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-09 01:04:24 +00:00
Dzmitry Malyshau
30c8b64883 [rs] Update to wgpu with shader validation 2020-06-08 20:54:39 -04:00
bors[bot]
5f567e227a [rs] Merge #350
350: Implement Extensions Interface r=kvark a=cwfitzgerald

This implements https://github.com/gfx-rs/wgpu/pull/703 in wgpu-rs. Notable changes include the removal of the anisotropic field from the examples, in favor of the now mandatory `..Default::default()` syntax.

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-08 05:21:23 +00:00
Connor Fitzgerald
28c0b8f3a3 [rs] Implement extensions interface as described in wgpu#691 2020-06-08 01:20:00 -04:00
bors[bot]
e655053b56 [rs] Merge #353
353: Properly honor `mapped_at_creation` in `Device::create_buffer` r=cwfitzgerald a=kyren

The returned `Buffer` should immediately be mappable.  Fixes #351

Co-authored-by: kyren <kerriganw@gmail.com>
2020-06-06 21:15:07 +00:00
kyren
cb6931f87b [rs] Properly honor mapped_at_creation in Device::create_buffer
The returned `Buffer` should immediately be mappable.  Fixes #351
2020-06-06 15:55:15 -04:00
bors[bot]
8e96559672 [rs] Merge #348
348: Add aribitrary texture size handling to the capture example r=me a=rukai

* User can specify width + height via arguments.
* Defaults to (100, 200) when no arguments. Odd values chosen to make it more likely to pick up issues when testing.
* Converts from bgra as I believe that is the most commonly supported format for swapchains?

Co-authored-by: Rukai <rubickent@gmail.com>
2020-06-06 04:57:59 +00:00
Rukai
9f7775f98c [rs] Add aribitrary texture size handling to the capture example 2020-06-06 14:56:08 +10:00
bors[bot]
50cd507ca1 [rs] Merge #346
346: Add Makefile for shader compilation r=kvark a=HanKruiger

I couldn't find clear instructions on how to compile the shaders in the examples, and had to do some digging. So I added instructions to the README to hopefully save other people's time.

Sidenote: When I compile the shaders as they are now (with my instructions), I end up with different `.spv` shaders with (seemingly) equivalent behaviour. I expect this is due to a different version/environment of `glslang` (see below) but it could be a mistake on my part.

```
> glslangValidator --version        
Glslang Version: 8.13.3743
ESSL Version: OpenGL ES GLSL 3.20 glslang Khronos. 13.3743
GLSL Version: 4.60 glslang Khronos. 13.3743
SPIR-V Version 0x00010500, Revision 3
GLSL.std.450 Version 100, Revision 1
Khronos Tool ID 8
SPIR-V Generator Version 8
GL_KHR_vulkan_glsl version 100
ARB_GL_gl_spirv version 100
```

Cheers!

Co-authored-by: Han Kruiger <HanKruiger@users.noreply.github.com>
2020-06-04 15:20:08 +00:00
Han Kruiger
969642cb75 [rs] Add makefile for shader compilation
Add example shader compilation instructions

Arbitrary depth directory wildcard like globs aren't a thing in make wildcards.

Add phony targets as prerequisites of .PHONY
2020-06-04 17:15:51 +02:00
bors[bot]
8fedb8e9bc [rs] Merge #347
347: Add User Matrix Link r=kvark a=cwfitzgerald

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

Separated on a separate line, as it would otherwise wrap in an ugly way with the image.

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-03 20:47:12 +00:00
Connor Fitzgerald
028f7a2003 [rs] Add User Matrix Link 2020-06-03 16:40:43 -04:00
bors[bot]
d8e8268392 [rs] Merge #345
345: Rustify the example's use of Extensions and SamplerDescriptor r=kvark a=cwfitzgerald

Implements https://github.com/gfx-rs/wgpu/pull/696.

This didn't change any content from #338, just interface, but I tested a couple examples and it seems to work okay.

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-03 01:52:53 +00:00
Connor Fitzgerald
ed17f0abbb [rs] Rustify the example's use of Extensions and SamplerDescriptor 2020-06-02 21:44:07 -04:00
bors[bot]
94c262642f [rs] Merge #344
344: Use the new map-async r=kvark a=kvark

Depends on https://github.com/gfx-rs/wgpu/pull/675
It changes the API of mapping and removes `create_buffer_mapped`.
The new functionality is not implemented in Gecko yet, so this breaks the web target, for now.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-02 18:24:02 +00:00
Dzmitry Malyshau
3138509e56 [rs] Use the new map-async 2020-06-02 14:23:34 -04:00
bors[bot]
5514ac149f [rs] Merge #340
340: Read-only depth-stencil support r=kvark a=kvark

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

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-02 00:25:50 +00:00
Dzmitry Malyshau
197f4f943e [rs] Read-only depth-stencil support 2020-06-01 20:25:01 -04:00
bors[bot]
7699f1b3c7 [rs] Merge #338
338: Add Extension/Limit Interface r=kvark a=cwfitzgerald

Follow up to https://github.com/gfx-rs/wgpu/pull/690.

This forwards the extension/limit access interface into wgpu-rs.

It appears that the web-sys doesn't actually implement any of the methods we need, so I had them return the defaults. `Device::limits` exists, but it returns `Object` not `GpuLimits`, so doesn't appear usable.

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-01 17:19:04 +00:00