Skip to content

Commit 1a4cbc5

Browse files
committed
Deploying to master from @ gfx-rs/wgpu@38f3c47 🚀
1 parent 25da747 commit 1a4cbc5

File tree

166 files changed

+491
-397
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+491
-397
lines changed

doc/search-index.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/search.desc/wgpu/wgpu-desc-0-.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/search.desc/wgpu/wgpu-desc-1-.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

doc/src/wgpu/api/queue.rs.html

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,29 @@
261261
<a href="#260" id="260">260</a>
262262
<a href="#261" id="261">261</a>
263263
<a href="#262" id="262">262</a>
264-
<a href="#263" id="263">263</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::boxed::Box;
264+
<a href="#263" id="263">263</a>
265+
<a href="#264" id="264">264</a>
266+
<a href="#265" id="265">265</a>
267+
<a href="#266" id="266">266</a>
268+
<a href="#267" id="267">267</a>
269+
<a href="#268" id="268">268</a>
270+
<a href="#269" id="269">269</a>
271+
<a href="#270" id="270">270</a>
272+
<a href="#271" id="271">271</a>
273+
<a href="#272" id="272">272</a>
274+
<a href="#273" id="273">273</a>
275+
<a href="#274" id="274">274</a>
276+
<a href="#275" id="275">275</a>
277+
<a href="#276" id="276">276</a>
278+
<a href="#277" id="277">277</a>
279+
<a href="#278" id="278">278</a>
280+
<a href="#279" id="279">279</a>
281+
<a href="#280" id="280">280</a>
282+
<a href="#281" id="281">281</a>
283+
<a href="#282" id="282">282</a>
284+
<a href="#283" id="283">283</a>
285+
<a href="#284" id="284">284</a>
286+
<a href="#285" id="285">285</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::boxed::Box;
265287
<span class="kw">use </span>core::ops::{Deref, DerefMut};
266288

267289
<span class="kw">use crate</span>::<span class="kw-2">*</span>;
@@ -523,5 +545,27 @@
523545
</span><span class="kw">pub fn </span>on_submitted_work_done(<span class="kw-2">&amp;</span><span class="self">self</span>, callback: <span class="kw">impl </span>FnOnce() + Send + <span class="lifetime">'static</span>) {
524546
<span class="self">self</span>.inner.on_submitted_work_done(Box::new(callback));
525547
}
548+
549+
<span class="doccomment">/// Returns the inner hal Queue using a callback. The hal queue will be `None` if the
550+
/// backend type argument does not match with this wgpu Queue
551+
///
552+
/// # Safety
553+
///
554+
/// - The raw handle obtained from the hal Queue must not be manually destroyed
555+
</span><span class="attr">#[cfg(wgpu_core)]
556+
</span><span class="kw">pub unsafe fn </span>as_hal&lt;A: wgc::hal_api::HalApi, F: FnOnce(<span class="prelude-ty">Option</span>&lt;<span class="kw-2">&amp;</span>A::Queue&gt;) -&gt; R, R&gt;(
557+
<span class="kw-2">&amp;</span><span class="self">self</span>,
558+
hal_queue_callback: F,
559+
) -&gt; R {
560+
<span class="kw">if let </span><span class="prelude-val">Some</span>(core_queue) = <span class="self">self</span>.inner.as_core_opt() {
561+
<span class="kw">unsafe </span>{
562+
core_queue
563+
.context
564+
.queue_as_hal::&lt;A, F, R&gt;(core_queue, hal_queue_callback)
565+
}
566+
} <span class="kw">else </span>{
567+
hal_queue_callback(<span class="prelude-val">None</span>)
568+
}
569+
}
526570
}
527571
</code></pre></div></section></main></body></html>

doc/src/wgpu/backend/wgpu_core.rs.html

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3606,7 +3606,15 @@
36063606
<a href="#3605" id="3605">3605</a>
36073607
<a href="#3606" id="3606">3606</a>
36083608
<a href="#3607" id="3607">3607</a>
3609-
<a href="#3608" id="3608">3608</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
3609+
<a href="#3608" id="3608">3608</a>
3610+
<a href="#3609" id="3609">3609</a>
3611+
<a href="#3610" id="3610">3610</a>
3612+
<a href="#3611" id="3611">3611</a>
3613+
<a href="#3612" id="3612">3612</a>
3614+
<a href="#3613" id="3613">3613</a>
3615+
<a href="#3614" id="3614">3614</a>
3616+
<a href="#3615" id="3615">3615</a>
3617+
<a href="#3616" id="3616">3616</a></pre></div><pre class="rust"><code><span class="kw">use </span>alloc::{
36103618
borrow::Cow::Borrowed,
36113619
boxed::Box,
36123620
format,
@@ -3975,6 +3983,14 @@
39753983

39763984
<span class="macro">format!</span>(<span class="string">"Validation Error\n\nCaused by:\n{output}"</span>)
39773985
}
3986+
3987+
<span class="kw">pub unsafe fn </span>queue_as_hal&lt;A: wgc::hal_api::HalApi, F: FnOnce(<span class="prelude-ty">Option</span>&lt;<span class="kw-2">&amp;</span>A::Queue&gt;) -&gt; R, R&gt;(
3988+
<span class="kw-2">&amp;</span><span class="self">self</span>,
3989+
queue: <span class="kw-2">&amp;</span>CoreQueue,
3990+
hal_queue_callback: F,
3991+
) -&gt; R {
3992+
<span class="kw">unsafe </span>{ <span class="self">self</span>.<span class="number">0</span>.queue_as_hal::&lt;A, F, R&gt;(queue.id, hal_queue_callback) }
3993+
}
39783994
}
39793995

