Commit Graph
8897 Commits
Author SHA1 Message Date
Dzmitry Malyshau e7502d0a9b hlsl: factor storage logic into a separate module 2021-07-26 01:29:42 -04:00
Dzmitry Malyshau 284cfcce47 hlsl: storage writes 2021-07-26 01:29:42 -04:00
Dzmitry Malyshau 4b6846d5da hlsl: storage reads support, array length 2021-07-26 01:29:42 -04:00
bors[bot]andRiccardo Zaglia 3eb3eed8cf Merge #1609
1609: [Vulkan] Initialize wgpu objects from raw handles r=kvark a=zarik5

**Connections**
This PR is a successor of https://github.com/gfx-rs/gfx/pull/3762

**Description**
The `handle_is_external` flag mechanism was not enough to ensure safety, when for example the Instance is wrapped in `Arc<>` and a library cannot keep track of all its clones. This is the case with the bevy render rewrite. The solution was to let wgpu be in charge of destroying the handles, but it also has to keep a reference to a "drop guard" which is always dropped after the handle is destroyed. For the OpenXR integration, this drop guard will be `xr::Instance`.

For now this is just a proof of concept. Only instance creation is handled, and there is even type error in `wgc::Instance::from_hal()`.

I have a few concerns:
* Is it ok to expose `hal::Instance` from the wgpu crate? Or should the user pass all the parameters so `hal::Instance` can be constructed internally? This second options is more disruptive, since the wgpu-types crate would need to import all platform-specific crates to define the structure/enum to hold the raw handles.
* Without counting the call to create the `hal::Instance`, there are 4 indirection calls to save the raw instance. Can this be optimized in any way?

Do you think it is possible to merge wgpu-hal into wgpu-core? This could help with reducing the distance from the surface level API to the platform specific APIs even more.

