Commit Graph
9013 Commits
Author SHA1 Message Date
François 79bcfb1206 [glsl-in] add support for array variables (#731)
* [glsl-in] add support for array variables

* clippy

* more clippy
2021-04-19 13:37:25 -04:00
Dzmitry Malyshau 27f51ca252 Update naga to gfx-22, add interpolation sampling validation 2021-04-19 13:33:36 -04:00
Jim Blandy 9cd6fd9c20 [msl-out]: Generate interpolation qualifiers. 2021-04-19 09:42:00 -04:00
Jim Blandy fc39ea8877 [msl-out]: ResolvedBinding::try_fmt: Simplify error handling. 2021-04-19 09:42:00 -04:00
Jim Blandy 4f442ff8cc Require binding interpolation to be resolved by the front end.
When validating IR, verify that all `Binding`s for vertex shader outputs and
fragment shader inputs, whether directly in the argument or result, or applied
to a struct member, has specified an interpolation and sampling, not `None`.
This ensures that front ends explicitly state their policies, rather than
coasting through on back ends' default behavior.

In practice, all our front ends have very similar defaults, so provide a utility
function on `Module` to apply these rules. Use this utility function in the
SPIR-V and WGSL front ends; GLSL seems to already fill in interpolation as
required.
2021-04-19 09:42:00 -04:00
Jim Blandy 0910af2718 [wgsl-in] Implement WGSL interpolate syntax from gpuweb PR #1605.
Fixes: #670
2021-04-19 09:42:00 -04:00
Jim Blandy 99a9e1e78e Change Binding::Location to a struct-style enum variant.
This commit makes no other changes. This is in preparation for adding a third
field, at which point tuple variants start to get obscure.
2021-04-19 09:42:00 -04:00
Jim Blandy 45ee5f5113 [spv-out] Writer: Introduce decorate helper method.
The `Writer::decorate` private method neatens up eight call sites.
2021-04-19 09:42:00 -04:00
Igor Shaposhnik ce0720ac61 Add wgsl-out into test infrastructure (#730) 2021-04-19 09:19:03 -04:00
Igor Shaposhnik c1675d06f9 Start wgsl-out (#727) 2021-04-19 00:23:27 -04:00
Dzmitry Malyshau 62c2cf7332 Validate composite constants (#729) 2021-04-18 23:19:09 -04:00
bors[bot]andDzmitry Malyshau b500fa86f1 Merge #1331
1331: Validate filtering r=cwfitzgerald a=kvark

**Connections**
See https://github.com/gpuweb/gpuweb/pull/1223

**Description**
This PR implements validation of sampler filtering (property in BGL), as well as the ability to filter non-filterable textures.

**Testing**
Untested

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-04-18 14:26:31 +00:00
Dzmitry Malyshau 280ba30c6c Don't compare booleans 2021-04-18 10:25:54 -04:00
Dzmitry Malyshau 92886b4995 Validate filtering samplers at BG creation 2021-04-18 10:25:54 -04:00
Dzmitry Malyshau 6d7ef8b8fd Validate filtered sampling 2021-04-18 10:25:54 -04:00
bors[bot]andDzmitry Malyshau a749f09bbf Merge #1325
1325: Relax and imporve vertex attribute validation r=cwfitzgerald a=kvark

**Connections**
None

**Description**
Improves our validation of vertex attributes in the following ways:
  1. Relaxes the size matching, so that we allow the shaders to default some of the values we don't provide
  2. Require interpolation to match
  3. Make the error messages more detailed:

>     In Device::create_render_pipeline
    error in stage VERTEX
    error matching the stage input at 1 (Uint32x2 interpolated as None) against the previous stage outputs
    input type is not compatible with the provided Float32x2

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

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-04-18 07:37:54 +00:00
Ashley a584ec8185 Impl Eq for msl::Options (#725) 2021-04-18 01:19:12 -04:00
Lachlan SneffandDzmitry Malyshau 4cbef59dd6 Add struct instantiation support to wgsl-in (#507)
* Add struct instantiation support to wgsl-in

* Readd type matching and move struct test

* rebase onto master and update tests

* Update tests to upstream

* Fix merge errors

* Rebase onto master

* [wgsl-in] delay composite type creation

* Use the new WGSL construction syntax in the tests

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-04-17 01:14:07 -04:00
Dzmitry Malyshau bb716f9c10 [spv-out] implement array value indexing (#723) 2021-04-16 17:11:18 -04:00
Dzmitry Malyshau daf4c82376 Allow stepping on floats in the validator (#724) 2021-04-16 16:16:15 -04:00
AshleyandDzmitry Malyshau 285a855e19 Impl Hash for msl::Options (#716)
* Impl `Hash` for `msl::Options`

* Remove ordered float

* [msl] derive everything on Options manually

* [msl] switch from Arena to Vec for the options

* Fix the clippy error by allowing derive_hash_xor_eq

* Fix skybox test

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-04-16 14:11:26 -04:00
Jim Blandy 2eb3e81e19 [wgsl-in] Add basic test for interpolate attribute. 2021-04-15 17:19:20 -04:00
Jim Blandy 3f958f618b [glsl-out] Let snapshot tests request a specific GLSL desktop version.
Add a Option<u16> to the snapshot `Params` to let snapshots request specific
Desktop GLSL versions. The default is GLSL ES 3.10.

It would be more general to let the params select any GLSL version, but that
would entail making glsl::Version implement Deserialize and all that, which
seems like overkill.
2021-04-15 17:19:20 -04:00
Jim Blandy 576723960e Permit interpolation qualifiers on both vertex outputs and fragment inputs. 2021-04-15 17:19:20 -04:00
Jim Blandy 7fda34c4fd [glsl-out] Add version checks for qualifiers.
Use `back::glsl::features::FeaturesManager` to detect which qualifiers the given
module actually uses, and check them against the requested GLSL version.

The `linear` and `sample` qualifiers for fragment shader inputs are not
supported in all versions of GLSL that Naga can generate.
2021-04-15 17:19:20 -04:00
Jim Blandy ec6ef38dac Makefile: Omit misleading slashes. 2021-04-15 17:19:20 -04:00
bors[bot]andadamnemecek 8bd1ccb351 [rs] Merge #860
860: Drops the Sync requirement from UncapturedErrorHandler r=kvark a=adamnemecek



Co-authored-by: adamnemecek <adamnemecek@gmail.com>
2021-04-15 21:12:49 +00:00
bors[bot]andIgor Shaposhnik baf477ba10 [rs] Merge #861
861: Remove glslangvalidator requirements from water example r=kvark a=Gordon-F

`glslangvalidator` is no longer needed because the example uses WGSL.

Co-authored-by: Igor Shaposhnik <Gordon-F@users.noreply.github.com>
2021-04-15 20:57:15 +00:00
Igor Shaposhnik fa86dd542c [rs] Remove glslangvalidator requirements from water example 2021-04-15 23:14:25 +03:00
adamnemecek e9aa015a96 [rs] Drops the Sync requrement from UncapturedErrorHandler 2021-04-15 11:57:19 -07:00
bors[bot]andashpil 6d08986874 [rs] Merge #859
859: Fix typos - it's -> its r=cwfitzgerald a=ashpil

As I was reading the documentation, I found an instance where "it's" should actually be "its", as it is used as a possessive, not a contraction. I fixed that and `grep`ed for other instances, of which I found one and fixed as well.

Co-authored-by: ashpil <shpilenok2001@gmail.com>
2021-04-15 16:49:12 +00:00
ashpil c4fdcbc190 [rs] Fix typos it's -> its 2021-04-15 12:39:16 -04:00
bors[bot]andDzmitry Malyshau 9f812f3884 [rs] Merge #858
858: Update blend APIs r=kvark a=kvark

Picks up https://github.com/gfx-rs/wgpu/pull/1333

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-04-15 15:49:11 +00:00
Dzmitry Malyshau b14215f468 [rs] Update blend APIs 2021-04-15 11:48:42 -04:00
bors[bot]andDzmitry Malyshau 6a6a9a4aed Merge #1333
1333: Update blending API names r=kvark a=kvark

**Connections**
Follows https://github.com/gpuweb/gpuweb/pull/1627 and https://github.com/gpuweb/gpuweb/pull/1633

**Description**
Makes the names clearer.

**Testing**
No need

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2021-04-15 15:27:26 +00:00
Dzmitry Malyshau c744582052 Update blending API names 2021-04-15 11:25:04 -04:00
Dzmitry Malyshau 2eae37f7e5 [spv-out] rename temp_chain to temp_list, run a cargo fmt pass 2021-04-14 19:26:20 -04:00
Dzmitry Malyshau 96f9cb4ce1 [wgsl] Add support for simplified vector construction, add a snapshot test 2021-04-14 19:26:20 -04:00
Dzmitry Malyshau c8d26a1f47 Splat support for WGSL and SPV in/out, updated snapshots 2021-04-14 19:26:20 -04:00
Dzmitry Malyshau d3b39d9e58 Splat expression in the IR 2021-04-14 19:26:20 -04:00
bors[bot]andadamnemecek 9c5e0eb5b8 [rs] Merge #857
857: updated wgpu with more copyable types r=kvark a=adamnemecek



Co-authored-by: adamnemecek <adamnemecek@gmail.com>
2021-04-14 20:42:37 +00:00
adamnemecek 9f6bfb2bab [rs] Updated wgpu version 2021-04-14 13:26:26 -07:00
Jim Blandy 6701e2bf96 Avoid non-exhaustive matches on Expression.
Non-exhaustive matches on `Expression` make it harder to review changes that add
new enum variants, because the compiler can't tell you that you've missed a
case.

Although I believe Clippy is able to do so, I don't think we should make a
blanket rule of forbidding wildcard match arms against `Expression`. There are a
few matches that are only concerned with a handful of variants, or a single
variant. For example, variant, naga::front::spv::Parser::next_block is only
concerned with whether an expression is a constant or not. In principle, these
sites should also be checked when adding a new variant, but it seems too
burdensome to require them to list all the `Expression` variants they don't care
about. The principle should be applied only to matches that are already handling
most variants.

At the moment, there is only one such match on `Expression` in the code base,
and it's only missing a few variants, so this is quick to fix.
2021-04-14 16:11:37 -04:00
Dzmitry Malyshau c2c93e4ecd Remove cargo-insta 2021-04-14 16:10:31 -04:00
Dzmitry Malyshau c0478c707d Address clippy issues on copying things 2021-04-14 15:23:20 -04:00
bors[bot]andadamnemecek f949643721 Merge #1329
1329: derive copy for DeviceType, BlendComponent, BlendState, PrimitiveStat… r=kvark a=adamnemecek

…e, MultisampleState, DepthBiasState, StencilFaceState, VertexAttribute, ImageDataLayout, BindGroupLayoutEntry, DrawIndirectArgs, DrawIndexedIndirectArgs, DispatchIndirectArgs



Co-authored-by: adamnemecek <adamnemecek@gmail.com>
2021-04-14 19:11:59 +00:00
adamnemecek 687bc81fac derive copy for DeviceType, BlendComponent, BlendState, PrimitiveState, MultisampleState, DepthBiasState, StencilFaceState, VertexAttribute, ImageDataLayout, BindGroupLayoutEntry, DrawIndirectArgs, DrawIndexedIndirectArgs, DispatchIndirectArgs 2021-04-14 12:09:35 -07:00
adamnemecek 6d3a514c43 updated gfx (#1327)
* updated gfx

* use long rev
2021-04-14 14:37:13 -04:00
Jim Blandy f7fdf6b560 Makefile: Be more flexible in removing YAML headers from snapshots.
The snapshot files in tests/out start with headers like this:

    ---
    source: tests/snapshots.rs
    expression: dis
    ---
    ; SPIR-V
    ; Version: 1.0
    ; Generator: rspirv
    ...

The Makefile's `validate-foo` targets trim off those lines with `tail -n +5`
before submitting their test to the validators.

However, some versions of the `insta` crate seem to generate headers with an
extra blank line, like this:

    ---
    source: tests/snapshots.rs
    expression: dis

    ---

This makes the `validate-foo` targets unhappy.

This commit changes the `validate-foo` targets to use `sed` to cope with both
kinds of headers.
2021-04-13 23:43:55 -04:00
Dzmitry Malyshau 78652e93f4 Make input stage errors more detailed 2021-04-13 23:01:02 -04:00