[naga wgsl-in] Support abstract operands to binary operators. #4850

jimblandy · 2023-12-08T20:29:53Z

Still some missing bits and some invalid output, but roughly working.

Note that commits are split out, only the last one should be interesting.

Checklist

Run cargo fmt.
Run cargo clippy.
Run cargo xtask test to run tests.
Add change to CHANGELOG.md. See simple instructions inside file.

teoxoy

Looks good but I think it needs to be rebased since I landed #4869.

Move `naga::front::wgsl::lower::construction::automatic_conversion_consensus` into `conversion.rs`, and make it a method of `ExpressionContext`.

This is a mouthful, but it's going to align better with functions to be introduced in later commits.

Abstract out the body of `convert_slice_to_common_leaf_scalar`'s main loop into its own function. Code motion only, no intended change of behavior.

…225e1744fd7. r=webgpu-reviewers,supply-chain-reviewers,teoxoy Changelog: * #4865 fix present mode for wgl By xiaopengli89 in gfx-rs/wgpu#4865 * #4873 Bump ctor from 0.2.5 to 0.2.6 By dependabot[bot] in gfx-rs/wgpu#4873 * #4874 Bump syn from 2.0.40 to 2.0.41 By dependabot[bot] in gfx-rs/wgpu#4874 * #4869 [naga wgsl-out] Include the `f` suffix on `f32` literals. By jimblandy in gfx-rs/wgpu#4869 * #4850 [naga wgsl-in] Support abstract operands to binary operators. By jimblandy in gfx-rs/wgpu#4850 * #4850 [naga wgsl-in] Support abstract operands to binary operators. By jimblandy in gfx-rs/wgpu#4850 * #4850 [naga wgsl-in] Support abstract operands to binary operators. By jimblandy in gfx-rs/wgpu#4850 * #4850 [naga wgsl-in] Support abstract operands to binary operators. By jimblandy in gfx-rs/wgpu#4850 * #4850 [naga wgsl-in] Support abstract operands to binary operators. By jimblandy in gfx-rs/wgpu#4850 * #4870 [naga wgsl] Let unary operators accept and produce abstract types. By jimblandy in gfx-rs/wgpu#4870 * #4867 Reintroduce buffer snatching Part 1 By nical in gfx-rs/wgpu#4867 * #4882 Bump zerocopy from 0.7.26 to 0.7.31 By dependabot[bot] in gfx-rs/wgpu#4882 * #4878 Buffer snatching part 2 - Refactor create_buffer By nical in gfx-rs/wgpu#4878 * #4815 Add `wgpu` crate features for backends By daxpedda in gfx-rs/wgpu#4815 * #4887 Allow clippy::pattern_type_mismatch By nical in gfx-rs/wgpu#4887 * #4886 Document wgpu & wgpu-core features By Wumpf in gfx-rs/wgpu#4886 * #4826 validation: More detailed on incompatible BGL By scoopr in gfx-rs/wgpu#4826 * #4888 Web: add support for more `RawWindowHandle` variants By daxpedda in gfx-rs/wgpu#4888 * #4890 Bump thiserror from 1.0.50 to 1.0.51 By dependabot[bot] in gfx-rs/wgpu#4890 * #4880 Simplify `ResourceMaps` By nical in gfx-rs/wgpu#4880 * #4891 Make the naga version in trunk as high as the latest published one By nical in gfx-rs/wgpu#4891 * #4893 Avoid allocating memory every time we might log a label By nical in gfx-rs/wgpu#4893 * #4894 Remove some locks in BindGroup By nical in gfx-rs/wgpu#4894 * #4862 Ensure that DeviceLostCallbackC is always called exactly once By bradwerth in gfx-rs/wgpu#4862 * #4900 Support Device fence sharing with dx12 on Windows By sotaroikeda in gfx-rs/wgpu#4900 * #4903 Bump tokio from 1.35.0 to 1.35.1 By dependabot[bot] in gfx-rs/wgpu#4903 * #4895 Check that raw buffers and raw bind groups are valid By nical in gfx-rs/wgpu#4895 * #4901 fix: docs By miaobuao in gfx-rs/wgpu#4901 * #4892 Simplify some code around buffer unmapping By nical in gfx-rs/wgpu#4892 * #4896 Buffer snatching By nical in gfx-rs/wgpu#4896 * #4851 Eagerly release GPU resources when we lose the device. By bradwerth in gfx-rs/wgpu#4851 * #4906 Use nightly for docs By cwfitzgerald in gfx-rs/wgpu#4906 * #4908 Bump syn from 2.0.41 to 2.0.42 By dependabot[bot] in gfx-rs/wgpu#4908 * #4909 Bump profiling from 1.0.12 to 1.0.13 By dependabot[bot] in gfx-rs/wgpu#4909 * #4910 Bump anyhow from 1.0.75 to 1.0.76 By dependabot[bot] in gfx-rs/wgpu#4910 * #4913 Remove id32 Feature By cwfitzgerald in gfx-rs/wgpu#4913 * #4914 Add BGL Deduplication Index Test By cwfitzgerald in gfx-rs/wgpu#4914 * #4921 Fix typo "layout pipeline layout" -> "pipeline layout" By HactarCE in gfx-rs/wgpu#4921 * #4922 Bump winit from 0.29.4 to 0.29.5 By dependabot[bot] in gfx-rs/wgpu#4922 * #4924 Inline `document-features` usage, remove dep. By ErichDonGubler in gfx-rs/wgpu#4924 * #4871 Speed up Naga's `cargo xtask validate wgsl` from 12s to 0.8s By jimblandy in gfx-rs/wgpu#4871 * #4871 Speed up Naga's `cargo xtask validate wgsl` from 12s to 0.8s By jimblandy in gfx-rs/wgpu#4871 * #4871 Speed up Naga's `cargo xtask validate wgsl` from 12s to 0.8s By jimblandy in gfx-rs/wgpu#4871 * #4930 Bump winit from 0.29.5 to 0.29.6 By dependabot[bot] in gfx-rs/wgpu#4930 * #4929 Bump web-time from 0.2.3 to 0.2.4 By dependabot[bot] in gfx-rs/wgpu#4929 * #4902 [naga xtask] Run validation jobs in parallel, using jobserver. By jimblandy in gfx-rs/wgpu#4902 * #4902 [naga xtask] Run validation jobs in parallel, using jobserver. By jimblandy in gfx-rs/wgpu#4902 * #4902 [naga xtask] Run validation jobs in parallel, using jobserver. By jimblandy in gfx-rs/wgpu#4902 * #4902 [naga xtask] Run validation jobs in parallel, using jobserver. By jimblandy in gfx-rs/wgpu#4902 * #4902 [naga xtask] Run validation jobs in parallel, using jobserver. By jimblandy in gfx-rs/wgpu#4902 * #4902 [naga xtask] Run validation jobs in parallel, using jobserver. By jimblandy in gfx-rs/wgpu#4902 * #4902 [naga xtask] Run validation jobs in parallel, using jobserver. By jimblandy in gfx-rs/wgpu#4902 * #4902 [naga xtask] Run validation jobs in parallel, using jobserver. By jimblandy in gfx-rs/wgpu#4902 * #4902 [naga xtask] Run validation jobs in parallel, using jobserver. By jimblandy in gfx-rs/wgpu#4902 * #4902 [naga xtask] Run validation jobs in parallel, using jobserver. By jimblandy in gfx-rs/wgpu#4902 * #4902 [naga xtask] Run validation jobs in parallel, using jobserver. By jimblandy in gfx-rs/wgpu#4902 * #4940 Align `wgpu_types::CompositeAlphaMode` serde serializations to spec By littledivy in gfx-rs/wgpu#4940 * #4936 Bump anyhow from 1.0.76 to 1.0.77 By dependabot[bot] in gfx-rs/wgpu#4936 * #4933 Bump thiserror from 1.0.51 to 1.0.52 By dependabot[bot] in gfx-rs/wgpu#4933 * #4932 Bump syn from 2.0.42 to 2.0.43 By dependabot[bot] in gfx-rs/wgpu#4932 Differential Revision: https://phabricator.services.mozilla.com/D197519