**Testing**
Vulkan/Android (Oculus Quest) using [this sample](https://github.com/zarik5/openxrs/blob/wgpu-test/openxr/examples/vulkan.rs).


Co-authored-by: Riccardo Zaglia <riccardo.zaglia5@gmail.com>
2021-07-26 05:03:13 +00:00
bors[bot]andZicklag ee9e1452d5 Merge #1717
1717: Work Around Fastclear Bug for Web and Native GL r=cwfitzgerald,kvark a=zicklag

**Connections**
Resolves #1627 

**Description**
Works around Mesa fastclear bug by doing a manual shader clear on effected platforms

**Testing**
Tested on Mesa Intel(R) UHD Graphics (CML GT2) (Gl)


Co-authored-by: Zicklag <zicklag@katharostech.com>
2021-07-26 04:57:17 +00:00
Riccardo Zaglia 2657849977 [Vulkan] Initialize wgpu objects from raw handles 2021-07-25 21:51:40 +02:00
Gordon-F 526a29e2b8 [glsl-out] Fix array type writing and zero initialization for local variables 2021-07-24 17:53:24 -04:00
Gordon-F 9bd0abb987 [hlsl-out] Fix local variable writing with array type 2021-07-24 17:53:24 -04:00
Gordon-F 7dd9e14a3d Add note about sint array size in comment 2021-07-24 17:53:24 -04:00
Gordon-F 7bb28201dd Allow to translate from bool to another type in validator 2021-07-24 17:53:24 -04:00
Gordon-F 3000232844 [hlsl-out] Write sint array size 2021-07-24 17:53:24 -04:00
Zicklag 0a66eef822 Work Around Fastclear Bug for Web and Native GL 2021-07-24 15:36:49 -05:00
Michael MacLeod fd33ac36d4 Document coordinate systems in README
I had to do a bit of digging to find information about coordinate systems in
wgpu (asking on Matrix). This commit adds a table of coordinate systems to help
clarify the issue.

The table comes from the DX12 backend documentation of gfx-rs:
https://github.com/gfx-rs/gfx/tree/master/src/backend/dx12

Remove trailing newlines from README

Host coordinate images locally
2021-07-24 13:17:04 -07:00
bors[bot]andZicklag dd1be1ff62 Merge #1721
1721: Tweak Water Example to Show Off Water Shader a bit More r=cwfitzgerald a=zicklag

**Connections**
None

**Description**
Tweaks the water shader example terain and camera to show off the cool water shader a little bit more. 😄


https://user-images.githubusercontent.com/25393315/126842645-e353c0eb-57fc-4b8e-9e0d-901f08c7e9f7.mp4



**Testing**
Tested on vulkan and GL on linux.


Co-authored-by: Zicklag <zicklag@katharostech.com>
2021-07-24 20:16:51 +00:00
Zicklag 7fab8e213c Tweak Water Example to Show Off Water Shader More 2021-07-24 15:04:42 -05:00
bors[bot]andDzmitry Malyshau d5a477fe60 Merge #1719
1719: hal/dx12: pass null to mapping rects r=kvark a=kvark

**Connections**
See https://github.com/baldurk/renderdoc/issues/2323

**Description**
Passing NULL rects is better for tooling, as it turns out.

**Testing**
Ran the examples


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-07-23 16:24:12 +00:00
Dzmitry Malyshau 2158cdd43b hal/dx12: pass null to mapping rects 2021-07-23 12:19:59 -04:00
Igor Shaposhnik ff14f04734 [glsl-out] Fix bitcast operation for the same types 2021-07-23 11:47:46 -04:00
bors[bot]andDzmitry Malyshau 5dd3f6ba6b Merge #1710
1710: Check render bundle encoding for RODS r=cwfitzgerald a=kvark

**Connections**
Matches https://github.com/gpuweb/gpuweb/pull/1979

**Description**
Allows render bundles to be encoded for RODS.
In addition, validates that bundle RODS matches the pass RODS when executing. This part of the spec isn't written yet, and it's safer to be on the strict side.

**Testing**
Untested


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-07-23 15:36:32 +00:00
Dzmitry Malyshau 52734bf87a Fix tracing feature for RODS 2021-07-23 11:33:22 -04:00
Dzmitry Malyshau 34b68121c6 Check bundle RODS against pass RODS 2021-07-23 11:24:05 -04:00
Dzmitry Malyshau bb218c1580 Check render bundle encoding for RODS 2021-07-23 11:24:05 -04:00
bors[bot]andGordon-F 35896df3b7 Merge #1716
1716: Update winit to 0.25 r=kvark a=Gordon-F

**Connections**


**Description**
Update winit to 0.25

**Testing**
Examples


Co-authored-by: Gordon-F <ishaposhnik@icloud.com>
2021-07-23 15:05:45 +00:00
bors[bot]andDzmitry Malyshau 29f9e2a58e Merge #1718
1718: Update naga to bbfa9a0, tweak DX12 debug output r=kvark a=kvark

**Connections**
Picks up #1132

**Description**
Also reduces the spam output of DX12 backend

**Testing**
Got skybox and water examples running!


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-07-23 14:51:08 +00:00
Dzmitry Malyshau 8dc4942431 Update naga to bbfa9a0, tweak DX12 debug output 2021-07-23 10:48:32 -04:00
Dzmitry Malyshau bbfa9a0f9e hlsl: remove the boolean casts for unary operators 2021-07-23 10:41:36 -04:00
Gordon-F f0b1d5a673 Update winit to 0.25 2021-07-23 14:30:38 +03:00
bors[bot]andDzmitry Malyshau a0bcd86207 Merge #1714
1714: Update Naga to cc91c77 r=kvark a=kvark

**Connections**
Picks up https://github.com/gfx-rs/naga/pull/1128 and other HLSL fixes.
Complements #1713

**Description**
Just an update

**Testing**
Ran examples locally 


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-07-23 06:20:11 +00:00
Dzmitry Malyshau 2c45796d9c Update Naga to cc91c77 2021-07-23 02:19:42 -04:00
Dzmitry Malyshau cc91c77f7a hlsl: fix vector multiplication 2021-07-23 02:11:32 -04:00
bors[bot]andDzmitry Malyshau 1f7d60d065 Merge #1713
1713: hal/dx12: rewrite view creation, use arrays more aggressively r=kvark a=kvark

**Connections**

**Description**
D3D12 has this thing where you can't create a 2D view with non-zero base array index.
So we have special logic now to fall back to 2D array views in these cases.

**Testing**
Tested on the Shadow example.


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-07-23 06:07:18 +00:00
bors[bot]andDzmitry Malyshau 5ef620ace8 Merge #1704
1704: Fix buffer memory initialization to use the tracker consistently r=kvark a=kvark

**Connections**
Depends on https://github.com/gfx-rs/naga/pull/1125

**Description**
Contains a number of dx12 fixes in addition to the buffer initialization fix.
The problem there was - we used the "pending writes" command buffer to initialize buffers, but also used the device's resource tracker and its state to figure out the transitions *after* a command buffer is merged its states.

**Testing**
Ran the examples on Vulkan.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-07-23 04:48:42 +00:00
Dzmitry Malyshau 726cf4f614 hal/dx12: rewrite view creation, use arrays more aggressively 2021-07-23 00:07:23 -04:00
Dzmitry Malyshau c526383cf8 hlsl-out: write StructuredBuffer 2021-07-22 15:44:26 -04:00
bors[bot]andDiggory Hardy a32310096e Merge #1705
1705: Fix failure mode of adapter_request_device (direct backend) r=kvark a=dhardy

This function has a method for reporting errors, so it shouldn't panic IMO.

Possibly though we should adapt the `RequestDeviceError` type to have a `cause: Box<dyn Error>` payload? The `log::error` line is just because we have no other way of reporting this value.

I tried to test this, but...

- on v0.9 I couldn't make the request fail, even with requesting absurd limits like 1e9 something
- on master the adapter request succeeds, then the shader creation fails with `UnsupportedCapability(Float64)` (even though the request contains `wgpu::Features::SHADER_FLOAT64` and does not fail)

So the `direct` or Vulkan backend does not check features properly?

Co-authored-by: Diggory Hardy <git@dhardy.name>
2021-07-22 19:14:03 +00:00
bors[bot]andmunrocket 10638f830f Merge #1707
1707: Update naga revision r=kvark a=munrocket

**Connections**
https://github.com/gfx-rs/naga/pull/1096

**Description**
Updating `naga` with new WGSL operator `select(f, t, cons)`.

**Testing**
`cargo test` passed


Co-authored-by: munrocket <munrocket@pm.me>
2021-07-22 16:53:54 +00:00
munrocket f909a8e631 update naga revision 2021-07-22 20:52:26 +04:00
Dzmitry Malyshau 20c4d2c3d1 Add MSAA depth texture type 2021-07-22 10:39:24 -04:00
bors[bot]andConnor Fitzgerald 753cc25e13 Merge #1703
1703: Add Rgb9e5Ufloat Format r=kvark a=cwfitzgerald

**Connections**

Addresses part of #967, a wgpu-hal followup to #955.

**Description**

This adds only `Rgb9e5Ufloat`. I removed the explicit numbering from the texture format so we don't have to constantly re-number things. The default numbering is identical to what we were doing.

**Testing**

All backends unconditionally support it, so little testing is needed.


Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2021-07-22 05:22:48 +00:00
Dzmitry Malyshau 09c9ab5e75 Fix buffer memory initialization to use the tracker consistently 2021-07-22 01:19:53 -04:00
Connor Fitzgerald 683d03a8e4 Add Rgb9e5Ufloat 2021-07-21 23:54:46 -04:00
Zicklag 12f25c8ce4 Prune Unused, Unsized Types From GLSL Output 2021-07-21 18:26:20 -04:00
Zicklag bdcab53231 Skip Early Depth Test When Unsupported in GLSL 2021-07-21 18:25:04 -04:00
bors[bot]andDzmitry Malyshau 5c28684bb1 Merge #1702
1702: Rename InputStepMode to VertexStepMode r=kvark a=kvark

**Connections**
https://github.com/gpuweb/gpuweb/pull/1927

**Description**
Just a rename

**Testing**
No need


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-07-21 21:50:12 +00:00
Dzmitry Malyshau 1a9a855ea9 Rename InputStepMode to VertexStepMode 2021-07-21 17:48:00 -04:00
bors[bot]andDzmitry Malyshau d1068e915c Merge #1701
1701: hal/vk: use actual view usage for imageless framebuffers r=kvark a=kvark

**Connections**
Fixes #1700

**Description**
Vulkan spec is confusing. See [attachment info](https://www.khronos.org/registry/vulkan/specs/1.2-extensions/man/html/VkFramebufferAttachmentImageInfo.html):
> usage is a bitmask of VkImageUsageFlagBits, matching the value of VkImageCreateInfo::usage used to create an image used with this framebuffer.

It doesn't talk about interaction with `ImageViewUsageCreateInfo`, which allows you to constrain the usage on a view.

**Testing**
Unable to test right now. `@initial-algebra` could you give it a spin?


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-07-21 18:34:30 +00:00
Diggory Hardy 4e98245d8b Fix failure mode of adapter_request_device (direct backend) 2021-07-21 17:49:25 +01:00
Dzmitry Malyshau 8a971fcf2e hal/vk: use actual view usage for imageless framebuffers 2021-07-21 12:14:20 -04:00
bors[bot]andDiggory Hardy 2e80e881ea Merge #1698
1698: Feature-gate include_spirv macro r=cwfitzgerald a=dhardy

`wgpu::util::make_spirv` is gated behind the `spirv` feature; the `include_spirv` macro should be too.

Error before this change (with macro-backtrace on):
```
error[E0425]: cannot find function `make_spirv` in module `$crate::util`
  --> /home/dhardy/.cargo/git/checkouts/wgpu-53e70f8674b08dd4/145da6a/wgpu/src/macros.rs:54:39
   |
48 | / macro_rules! include_spirv {
49 | |     ($($token:tt)*) => {
50 | |         {
51 | |             //log::info!("including '{}'", $($token)*);
...  |
54 | |                 source: $crate::util::make_spirv(include_bytes!($($token)*)),
   | |                                       ^^^^^^^^^^ not found in `$crate::util`
...  |
57 | |     };
58 | | }
   | |_- in this expansion of `include_spirv!` (#2)
   | 
  ::: kas-wgpu/src/draw/shaders.rs:24:1
   |
24 | / macro_rules! create {
25 | |     ($device:ident, $path:expr) => {{
26 | |         $device.create_shader_module(&include_spirv!($path))
   | |                                       --------------------- in this macro invocation (#2)
27 | |     }};
28 | | }
   | |_- in this expansion of `create!` (#1)
...
42 |           let frag_glyph = create!(device, "shaders/glyph.frag.spv");
   |                            ----------------------------------------- in this macro invocation (#1)
```


Co-authored-by: Diggory Hardy <git@dhardy.name>
2021-07-21 13:05:17 +00:00
Diggory Hardy afc1951f9f Feature-gate include_spirv macro 2021-07-21 10:08:31 +01:00