Commit Graph
8897 Commits
Author SHA1 Message Date
Gordon-F 82b2fe4410 [glsl-out] Fix zero initialization 2021-07-20 16:28:44 -04:00
Gordon-F e017cb402e [glsl-out] Add stage postfix for block structs 2021-07-20 16:28:44 -04:00
Zicklag 140a9bfa8f Fix Regression With CLI Not Working for Validation
Allows output file to be left empty to perform validation only.
2021-07-20 16:13:16 -04:00
Zicklag 80bdc74770 Gate GLSL Dynamic Array Size to Supported Versions
Will fail with an error when trying to generate a GLSL shader that has
dynamically sized arrays in a version of GLSL that does not support
dynamically sized arrays.
2021-07-20 16:00:39 -04:00
Zicklag a0e50e3eac Improve CLI Argument Doc and Error Handling
- Use argh for parsing commandline arguments and generating help message
- Remove almost all panics and handle errors by printing them and
exiting 1
2021-07-20 13:54:30 -04:00
Zicklag c6c7996480 Fix Documentation Typo 2021-07-20 13:53:43 -04:00
bors[bot]andDzmitry Malyshau 145da6af8b Merge #1696
1696: hal/dx12: reset command pool r=kvark a=kvark

**Connections**

**Description**
Fixes the memory leak in bunnymark on DX12

**Testing**
example!


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-07-20 14:40:59 +00:00
Dzmitry Malyshau e9a2a1e438 hal/dx12: reset command pool 2021-07-20 10:39:40 -04:00
Zicklag 34b486f74b Add Explicit Int Precision for GLSL ES Backend 2021-07-20 10:16:33 -04:00
bors[bot]andDzmitry Malyshau 849b3134e0 Merge #1694
1694: hal/dx12: fix the binding model r=kvark a=kvark

**Connections**
Depends on https://github.com/gfx-rs/naga/pull/1114
Makes the halmark + bunnymark run on DX12

**Description**
There was a mess-up in trying to use top-down layout...
Also fixes double-free on the queue in DX12.

**Testing**
Examples


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-07-20 14:08:39 +00:00
Dzmitry Malyshau be13fe3048 hal/dx12: fix the binding model 2021-07-20 10:07:40 -04:00
Dzmitry Malyshau 7b9b56a6ab hlsl-out: use * for vector by vector multiplication 2021-07-20 09:57:59 -04:00
Dzmitry Malyshau 37d094ca07 hlsl-out: omit globals that aren't accessible 2021-07-20 02:16:31 -04:00
Gordon-F 3c98cc5ae1 [hlsl-out] Validate all entry points in Makefile 2021-07-20 01:03:58 -04:00
Jim Blandy f3c7537609 Add tests for sampling mipmapped and multisampled images.
Prior to this change, nothing in the test suite exercised the SPIR-V backend
code for generating LOD or Sample arguments to OpImageFetch instructions.
2021-07-20 01:01:55 -04:00
bors[bot]andCraig 2f4be497e4 Merge #1692
1692: Avoid dev-dep on image r=cwfitzgerald a=Craig-Macomber

**Connections**
_Link to the issues addressed by this PR, or dependent PRs in other repositories_

#1610

**Description**
_Describe what problem this is solving, and how it's solved._

This removes image from the dev-deps, reducing build time/size.

Looks like noise was pulling in image with all formats enabled:
├── noise v0.7.0
│   ├── image v0.23.14

This was fixed in https://github.com/Razaekel/noise-rs/commit/1af9e1522236b2c584fb9a02150c9c67a5e6bb04#diff-2e9d962a08321605940b5a657135052fbcef87b5e360662bb527c96d9a615542 which has not been released yet.

For now, we can workaround this with:
noise = { version = "0.7", default-features = false }

**Testing**
_Explain how this change is tested._

Ran `cargo build` as well as `cargo run --example water`

Co-authored-by: Craig <CraigM@CraigM.info>
2021-07-19 20:17:44 +00:00
bors[bot]andCraig 63823c3a3c Merge #1691
1691: Fix a couple of spelling errors in comments r=cwfitzgerald a=Craig-Macomber

**Connections**
_Link to the issues addressed by this PR, or dependent PRs in other repositories_

None.

**Description**
_Describe what problem this is solving, and how it's solved._

Fixes a couple spelling errors my spell checker highlighted when reading the source.

