Commit Graph

2761 Commits

Author SHA1 Message Date
bors[bot]
417ea69b45 Merge #704
704: Pipeline layout validation r=cwfitzgerald a=kvark

**Connections**
Implements a solid part of #269
Starts converting the function to return results, related to #638
cc @GabrielMajeri 

**Description**
This change matches shader bindings against the pipeline layout. It's *mostly* complete, minus some bugs and not handling the `storage_texture_format` properly.

The risk here is that Naga reflection may have bugs, or our validation may have bugs, and we don't want to break the user content while this is in flux. So the PR introduces an internal `WGPU_SHADER_VALIDATION` environment variable. Switching it to "0" skips Naga shader parsing completely and allows the users to unsafely use the API.

Another aspect of the PR is that some of the functions now return `Result`. The way I see us proceeding is that any errors that we don't expect users to handle should result in panics when `wgpu` is used natively (i.e. not from a browser). These panics would happen in the "direct" backend of wgpu-rs (as well as in wgpu-native), but the `Result` would not be exposed to wgpu-rs, so that it matches the Web behavior.

At the same time, browser implementations (Gecko and Servo) will check the result on their GPU process and implement the WebGPU error model accordingly. This means `wgpu-core` can be super Rusty and safe.

**Testing**
Running on wgpu-rs examples. Most of them fail to get parsed by Naga, but `boids` succeeds and passes validation 🎉 

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-06 22:01:49 +00: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]
041db60f90 Merge #703
703: Implement Extensions Interface r=kvark a=cwfitzgerald

## Description

This is the first step of implementing #691. This implements the described changes to all the core structs and to `SamplerDescriptor`. I intend this PR to be an example of what the plan looks like. If we think this works, we can roll out the rest of the changes either in bulk or as we need them. 

The rolling out of this is also tied to the rolling out of #689. Hopefully the macro work done in https://github.com/gfx-rs/wgpu-native/pull/34 will make this easier.

## Questions

One outstanding question I had is what the default values for lod_min/max should be. As of right now I just derive default, which puts them at zero, which is probably a reasonable default, though most of the examples use -100, 100 which is normally what you use when doing mipmapping.

## TODO:

- [ ] Discuss if this meets our needs
- [x] Implement this in wgpu-rs (https://github.com/gfx-rs/wgpu-rs/pull/350)
- [ ] Implement this in wgpu-native

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-06 12:56:04 +00:00
Connor Fitzgerald
f32cb103b8 Implement extensions interface as described in #691 2020-06-06 02:00:41 -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
Dzmitry Malyshau
15cdc794fa Shader binding validation 2020-06-05 12:48:34 -04:00
Dzmitry Malyshau
534d7ac504 Validate pipeline layout creation 2020-06-05 12:48:34 -04:00
Dzmitry Malyshau
f158709dd0 Validate bind group layouts 2020-06-05 12:48:34 -04:00
bors[bot]
581863a73a Merge #702
702: Fix SwapChainOutput Related Segfault r=kvark a=cwfitzgerald

If a user accidentally recreates a swapchain after grabbing a SwapChainOutput, then renders to it, this will trigger a segfault on render. This can be reproduced by replacing the get_next_frame code in any example with:

```rust
let frame = swap_chain
    .get_next_frame()
    .expect("Failed to acquire next swap chain texture")
    .output;
device.create_swap_chain(&surface, &sc_desc);
```

I have tested the examples, and they still work after this change, and it correctly detects this condition.

Oddly enough the following code does not panic, nor actually raise any errors, even with this PR.

```rust
let tmp = device.create_swap_chain(&surface, &sc_desc);
let frame = swap_chain
    .get_next_frame()
    .expect("Failed to acquire next swap chain texture")
    .output;
swap_chain = tmp;
```

I'm not entirely sure why.

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-05 03:57:56 +00:00
Connor Fitzgerald
08c0460e32 Add assert that old SwapChainOutput is dead after SwapChain is remade 2020-06-04 23:42:59 -04:00
bors[bot]
5f5f212d66 Merge #701
701: Prevent internal thread from cleanup r=kvark a=kvark

**Connections**
Fixes #700

**Description**
The logic that removes command allocators for threads that no longer use it was accidentally removing the one for the "main" thread.

**Testing**
Untested


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-05 02:47:41 +00:00
Dzmitry Malyshau
b5c38ae40d Prevent internal thread from cleanup 2020-06-04 22:45:59 -04: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]
277cf8d3bf Merge #698
698: Add User Matrix Link r=kvark a=cwfitzgerald

