Deploying to master from @ gfx-rs/wgpu@90859b4 🚀

Author: jimblandy

doc/naga/enum.AtomicFunction.html

@@ -15,7 +15,7 @@
 <a href="enum.Expression.html#variant.Load" title="variant naga::Expression::Load"><code>Expression::Load</code></a> and <a href="enum.Statement.html#variant.Store" title="variant naga::Statement::Store"><code>Statement::Store</code></a>.</p>
 <p>All <code>Handle&lt;Expression&gt;</code> values here refer to an expression in
 <a href="struct.Function.html#structfield.expressions" title="field naga::Function::expressions"><code>Function::expressions</code></a>.</p>
-</div></details><h2 id="variants" class="variants section-header">Variants<a href="#variants" class="anchor">§</a></h2><div class="variants"><section id="variant.Add" class="variant"><a href="#variant.Add" class="anchor">§</a><h3 class="code-header">Add</h3></section><section id="variant.Subtract" class="variant"><a href="#variant.Subtract" class="anchor">§</a><h3 class="code-header">Subtract</h3></section><section id="variant.And" class="variant"><a href="#variant.And" class="anchor">§</a><h3 class="code-header">And</h3></section><section id="variant.ExclusiveOr" class="variant"><a href="#variant.ExclusiveOr" class="anchor">§</a><h3 class="code-header">ExclusiveOr</h3></section><section id="variant.InclusiveOr" class="variant"><a href="#variant.InclusiveOr" class="anchor">§</a><h3 class="code-header">InclusiveOr</h3></section><section id="variant.Min" class="variant"><a href="#variant.Min" class="anchor">§</a><h3 class="code-header">Min</h3></section><section id="variant.Max" class="variant"><a href="#variant.Max" class="anchor">§</a><h3 class="code-header">Max</h3></section><section id="variant.Exchange" class="variant"><a href="#variant.Exchange" class="anchor">§</a><h3 class="code-header">Exchange</h3></section><div class="sub-variant" id="variant.Exchange.fields"><h4>Fields</h4><div class="sub-variant-field"><span id="variant.Exchange.field.compare" class="section-header"><a href="#variant.Exchange.field.compare" class="anchor field">§</a><code>compare: <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="struct" href="struct.Handle.html" title="struct naga::Handle">Handle</a>&lt;<a class="enum" href="enum.Expression.html" title="enum naga::Expression">Expression</a>&gt;&gt;</code></span></div></div></div><h2 id="implementations" class="section-header">Implementations<a href="#implementations" class="anchor">§</a></h2><div id="implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-AtomicFunction" class="impl"><a class="src rightside" href="../src/naga/front/wgsl/lower/mod.rs.html#3215-3229">source</a><a href="#impl-AtomicFunction" class="anchor">§</a><h3 class="code-header">impl <a class="enum" href="enum.AtomicFunction.html" title="enum naga::AtomicFunction">AtomicFunction</a></h3></section></summary><div class="impl-items"><section id="method.map" class="method"><a class="src rightside" href="../src/naga/front/wgsl/lower/mod.rs.html#3216-3228">source</a><h4 class="code-header">pub fn <a href="#method.map" class="fn">map</a>(word: &amp;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a>) -&gt; <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;Self&gt;</h4></section></div></details></div><h2 id="trait-implementations" class="section-header">Trait Implementations<a href="#trait-implementations" class="anchor">§</a></h2><div id="trait-implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-Arbitrary%3C'arbitrary%3E-for-AtomicFunction" class="impl"><a class="src rightside" href="../src/naga/lib.rs.html#1094">source</a><a href="#impl-Arbitrary%3C'arbitrary%3E-for-AtomicFunction" class="anchor">§</a><h3 class="code-header">impl&lt;'arbitrary&gt; Arbitrary&lt;'arbitrary&gt; for <a class="enum" href="enum.AtomicFunction.html" title="enum naga::AtomicFunction">AtomicFunction</a></h3></section></summary><div class="impl-items"><details class="toggle method-toggle" open><summary><section id="method.arbitrary" class="method trait-impl"><a class="src rightside" href="../src/naga/lib.rs.html#1094">source</a><a href="#method.arbitrary" class="anchor">§</a><h4 class="code-header">fn <a class="fn">arbitrary</a>(u: &amp;mut Unstructured&lt;'arbitrary&gt;) -&gt; Result&lt;Self&gt;</h4></section></summary><div class='docblock'>Generate an arbitrary value of <code>Self</code> from the given unstructured data. <a>Read more</a></div></details><details class="toggle method-toggle" open><summary><section id="method.arbitrary_take_rest" class="method trait-impl"><a class="src rightside" href="../src/naga/lib.rs.html#1094">source</a><a href="#method.arbitrary_take_rest" class="anchor">§</a><h4 class="code-header">fn <a class="fn">arbitrary_take_rest</a>(u: Unstructured&lt;'arbitrary&gt;) -&gt; Result&lt;Self&gt;</h4></section></summary><div class='docblock'>Generate an arbitrary value of <code>Self</code> from the entirety of the given
+</div></details><h2 id="variants" class="variants section-header">Variants<a href="#variants" class="anchor">§</a></h2><div class="variants"><section id="variant.Add" class="variant"><a href="#variant.Add" class="anchor">§</a><h3 class="code-header">Add</h3></section><section id="variant.Subtract" class="variant"><a href="#variant.Subtract" class="anchor">§</a><h3 class="code-header">Subtract</h3></section><section id="variant.And" class="variant"><a href="#variant.And" class="anchor">§</a><h3 class="code-header">And</h3></section><section id="variant.ExclusiveOr" class="variant"><a href="#variant.ExclusiveOr" class="anchor">§</a><h3 class="code-header">ExclusiveOr</h3></section><section id="variant.InclusiveOr" class="variant"><a href="#variant.InclusiveOr" class="anchor">§</a><h3 class="code-header">InclusiveOr</h3></section><section id="variant.Min" class="variant"><a href="#variant.Min" class="anchor">§</a><h3 class="code-header">Min</h3></section><section id="variant.Max" class="variant"><a href="#variant.Max" class="anchor">§</a><h3 class="code-header">Max</h3></section><section id="variant.Exchange" class="variant"><a href="#variant.Exchange" class="anchor">§</a><h3 class="code-header">Exchange</h3></section><div class="sub-variant" id="variant.Exchange.fields"><h4>Fields</h4><div class="sub-variant-field"><span id="variant.Exchange.field.compare" class="section-header"><a href="#variant.Exchange.field.compare" class="anchor field">§</a><code>compare: <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="struct" href="struct.Handle.html" title="struct naga::Handle">Handle</a>&lt;<a class="enum" href="enum.Expression.html" title="enum naga::Expression">Expression</a>&gt;&gt;</code></span></div></div></div><h2 id="implementations" class="section-header">Implementations<a href="#implementations" class="anchor">§</a></h2><div id="implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-AtomicFunction" class="impl"><a class="src rightside" href="../src/naga/front/wgsl/lower/mod.rs.html#3233-3247">source</a><a href="#impl-AtomicFunction" class="anchor">§</a><h3 class="code-header">impl <a class="enum" href="enum.AtomicFunction.html" title="enum naga::AtomicFunction">AtomicFunction</a></h3></section></summary><div class="impl-items"><section id="method.map" class="method"><a class="src rightside" href="../src/naga/front/wgsl/lower/mod.rs.html#3234-3246">source</a><h4 class="code-header">pub fn <a href="#method.map" class="fn">map</a>(word: &amp;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.str.html">str</a>) -&gt; <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;Self&gt;</h4></section></div></details></div><h2 id="trait-implementations" class="section-header">Trait Implementations<a href="#trait-implementations" class="anchor">§</a></h2><div id="trait-implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-Arbitrary%3C'arbitrary%3E-for-AtomicFunction" class="impl"><a class="src rightside" href="../src/naga/lib.rs.html#1094">source</a><a href="#impl-Arbitrary%3C'arbitrary%3E-for-AtomicFunction" class="anchor">§</a><h3 class="code-header">impl&lt;'arbitrary&gt; Arbitrary&lt;'arbitrary&gt; for <a class="enum" href="enum.AtomicFunction.html" title="enum naga::AtomicFunction">AtomicFunction</a></h3></section></summary><div class="impl-items"><details class="toggle method-toggle" open><summary><section id="method.arbitrary" class="method trait-impl"><a class="src rightside" href="../src/naga/lib.rs.html#1094">source</a><a href="#method.arbitrary" class="anchor">§</a><h4 class="code-header">fn <a class="fn">arbitrary</a>(u: &amp;mut Unstructured&lt;'arbitrary&gt;) -&gt; Result&lt;Self&gt;</h4></section></summary><div class='docblock'>Generate an arbitrary value of <code>Self</code> from the given unstructured data. <a>Read more</a></div></details><details class="toggle method-toggle" open><summary><section id="method.arbitrary_take_rest" class="method trait-impl"><a class="src rightside" href="../src/naga/lib.rs.html#1094">source</a><a href="#method.arbitrary_take_rest" class="anchor">§</a><h4 class="code-header">fn <a class="fn">arbitrary_take_rest</a>(u: Unstructured&lt;'arbitrary&gt;) -&gt; Result&lt;Self&gt;</h4></section></summary><div class='docblock'>Generate an arbitrary value of <code>Self</code> from the entirety of the given
 unstructured data. <a>Read more</a></div></details><details class="toggle method-toggle" open><summary><section id="method.size_hint" class="method trait-impl"><a class="src rightside" href="../src/naga/lib.rs.html#1094">source</a><a href="#method.size_hint" class="anchor">§</a><h4 class="code-header">fn <a class="fn">size_hint</a>(depth: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.usize.html">usize</a>) -&gt; (<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.usize.html">usize</a>, <a class="enum" href="https://doc.rust-lang.org/nightly/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.usize.html">usize</a>&gt;)</h4></section></summary><div class='docblock'>Get a size hint for how many bytes out of an <code>Unstructured</code> this type
 needs to construct itself. <a>Read more</a></div></details><details class="toggle method-toggle" open><summary><section id="method.try_size_hint" class="method trait-impl"><a class="src rightside" href="../src/naga/lib.rs.html#1094">source</a><a href="#method.try_size_hint" class="anchor">§</a><h4 class="code-header">fn <a class="fn">try_size_hint</a>(
     depth: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.usize.html">usize</a>

doc/src/naga/front/wgsl/lower/mod.rs.html

@@ -3228,6 +3228,24 @@
 <a href="#3227" id="3227">3227</a>
 <a href="#3228" id="3228">3228</a>
 <a href="#3229" id="3229">3229</a>
+<a href="#3230" id="3230">3230</a>
+<a href="#3231" id="3231">3231</a>
+<a href="#3232" id="3232">3232</a>
+<a href="#3233" id="3233">3233</a>
+<a href="#3234" id="3234">3234</a>
+<a href="#3235" id="3235">3235</a>
+<a href="#3236" id="3236">3236</a>
+<a href="#3237" id="3237">3237</a>
+<a href="#3238" id="3238">3238</a>
+<a href="#3239" id="3239">3239</a>
+<a href="#3240" id="3240">3240</a>
+<a href="#3241" id="3241">3241</a>
+<a href="#3242" id="3242">3242</a>
+<a href="#3243" id="3243">3243</a>
+<a href="#3244" id="3244">3244</a>
+<a href="#3245" id="3245">3245</a>
+<a href="#3246" id="3246">3246</a>
+<a href="#3247" id="3247">3247</a>
 </pre></div><pre class="rust"><code><span class="kw">use </span>std::num::NonZeroU32;
 
 <span class="kw">use </span><span class="kw">crate</span>::front::wgsl::error::{Error, ExpectedToken, InvalidAssignmentType};
@@ -5414,7 +5432,25 @@
             <span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span>LoweredGlobalDecl::Function(function)) =&gt; {
                 <span class="kw">let </span>arguments = arguments
                     .iter()
-                    .map(|<span class="kw-2">&amp;</span>arg| <span class="self">self</span>.expression(arg, ctx))
+                    .enumerate()
+                    .map(|(i, <span class="kw-2">&amp;</span>arg)| {
+                        <span class="comment">// Try to convert abstract values to the known argument types
+                        </span><span class="kw">let </span><span class="prelude-val">Some</span>(<span class="kw-2">&amp;</span><span class="kw">crate</span>::FunctionArgument {
+                            ty: parameter_ty, ..
+                        }) = ctx.module.functions[function].arguments.get(i)
+                        <span class="kw">else </span>{
+                            <span class="comment">// Wrong number of arguments... just concretize the type here
+                            // and let the validator report the error.
+                            </span><span class="kw">return </span><span class="self">self</span>.expression(arg, ctx);
+                        };
+
+                        <span class="kw">let </span>expr = <span class="self">self</span>.expression_for_abstract(arg, ctx)<span class="question-mark">?</span>;
+                        ctx.try_automatic_conversions(
+                            expr,
+                            <span class="kw-2">&amp;</span><span class="kw">crate</span>::proc::TypeResolution::Handle(parameter_ty),
+                            ctx.ast_expressions.get_span(arg),
+                        )
+                    })
                     .collect::&lt;<span class="prelude-ty">Result</span>&lt;Vec&lt;<span class="kw">_</span>&gt;, <span class="kw">_</span>&gt;&gt;()<span class="question-mark">?</span>;
 
                 <span class="kw">let </span>has_result = ctx.module.functions[function].result.is_some();