**Testing**
_Explain how this change is tested._

Spell checker stopped highlighting the words.

Co-authored-by: Craig <CraigM@CraigM.info>
2021-07-19 20:10:08 +00:00
Craig 7b4bd2f788 Avoid depending on image 2021-07-19 12:43:19 -07:00
Craig e837a589ad Fix a couple of spelling errors 2021-07-19 11:25:19 -07:00
bors[bot]andDzmitry Malyshau 1090110edb Merge #1687
1687: Update naga, use binding map in DX12 r=kvark a=kvark

**Connections**
Updates naga with https://github.com/gfx-rs/naga/pull/1105

**Description**
Establishes a binding map contract between dx12 backend and naga.

**Testing**
Gets the cube running, but there is something strange there.


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-07-18 16:04:48 +00:00
Dzmitry Malyshau 35145615bf Update naga, use binding map in DX12 2021-07-18 12:03:14 -04:00
Dzmitry Malyshau feee1a2edb hlsl-out: switch register to u32 2021-07-18 11:33:46 -04:00
Dzmitry Malyshau 39eaa57a77 hlsl-out: implement constant buffer support 2021-07-18 02:21:01 -04:00
Dzmitry Malyshau 16206f2eb2 hlsl-out: unlock globals.wgsl test, override skybox bindings 2021-07-18 02:21:01 -04:00
Dzmitry Malyshau 0d94b76d1e hlsl-out: rewrite texture coordinate construction 2021-07-18 02:21:01 -04:00
Dzmitry Malyshau 51fb9bb77a hlsl-out: remap bindings 2021-07-18 02:21:01 -04:00
Dzmitry Malyshau 2a253ab838 hlsl-out: derive register based on storage class 2021-07-18 02:21:01 -04:00
bors[bot]andinitial-algebra 4e7c7a3b77 Merge #1676
1676: Add `Feature::SHADER_PRIMITIVE_INDEX` to support `builtin(primitive_index)` in fragment shaders r=kvark a=initial-algebra

**Connections**
https://github.com/gfx-rs/wgpu/issues/1669
https://github.com/gfx-rs/naga/pull/1097

**Description**
Allows fragment shaders to access the index of the current primitive via a new builtin variable.

**Testing**
Works on my machine.

- passes the capability to my fork of `naga` for basic validation and translation
- enables the `geometryShader` feature for Vulkan
- is refused by DX12

Needs to be implemented and tested for OpenGL, DirectX and Metal.

