Skip to content

Commit e68d0b6

Browse files
ErichDonGublerErichDonGubler
committed
Deploying to master from @ gfx-rs/wgpu@166c2ea 🚀
1 parent 3af44db commit e68d0b6

File tree

8 files changed

+19
-17
lines changed

8 files changed

+19
-17
lines changed

‎doc/src/wgpu_core/command/query.rs.html‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,8 @@
536536
<a href="#535" id="535">535</a>
537537
<a href="#536" id="536">536</a>
538538
<a href="#537" id="537">537</a>
539-
<a href="#538" id="538">538</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{sync::Arc, vec, vec::Vec};
539+
<a href="#538" id="538">538</a>
540+
<a href="#539" id="539">539</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{sync::Arc, vec, vec::Vec};
540541
<span class="kw">use </span>core::{iter, mem};
541542

542543
<span class="attr">#[cfg(feature = <span class="string">"trace"</span>)]
@@ -748,6 +749,14 @@
748749
query_index: u32,
749750
reset_state: <span class="prelude-ty">Option</span>&lt;<span class="kw-2">&amp;mut </span>QueryResetMap&gt;,
750751
) -&gt; <span class="prelude-ty">Result</span>&lt;(), QueryUseError&gt; {
752+
<span class="comment">// NOTE: Further code assumes the index is good, so do this first.
753+
</span><span class="kw">if </span>query_index &gt;= <span class="self">self</span>.desc.count {
754+
<span class="kw">return </span><span class="prelude-val">Err</span>(QueryUseError::OutOfBounds {
755+
query_index,
756+
query_set_size: <span class="self">self</span>.desc.count,
757+
});
758+
}
759+
751760
<span class="comment">// We need to defer our resets because we are in a renderpass,
752761
// add the usage to the reset map.
753762
</span><span class="kw">if let </span><span class="prelude-val">Some</span>(reset) = reset_state {
@@ -765,13 +774,6 @@
765774
});
766775
}
767776

768-
<span class="kw">if </span>query_index &gt;= <span class="self">self</span>.desc.count {
769-
<span class="kw">return </span><span class="prelude-val">Err</span>(QueryUseError::OutOfBounds {
770-
query_index,
771-
query_set_size: <span class="self">self</span>.desc.count,
772-
});
773-
}
774-
775777
<span class="prelude-val">Ok</span>(())
776778
}
777779