Gone are the days of people not knowing there are two matrixes (matrices?)

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-03 20:36:54 +00:00
Connor Fitzgerald
50a96c7ccf Add development matrix 2020-06-03 16:35:03 -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]
ac9587e9ce Merge #696
696: Rustification of Extensions and SamplerDescriptor r=kvark a=cwfitzgerald

**Connections**

This begins the rustificaiton of `wgpu-types` as discussed in #689, starting with `Extensions` and `SamplerDescriptor`.

#691 and the resulting discussion was used to advise the shape of the extension struct.

**Description**

The PR should be fairly straight forward. As discussed, I have left extensions as a bitflag until the webgpu-native issue can be opened and discussed regarding allocation of extensions.

The most controversial part of this will be the `AnisotropyLevel` enum. I created it for two reasons, one that matters, one that doesn't:
 - It means that, with the exception of enabling the aniso extension (and lod_bias), the sampler is correct by construction, which is helpful to both beginners and experts. It also better exposes the range of valid values and means less panics in user code.
 - It saves a byte in the `Option<u8>` 😄 

I definitely think that, if at all possible, we should have explicitly typed enums for "numbers" which have a limited amount of valid values (so _not_ lod bias, though that may be better expressed, idk) to make it very explicit which values can be accepted. This also feels more "rusty" and reduces the amount of "magicness" in the interface.

Ofc, I'm not married to the idea.

**Testing**

Follow up PR into wgpu-rs will include conversion of the examples.

**TODO**

- [x] wgpu-native pr rolling up this PR and #690 (https://github.com/gfx-rs/wgpu-native/pull/34)
- [x] wgpu-rs pr updating examples with the new structures (https://github.com/gfx-rs/wgpu-rs/pull/345)

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-03 01:34:22 +00:00
Connor Fitzgerald
ade7ce10b2 Rustification of Extensions and SamplerDescriptor 2020-06-02 21:04:25 -04:00
bors[bot]
78ab563541 Merge #695
695: Fix tracing of buffers that are mapped at creation r=kvark a=kvark

**Connections**
Fixes API tracing for the new API introduced in #675 

**Description**
When buffers are mapped at creation, we need to create a staging buffer and copy into them. This implies COPY_DST, which isn't visible to the user. And this only applies to buffers without MAP_WRITE, in which case we are just mapping directly.

**Testing**
Tested locally on the `cube`. It would be great to automate API trace testing on CI.

Co-authored-by: Dzmitry Malyshau <dmalyshau@mozilla.com>
2020-06-02 20:34:31 +00:00
Dzmitry Malyshau
075e683cb5 Fix tracing of buffers that are mapped at creation 2020-06-02 16:30:41 -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]
9120f0399c Merge #675
675: New map_async logic r=cwfitzgerald a=kvark

Matches upstream changes in https://github.com/gpuweb/gpuweb/pull/708 and https://github.com/gpuweb/gpuweb/issues/796
TODO:
- wgpu-native PR
- wgpu-rs https://github.com/gfx-rs/wgpu-rs/pull/344

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-02 17:45:47 +00:00
Dzmitry Malyshau
cc418e747d Implement Default for BufferSize and PowerPreference 2020-06-02 13:44:12 -04:00
Dzmitry Malyshau
1acd1901de Fix bytes_per_row used in write_texture 2020-06-02 13:44:12 -04:00
Dzmitry Malyshau
ae17ea7625 New map_async logic, change the semantic of mapped buffers. 2020-06-02 13:44:00 -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]
fbc2c87de6 Merge #685
685: Read-only depth-stencil support (RODS) r=cwfitzgerald a=kvark

**Connections**
Fixes #680 
- [ ] wgpu-native update
- [x] wgpu-rs update - https://github.com/gfx-rs/wgpu-rs/pull/340

**Description**
~~Interestingly, this requires us to create an extra pipeline state for RODS-compatible render pipelines (one main, and one with read-only depth-stencil). This also means we are creating another compatible render pass, internally (done once).~~

**Testing**
I don't know for sure that this works properly, but I'd be comfortable landing this at least if the existing functions aren't broken.


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-02 00:11:54 +00:00
Dzmitry Malyshau
aa12e7dc14 Read-only depth-stencil support 2020-06-01 19:54:56 -04:00
bors[bot]
bd50867bb8 Merge #694
694: player: enable x11 on Unix/Vulkan r=kvark a=kvark