jimblandy added type: enhancement New feature or request naga Shader Translator area: naga front-end lang: WGSL WebGPU Shading Language labels Dec 8, 2023

jimblandy force-pushed the naga-wgsl-abstract-operators branch 3 times, most recently from 396566a to d81b6bf Compare December 12, 2023 18:09

jimblandy marked this pull request as ready for review December 12, 2023 18:09

jimblandy requested a review from a team as a code owner December 12, 2023 18:09

jimblandy force-pushed the naga-wgsl-abstract-operators branch 2 times, most recently from a10d042 to ba71970 Compare December 12, 2023 19:08

jimblandy mentioned this pull request Dec 12, 2023

[naga wgsl] Let unary operators accept and produce abstract types. #4870

Merged

4 tasks

teoxoy approved these changes Dec 13, 2023

View reviewed changes

jimblandy added 3 commits December 13, 2023 08:16

[naga wgsl-in] Relocate automatic_conversion_consensus.

a1c94fd

Move `naga::front::wgsl::lower::construction::automatic_conversion_consensus` into `conversion.rs`, and make it a method of `ExpressionContext`.

[naga wgsl-in] Relax arg type for automatic_conversion_consensus.

eb92dcc

[naga wgsl-in] Rename convert_slice_to_common_leaf_scalar.

8f3c824

This is a mouthful, but it's going to align better with functions to be introduced in later commits.

jimblandy force-pushed the naga-wgsl-abstract-operators branch from ba71970 to 6cc39bf Compare December 13, 2023 16:18

jimblandy added 2 commits December 13, 2023 08:18

[naga wgsl-in] Separate out convert_to_leaf_scalar.

0780949

Abstract out the body of `convert_slice_to_common_leaf_scalar`'s main loop into its own function. Code motion only, no intended change of behavior.

[naga wgsl-in] Support abstract operands to binary operators.

07a8e9d

jimblandy force-pushed the naga-wgsl-abstract-operators branch from 6cc39bf to 07a8e9d Compare December 13, 2023 16:19

jimblandy merged commit c4b4387 into gfx-rs:trunk Dec 13, 2023
27 checks passed

jimblandy deleted the naga-wgsl-abstract-operators branch December 13, 2023 16:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[naga wgsl-in] Support abstract operands to binary operators. #4850

[naga wgsl-in] Support abstract operands to binary operators. #4850

jimblandy commented Dec 8, 2023 •

edited

Loading

teoxoy left a comment

[naga wgsl-in] Support abstract operands to binary operators. #4850

[naga wgsl-in] Support abstract operands to binary operators. #4850

Conversation

jimblandy commented Dec 8, 2023 • edited Loading

teoxoy left a comment

Choose a reason for hiding this comment

jimblandy commented Dec 8, 2023 •

edited

Loading