‎doc/wgpu_core/command/query/fn.end_occlusion_query.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `end_occlusion_query` fn in crate `wgpu_core`."><title>end_occlusion_query in wgpu_core::command::query - Rust</title><script>if(window.location.protocol!=="file:")document.head.insertAdjacentHTML("beforeend","SourceSerif4-Regular-6b053e98.ttf.woff2,FiraSans-Regular-0fe48ade.woff2,FiraSans-Medium-e1aa3f0a.woff2,SourceCodePro-Regular-8badfe75.ttf.woff2,SourceCodePro-Semibold-aa29a496.ttf.woff2".split(",").map(f=>`<link rel="preload" as="font" type="font/woff2" crossorigin href="../../../static.files/${f}">`).join(""))</script><link rel="stylesheet" href="../../../static.files/normalize-9960930a.css"><link rel="stylesheet" href="../../../static.files/rustdoc-42caa33d.css"><meta name="rustdoc-vars" data-root-path="../../../" data-static-root-path="../../../static.files/" data-current-crate="wgpu_core" data-themes="" data-resource-suffix="" data-rustdoc-version="1.84.1 (e71f9a9a9 2025-01-27)" data-channel="1.84.1" data-search-js="search-92e6798f.js" data-settings-js="settings-0f613d39.js" ><script src="../../../static.files/storage-59e33391.js"></script><script defer src="sidebar-items.js"></script><script defer src="../../../static.files/main-5f194d8c.js"></script><noscript><link rel="stylesheet" href="../../../static.files/noscript-893ab5e7.css"></noscript><link rel="alternate icon" type="image/png" href="../../../static.files/favicon-32x32-6580c154.png"><link rel="icon" type="image/svg+xml" href="../../../static.files/favicon-044be391.svg"></head><body class="rustdoc fn"><!--[if lte IE 11]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="mobile-topbar"><button class="sidebar-menu-toggle" title="show sidebar"></button></nav><nav class="sidebar"><div class="sidebar-crate"><h2><a href="../../../wgpu_core/index.html">wgpu_<wbr>core</a><span class="version">26.0.0</span></h2></div><div class="sidebar-elems"><div id="rustdoc-modnav"><h2><a href="index.html">In wgpu_<wbr>core::<wbr>command::<wbr>query</a></h2></div></div></nav><div class="sidebar-resizer"></div><main><div class="width-limiter"><rustdoc-search></rustdoc-search><section id="main-content" class="content"><div class="main-heading"><span class="rustdoc-breadcrumbs"><a href="../../index.html">wgpu_core</a>::<wbr><a href="../index.html">command</a>::<wbr><a href="index.html">query</a></span><h1>Function <span class="fn">end_occlusion_query</span><button id="copy-path" title="Copy item path to clipboard">Copy item path</button></h1><rustdoc-toolbar></rustdoc-toolbar><span class="sub-heading"><a class="src" href="../../../src/wgpu_core/command/query.rs.html#293-303">Source</a> </span></div><pre class="rust item-decl"><code>pub(super) fn end_occlusion_query(
1+
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `end_occlusion_query` fn in crate `wgpu_core`."><title>end_occlusion_query in wgpu_core::command::query - Rust</title><script>if(window.location.protocol!=="file:")document.head.insertAdjacentHTML("beforeend","SourceSerif4-Regular-6b053e98.ttf.woff2,FiraSans-Regular-0fe48ade.woff2,FiraSans-Medium-e1aa3f0a.woff2,SourceCodePro-Regular-8badfe75.ttf.woff2,SourceCodePro-Semibold-aa29a496.ttf.woff2".split(",").map(f=>`<link rel="preload" as="font" type="font/woff2" crossorigin href="../../../static.files/${f}">`).join(""))</script><link rel="stylesheet" href="../../../static.files/normalize-9960930a.css"><link rel="stylesheet" href="../../../static.files/rustdoc-42caa33d.css"><meta name="rustdoc-vars" data-root-path="../../../" data-static-root-path="../../../static.files/" data-current-crate="wgpu_core" data-themes="" data-resource-suffix="" data-rustdoc-version="1.84.1 (e71f9a9a9 2025-01-27)" data-channel="1.84.1" data-search-js="search-92e6798f.js" data-settings-js="settings-0f613d39.js" ><script src="../../../static.files/storage-59e33391.js"></script><script defer src="sidebar-items.js"></script><script defer src="../../../static.files/main-5f194d8c.js"></script><noscript><link rel="stylesheet" href="../../../static.files/noscript-893ab5e7.css"></noscript><link rel="alternate icon" type="image/png" href="../../../static.files/favicon-32x32-6580c154.png"><link rel="icon" type="image/svg+xml" href="../../../static.files/favicon-044be391.svg"></head><body class="rustdoc fn"><!--[if lte IE 11]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="mobile-topbar"><button class="sidebar-menu-toggle" title="show sidebar"></button></nav><nav class="sidebar"><div class="sidebar-crate"><h2><a href="../../../wgpu_core/index.html">wgpu_<wbr>core</a><span class="version">26.0.0</span></h2></div><div class="sidebar-elems"><div id="rustdoc-modnav"><h2><a href="index.html">In wgpu_<wbr>core::<wbr>command::<wbr>query</a></h2></div></div></nav><div class="sidebar-resizer"></div><main><div class="width-limiter"><rustdoc-search></rustdoc-search><section id="main-content" class="content"><div class="main-heading"><span class="rustdoc-breadcrumbs"><a href="../../index.html">wgpu_core</a>::<wbr><a href="../index.html">command</a>::<wbr><a href="index.html">query</a></span><h1>Function <span class="fn">end_occlusion_query</span><button id="copy-path" title="Copy item path to clipboard">Copy item path</button></h1><rustdoc-toolbar></rustdoc-toolbar><span class="sub-heading"><a class="src" href="../../../src/wgpu_core/command/query.rs.html#294-304">Source</a> </span></div><pre class="rust item-decl"><code>pub(super) fn end_occlusion_query(
22
raw_encoder: &amp;mut dyn <a class="trait" href="../../../wgpu_hal/dynamic/command/trait.DynCommandEncoder.html" title="trait wgpu_hal::dynamic::command::DynCommandEncoder">DynCommandEncoder</a>,
33
active_query: &amp;mut <a class="enum" href="https://doc.rust-lang.org/1.84.1/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;(<a class="struct" href="https://doc.rust-lang.org/1.84.1/alloc/sync/struct.Arc.html" title="struct alloc::sync::Arc">Arc</a>&lt;<a class="struct" href="../../resource/struct.QuerySet.html" title="struct wgpu_core::resource::QuerySet">QuerySet</a>&gt;, <a class="primitive" href="https://doc.rust-lang.org/1.84.1/std/primitive.u32.html">u32</a>)&gt;,
44
) -&gt; <a class="enum" href="https://doc.rust-lang.org/1.84.1/core/result/enum.Result.html" title="enum core::result::Result">Result</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/1.84.1/std/primitive.unit.html">()</a>, <a class="enum" href="enum.QueryUseError.html" title="enum wgpu_core::command::query::QueryUseError">QueryUseError</a>&gt;</code></pre></section></div></main></body></html>