Needed as it's no longer default in `wgpu-core` with #678

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-01 20:57:20 +00:00
Dzmitry Malyshau
e648516ff9 player: enable x11 on Unix/Vulkan 2020-06-01 16:54:40 -04:00
bors[bot]
201073b0f6 Merge #679
679: Enforce copy buffer-texture alignment r=cwfitzgerald a=kvark

**Connections**
This is a follow-up to #666 

**Description**
We are now enforcing the `bytes_per_row` on copy-texture copies to `COPY_BYTES_PER_ROW_ALIGNMENT`.
We allow it being non-aligned for `write_texture`, which now has the code to properly align the staging space it uses, and to copy the rows one by one with proper alignment.

We are also moving `BufferSize` to wgpu-types, because it's required for wgpu-rs to build.

**Testing**
Testing this needs https://github.com/gfx-rs/wgpu-rs/pull/328, which is blocked by https://github.com/gfx-rs/wgpu-rs/pull/323


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2020-06-01 20:52:38 +00:00
Dzmitry Malyshau
321a5cee0f Enforce copy buffer-texture row pitch alignment 2020-06-01 16:51:42 -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
Connor Fitzgerald
60260ffcdc [rs] Add Extension/Limit interface 2020-06-01 13:08:56 -04:00
bors[bot]
3a6cdeec94 Merge #690
690: Implement Anisotropic Filtering Extension and Expose Extension Interface r=kvark a=cwfitzgerald

**Connections**

Resolves #568.

**Description**

This PR solves two tightly related problems:
 - Adds the ability to create a sampler with anisotropic filtering
 - Adds the webgpu interface for getting the limits/extensions on adapters and devies.

**Testing**

I have tested this against my codebase which uses it. Adding an example in wgpu-rs on how to use extensions/limits would be good, especially as we have native/webgpu extensions, but can come as a future enhancement, once we feel the extension situation has stabilized a bit.

**TODO**

- [x] Allow wgpu-rs to call limit/extension interface (https://github.com/gfx-rs/wgpu-rs/pull/338)
- [ ] Determine how wgpu-native is going to adopt this functionality.
- [ ] After discussing #691, what changes need to be made. 

Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2020-06-01 16:05:00 +00:00
Connor Fitzgerald
415ce97415 Implement anisotropic filtering and extensions/limits 2020-06-01 10:43:54 -04:00
bors[bot]
2d53aaa9c1 [rs] Merge #336
336: Update wgpu dependency r=kvark a=kvark

Includes a fix to #333

Co-authored-by: Dzmitry Malyshau <dmalyshau@mozilla.com>
2020-05-31 16:26:53 +00:00
Dzmitry Malyshau
fb938c222b [rs] Update wgpu dependency 2020-05-31 12:24:41 -04:00
bors[bot]
1a569ebe89 Merge #688
688: Fix recycling of command buffers r=kvark a=kvark

**Connections**
Fixes https://github.com/gfx-rs/wgpu-rs/issues/333

**Description**
We used `lowest_common_submission()` for figuring out when to reset command buffers, but it returns !0 when there are no active submissions. Instead, we are using the exising "last done" semantics here, which works better.

**Testing**
Tested on wgpu-rs examples.

Co-authored-by: Dzmitry Malyshau <dmalyshau@mozilla.com>
2020-05-31 15:54:41 +00:00
Dzmitry Malyshau
6fb2b272e4 Fix recycling of command buffers 2020-05-31 11:50:24 -04:00
Dzmitry Malyshau
d3fcd4711c [rs] Enable X11 in Vulkan (#335)
* Enable X11 in Vulkan

* Fix Cargo comments
2020-05-31 11:40:33 -04:00
bors[bot]
d065ecffe7 [rs] Merge #323
323: Rename SwapChain::get_next_texture to SwapChain::get_next_frame, and return errors to the user. r=kvark a=AlphaModder

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

This creates a new type `SwapChainResult` just for the method. 
It also alters the signature of `Context::swap_chain_get_next_texture` to return 
```rust
(Option<Self::TextureViewId>, wgt::SwapChainStatus, Self::SwapChainOutputDetail)
```
which is a little ugly but I couldn't think of anything better. 

Co-authored-by: AlphaModder <quasiflux@gmail.com>
2020-05-31 05:19:03 +00:00