39803996
<span class="kw">fn </span>map_buffer_copy_view(view: <span class="kw">crate</span>::TexelCopyBufferInfo&lt;<span class="lifetime">'_</span>&gt;) -&gt; wgc::command::TexelCopyBufferInfo {

doc/src/wgpu_hal/vulkan/mod.rs.html

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,13 @@
14911491
<a href="#1490" id="1490">1490</a>
14921492
<a href="#1491" id="1491">1491</a>
14931493
<a href="#1492" id="1492">1492</a>
1494-
<a href="#1493" id="1493">1493</a></pre></div><pre class="rust"><code><span class="doccomment">/*!
1494+
<a href="#1493" id="1493">1493</a>
1495+
<a href="#1494" id="1494">1494</a>
1496+
<a href="#1495" id="1495">1495</a>
1497+
<a href="#1496" id="1496">1496</a>
1498+
<a href="#1497" id="1497">1497</a>
1499+
<a href="#1498" id="1498">1498</a>
1500+
<a href="#1499" id="1499">1499</a></pre></div><pre class="rust"><code><span class="doccomment">/*!
14951501
# Vulkan API internals.
14961502

14971503
## Stack memory
@@ -2266,6 +2272,12 @@
22662272
signal_semaphores: Mutex&lt;(Vec&lt;vk::Semaphore&gt;, Vec&lt;u64&gt;)&gt;,
22672273
}
22682274

2275+
<span class="kw">impl </span>Queue {
2276+
<span class="kw">pub fn </span>as_raw(<span class="kw-2">&amp;</span><span class="self">self</span>) -&gt; vk::Queue {
2277+
<span class="self">self</span>.raw
2278+
}
2279+
}
2280+
22692281
<span class="kw">impl </span>Drop <span class="kw">for </span>Queue {
22702282
<span class="kw">fn </span>drop(<span class="kw-2">&amp;mut </span><span class="self">self</span>) {
22712283
<span class="kw">unsafe </span>{ <span class="self">self</span>.relay_semaphores.lock().destroy(<span class="kw-2">&amp;</span><span class="self">self</span>.device.raw) };

doc/wgpu/api/queue/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
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 `queue` mod in crate `wgpu`."><title>wgpu::api::queue - 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-46132b98.css"><meta name="rustdoc-vars" data-root-path="../../../" data-static-root-path="../../../static.files/" data-current-crate="wgpu" data-themes="" data-resource-suffix="" data-rustdoc-version="1.85.0 (4d91de4e4 2025-02-17)" data-channel="1.85.0" data-search-js="search-75f5ac3e.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 mod"><!--[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><a class="logo-container" href="../../../wgpu/index.html"><img src="https://raw.githubusercontent.com/gfx-rs/wgpu/trunk/logo.png" alt=""></a></nav><nav class="sidebar"><div class="sidebar-crate"><a class="logo-container" href="../../../wgpu/index.html"><img src="https://raw.githubusercontent.com/gfx-rs/wgpu/trunk/logo.png" alt="logo"></a><h2><a href="../../../wgpu/index.html">wgpu</a><span class="version">24.0.0</span></h2></div><div class="sidebar-elems"><section id="rustdoc-toc"><h2 class="location"><a href="#">Module queue</a></h2><h3><a href="#structs">Module Items</a></h3><ul class="block"><li><a href="#structs" title="Structs">Structs</a></li><li><a href="#enums" title="Enums">Enums</a></li><li><a href="#types" title="Type Aliases">Type Aliases</a></li></ul></section><div id="rustdoc-modnav"><h2><a href="../index.html">In wgpu::<wbr>api</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</a>::<wbr><a href="../index.html">api</a></span><h1>Module <span>queue</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/api/queue.rs.html#1-263">Source</a> </span></div><h2 id="structs" class="section-header">Structs<a href="#structs" class="anchor">§</a></h2><ul class="item-table"><li><div class="item-name"><a class="struct" href="struct.Queue.html" title="struct wgpu::api::queue::Queue">Queue</a></div><div class="desc docblock-short">Handle to a command queue on a device.</div></li><li><div class="item-name"><a class="struct" href="struct.QueueWriteBufferView.html" title="struct wgpu::api::queue::QueueWriteBufferView">Queue<wbr>Write<wbr>Buffer<wbr>View</a></div><div class="desc docblock-short">A write-only view into a staging buffer.</div></li><li><div class="item-name"><a class="struct" href="struct.SubmissionIndex.html" title="struct wgpu::api::queue::SubmissionIndex">Submission<wbr>Index</a></div><div class="desc docblock-short">Identifier for a particular call to <a href="../../struct.Queue.html#method.submit" title="method wgpu::Queue::submit"><code>Queue::submit</code></a>. Can be used
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 `queue` mod in crate `wgpu`."><title>wgpu::api::queue - 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-46132b98.css"><meta name="rustdoc-vars" data-root-path="../../../" data-static-root-path="../../../static.files/" data-current-crate="wgpu" data-themes="" data-resource-suffix="" data-rustdoc-version="1.85.0 (4d91de4e4 2025-02-17)" data-channel="1.85.0" data-search-js="search-75f5ac3e.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 mod"><!--[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><a class="logo-container" href="../../../wgpu/index.html"><img src="https://raw.githubusercontent.com/gfx-rs/wgpu/trunk/logo.png" alt=""></a></nav><nav class="sidebar"><div class="sidebar-crate"><a class="logo-container" href="../../../wgpu/index.html"><img src="https://raw.githubusercontent.com/gfx-rs/wgpu/trunk/logo.png" alt="logo"></a><h2><a href="../../../wgpu/index.html">wgpu</a><span class="version">24.0.0</span></h2></div><div class="sidebar-elems"><section id="rustdoc-toc"><h2 class="location"><a href="#">Module queue</a></h2><h3><a href="#structs">Module Items</a></h3><ul class="block"><li><a href="#structs" title="Structs">Structs</a></li><li><a href="#enums" title="Enums">Enums</a></li><li><a href="#types" title="Type Aliases">Type Aliases</a></li></ul></section><div id="rustdoc-modnav"><h2><a href="../index.html">In wgpu::<wbr>api</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</a>::<wbr><a href="../index.html">api</a></span><h1>Module <span>queue</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/api/queue.rs.html#1-285">Source</a> </span></div><h2 id="structs" class="section-header">Structs<a href="#structs" class="anchor">§</a></h2><ul class="item-table"><li><div class="item-name"><a class="struct" href="struct.Queue.html" title="struct wgpu::api::queue::Queue">Queue</a></div><div class="desc docblock-short">Handle to a command queue on a device.</div></li><li><div class="item-name"><a class="struct" href="struct.QueueWriteBufferView.html" title="struct wgpu::api::queue::QueueWriteBufferView">Queue<wbr>Write<wbr>Buffer<wbr>View</a></div><div class="desc docblock-short">A write-only view into a staging buffer.</div></li><li><div class="item-name"><a class="struct" href="struct.SubmissionIndex.html" title="struct wgpu::api::queue::SubmissionIndex">Submission<wbr>Index</a></div><div class="desc docblock-short">Identifier for a particular call to <a href="../../struct.Queue.html#method.submit" title="method wgpu::Queue::submit"><code>Queue::submit</code></a>. Can be used
22
as part of an argument to <a href="../../struct.Device.html#method.poll" title="method wgpu::Device::poll"><code>Device::poll</code></a> to block for a particular
33
submission to finish.</div></li></ul><h2 id="enums" class="section-header">Enums<a href="#enums" class="anchor">§</a></h2><ul class="item-table"><li><div class="item-name"><a class="enum" href="enum.MaintainBase.html" title="enum wgpu::api::queue::MaintainBase">Maintain<wbr>Base</a></div><div class="desc docblock-short">Passed to <code>Device::poll</code> to control how and if it should block.</div></li></ul><h2 id="types" class="section-header">Type Aliases<a href="#types" class="anchor">§</a></h2><ul class="item-table"><li><div class="item-name"><a class="type" href="type.PollType.html" title="type wgpu::api::queue::PollType">Poll<wbr>Type</a></div><div class="desc docblock-short">Passed to <a href="../../struct.Device.html#method.poll" title="method wgpu::Device::poll"><code>Device::poll</code></a> to control how and if it should block.</div></li></ul></section></div></main></body></html>

0 commit comments

Comments
 (0)