Co-authored-by: initial-algebra <67286231+initial-algebra@users.noreply.github.com>
2021-07-18 04:34:38 +00:00
initial-algebra 0db00e9657 Implement Feature::SHADER_PRIMITIVE_INDEX on Vulkan 2021-07-17 15:31:35 -03:00
Jasper St. Pierre c7dd717b4c wgsl: Don't output interpolate(flat) for non-float arguments (#1103) 2021-07-17 01:19:11 -04:00
Dzmitry Malyshau 8f71a368ef Validate the exact MSL version (#1101) 2021-07-16 23:56:15 -04:00
Jim Blandy 337e40a2be Enable logging in WGSL and SPIR-V tests. (#1098)
Use env_logger::try_init to avoid complaints about repeated initialization. This
function is thread-safe.
2021-07-16 23:09:48 -04:00
bors[bot]andJoshua Groves 22139c6a46 Merge #1618
1618: webgpu: pass wgsl directly r=kvark a=grovesNL

**Connections**
Matrix conversation about passing WGSL to Gecko

**Description**
Gecko accepts WGSL now, so we can pass it directly instead of going through naga.

We could also consider converting SPIR-V to WGSL soon, assuming nobody is relying on the SPIR-V path with older versions of Gecko. We could do that in a separate PR though.

**Testing**
Tried hello-compute locally, using the examples HTML file and creating wasm with something like
```
RUSTFLAGS=--cfg=web_sys_unstable_apis cargo build --release --example hello-compute --target wasm32-unknown-unknown
wasm-bindgen target/wasm32-unknown-unknown/release/examples/hello-compute.wasm --out-dir target/generated --web
```

Co-authored-by: Joshua Groves <josh@joshgroves.com>
2021-07-17 03:09:10 +00:00
Dzmitry Malyshau e76824aba3 glsl-out: fix emission of location/binding attributes (#1100) 2021-07-16 23:04:55 -04:00
initial-algebra 602368d9f0 Support builtin(primitive_index) (#1097)
* Hack in support for PrimitiveID on Vulkan

* Rename to PrimitiveIndex and add preliminary support for GLSL, HLSL and MSL

* Implement as an extra WGSL built-in

* Update extra.wgsl outputs

* Run rustfmt; fix WGSL writer

* Add rustfmt changes I forgot

* Update extra.wgsl test output for WGSL fix

* Bump macOS version to 10.15 in validate-msl to support primitive_index
2021-07-16 22:18:20 -04:00
Joshua Groves cd12afa1db webgpu: remove naga dependency 2021-07-16 22:12:21 -02:30
Joshua Groves 4b7dac0e43 webgpu: pass wgsl directly 2021-07-16 22:11:59 -02:30
bors[bot]andDzmitry Malyshau 6fa8845465 Merge #1673
1673: hal/vk: relay semaphore r=Ralith a=kvark

**Connections**
Somewhere on the Matrix, by @pythonesque

**Description**
Vulkan (somewhat confusingly) requires semaphore synchronization between `vkQueueSubmit` and `vkQueuePresent` *even if* it's done on the same queue.
This PR exercises a dumb idea of just keeping one binary semaphore as a "relay" between all queue commands, all concealed within hal/vk backend.

**Testing**
Running Halmark shows that all the things break here. I'm not seeing anything particularly wrong with the code though. My humble guess is that AMD driver (at least) isn't happy about the mix of binary and timeline semaphores used together in the same signal operation.


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-07-16 21:55:37 +00:00
Dzmitry Malyshau 5419947095 hal/vk: relay semaphore 2021-07-16 17:55:03 -04:00
Dzmitry Malyshau 8eef784416 WGSL: Flip true/false arguments of select() 2021-07-16 11:42:12 -04:00
Igor Shaposhnik 10a3a6a827 [glsl-out] Write sint array size 2021-07-16 10:59:27 -04:00
Gordon-F 4ef754bb9d [hlsl-out] Enable image snapshot 2021-07-16 10:31:01 -04:00
Gordon-F 03a5ef3a2f [hlsl-out] Implement all texture functions 2021-07-16 10:31:01 -04:00
Gordon-F c5acef791d [hlsl-out] Add module documentation 2021-07-16 10:31:01 -04:00
Gordon-F 2716d368a1 [hlsl-out] Implement barrier statement 2021-07-16 10:31:01 -04:00
bors[bot]andConnor Fitzgerald 6c711adb9b Merge #1671
1671: Use EGL_KHR_gl_colorspace for srgb if available r=kvark a=cwfitzgerald

**Connections**

Fixes #1667 

**Description**

Uses the extension to provide SRGB if needed relevant.

I also promoted the log message about missing robustness to a warning because it is a safety issue.

**Testing**

Tested on rpi and haswell.


Co-authored-by: Connor Fitzgerald <connorwadefitzgerald@gmail.com>
2021-07-16 05:05:39 +00:00
Connor Fitzgerald 0f84c7cf6e Use EGL_KHR_gl_colorspace for srgb if available 2021-07-16 01:03:18 -04:00
bors[bot]andxiaopengli89 22a81de6a9 Merge #1665
1665: (macOS/iOS) readWriteTextureSupport is support on macOS 10.13+ / iOS 11.0 r=kvark a=xiaopengli89

```
[MTLIGAccelDevice readWriteTextureSupport]: unrecognized selector sent to instance 0x7f97d1070a00
```
https://developer.apple.com/documentation/metal/mtldevice/2887289-readwritetexturesupport?language=objc


Co-authored-by: xiaopengli89 <x.friday@outlook.com>
2021-07-15 15:07:38 +00:00
xiaopengli89 6e63964e51 fix: readWriteTextureSupport is support on macOS 10.13+ / iOS 11.0 2021-07-15 14:40:05 +08:00
bors[bot]andDzmitry Malyshau e1392a3525 Merge #1664
1664: hal/dx12: reset scissor and viewport r=kvark a=kvark

**Connections**
Follow-up to #1602 that actually makes it render!

**Description**
"hello-triange" and "msaa-line" examples work now.
Everything else is blocked on Naga's HLSL output, starting from https://github.com/gfx-rs/naga/pull/1086

**Testing**
Ran the examples :)


Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-07-15 06:13:05 +00:00