‎doc/wgpu_core/command/query/fn.end_pipeline_statistics_query.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `end_pipeline_statistics_query` fn in crate `wgpu_core`."><title>end_pipeline_statistics_query in wgpu_core::command::query - Rust</title><script>if(window.location.protocol!=="file:")document.head.insertAdjacentHTML("beforeend","SourceSerif4-Regular-6b053e98.ttf.woff2,FiraSans-Regular-0fe48ade.woff2,FiraSans-Medium-e1aa3f0a.woff2,SourceCodePro-Regular-8badfe75.ttf.woff2,SourceCodePro-Semibold-aa29a496.ttf.woff2".split(",").map(f=>`<link rel="preload" as="font" type="font/woff2" crossorigin href="../../../static.files/${f}">`).join(""))</script><link rel="stylesheet" href="../../../static.files/normalize-9960930a.css"><link rel="stylesheet" href="../../../static.files/rustdoc-42caa33d.css"><meta name="rustdoc-vars" data-root-path="../../../" data-static-root-path="../../../static.files/" data-current-crate="wgpu_core" data-themes="" data-resource-suffix="" data-rustdoc-version="1.84.1 (e71f9a9a9 2025-01-27)" data-channel="1.84.1" data-search-js="search-92e6798f.js" data-settings-js="settings-0f613d39.js" ><script src="../../../static.files/storage-59e33391.js"></script><script defer src="sidebar-items.js"></script><script defer src="../../../static.files/main-5f194d8c.js"></script><noscript><link rel="stylesheet" href="../../../static.files/noscript-893ab5e7.css"></noscript><link rel="alternate icon" type="image/png" href="../../../static.files/favicon-32x32-6580c154.png"><link rel="icon" type="image/svg+xml" href="../../../static.files/favicon-044be391.svg"></head><body class="rustdoc fn"><!--[if lte IE 11]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="mobile-topbar"><button class="sidebar-menu-toggle" title="show sidebar"></button></nav><nav class="sidebar"><div class="sidebar-crate"><h2><a href="../../../wgpu_core/index.html">wgpu_<wbr>core</a><span class="version">26.0.0</span></h2></div><div class="sidebar-elems"><div id="rustdoc-modnav"><h2><a href="index.html">In wgpu_<wbr>core::<wbr>command::<wbr>query</a></h2></div></div></nav><div class="sidebar-resizer"></div><main><div class="width-limiter"><rustdoc-search></rustdoc-search><section id="main-content" class="content"><div class="main-heading"><span class="rustdoc-breadcrumbs"><a href="../../index.html">wgpu_core</a>::<wbr><a href="../index.html">command</a>::<wbr><a href="index.html">query</a></span><h1>Function <span class="fn">end_pipeline_statistics_query</span><button id="copy-path" title="Copy item path to clipboard">Copy item path</button></h1><rustdoc-toolbar></rustdoc-toolbar><span class="sub-heading"><a class="src" href="../../../src/wgpu_core/command/query.rs.html#344-354">Source</a> </span></div><pre class="rust item-decl"><code>pub(super) fn end_pipeline_statistics_query(
1+
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><meta name="generator" content="rustdoc"><meta name="description" content="API documentation for the Rust `end_pipeline_statistics_query` fn in crate `wgpu_core`."><title>end_pipeline_statistics_query in wgpu_core::command::query - Rust</title><script>if(window.location.protocol!=="file:")document.head.insertAdjacentHTML("beforeend","SourceSerif4-Regular-6b053e98.ttf.woff2,FiraSans-Regular-0fe48ade.woff2,FiraSans-Medium-e1aa3f0a.woff2,SourceCodePro-Regular-8badfe75.ttf.woff2,SourceCodePro-Semibold-aa29a496.ttf.woff2".split(",").map(f=>`<link rel="preload" as="font" type="font/woff2" crossorigin href="../../../static.files/${f}">`).join(""))</script><link rel="stylesheet" href="../../../static.files/normalize-9960930a.css"><link rel="stylesheet" href="../../../static.files/rustdoc-42caa33d.css"><meta name="rustdoc-vars" data-root-path="../../../" data-static-root-path="../../../static.files/" data-current-crate="wgpu_core" data-themes="" data-resource-suffix="" data-rustdoc-version="1.84.1 (e71f9a9a9 2025-01-27)" data-channel="1.84.1" data-search-js="search-92e6798f.js" data-settings-js="settings-0f613d39.js" ><script src="../../../static.files/storage-59e33391.js"></script><script defer src="sidebar-items.js"></script><script defer src="../../../static.files/main-5f194d8c.js"></script><noscript><link rel="stylesheet" href="../../../static.files/noscript-893ab5e7.css"></noscript><link rel="alternate icon" type="image/png" href="../../../static.files/favicon-32x32-6580c154.png"><link rel="icon" type="image/svg+xml" href="../../../static.files/favicon-044be391.svg"></head><body class="rustdoc fn"><!--[if lte IE 11]><div class="warning">This old browser is unsupported and will most likely display funky things.</div><![endif]--><nav class="mobile-topbar"><button class="sidebar-menu-toggle" title="show sidebar"></button></nav><nav class="sidebar"><div class="sidebar-crate"><h2><a href="../../../wgpu_core/index.html">wgpu_<wbr>core</a><span class="version">26.0.0</span></h2></div><div class="sidebar-elems"><div id="rustdoc-modnav"><h2><a href="index.html">In wgpu_<wbr>core::<wbr>command::<wbr>query</a></h2></div></div></nav><div class="sidebar-resizer"></div><main><div class="width-limiter"><rustdoc-search></rustdoc-search><section id="main-content" class="content"><div class="main-heading"><span class="rustdoc-breadcrumbs"><a href="../../index.html">wgpu_core</a>::<wbr><a href="../index.html">command</a>::<wbr><a href="index.html">query</a></span><h1>Function <span class="fn">end_pipeline_statistics_query</span><button id="copy-path" title="Copy item path to clipboard">Copy item path</button></h1><rustdoc-toolbar></rustdoc-toolbar><span class="sub-heading"><a class="src" href="../../../src/wgpu_core/command/query.rs.html#345-355">Source</a> </span></div><pre class="rust item-decl"><code>pub(super) fn end_pipeline_statistics_query(
22
raw_encoder: &amp;mut dyn <a class="trait" href="../../../wgpu_hal/dynamic/command/trait.DynCommandEncoder.html" title="trait wgpu_hal::dynamic::command::DynCommandEncoder">DynCommandEncoder</a>,
33
active_query: &amp;mut <a class="enum" href="https://doc.rust-lang.org/1.84.1/core/option/enum.Option.html" title="enum core::option::Option">Option</a>&lt;(<a class="struct" href="https://doc.rust-lang.org/1.84.1/alloc/sync/struct.Arc.html" title="struct alloc::sync::Arc">Arc</a>&lt;<a class="struct" href="../../resource/struct.QuerySet.html" title="struct wgpu_core::resource::QuerySet">QuerySet</a>&gt;, <a class="primitive" href="https://doc.rust-lang.org/1.84.1/std/primitive.u32.html">u32</a>)&gt;,
44
) -&gt; <a class="enum" href="https://doc.rust-lang.org/1.84.1/core/result/enum.Result.html" title="enum core::result::Result">Result</a>&lt;<a class="primitive" href="https://doc.rust-lang.org/1.84.1/std/primitive.unit.html">()</a>, <a class="enum" href="enum.QueryUseError.html" title="enum wgpu_core::command::query::QueryUseError">QueryUseError</a>&gt;</code></pre></section></div></main></body></html>

0 commit comments

Comments
 (0)