Skip to content

Commit 843dd21

Browse files
jimblandyjimblandy
committed
Deploying to master from @ 701564da8c49ec537ed41792e841c29ffa859d01 🚀
1 parent cfe42e9 commit 843dd21

File tree

2 files changed

+34
-48
lines changed

2 files changed

+34
-48
lines changed

‎doc/search-index.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/backend/direct.rs.html

Lines changed: 33 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -2432,13 +2432,6 @@
24322432
<span id="2430">2430</span>
24332433
<span id="2431">2431</span>
24342434
<span id="2432">2432</span>
2435-
<span id="2433">2433</span>
2436-
<span id="2434">2434</span>
2437-
<span id="2435">2435</span>
2438-
<span id="2436">2436</span>
2439-
<span id="2437">2437</span>
2440-
<span id="2438">2438</span>
2441-
<span id="2439">2439</span>
24422435
</pre><pre class="rust"><code><span class="kw">use crate</span>::{
24432436
AdapterInfo, BindGroupDescriptor, BindGroupLayoutDescriptor, BindingResource, BufferBinding,
24442437
CommandEncoderDescriptor, ComputePassDescriptor, ComputePipelineDescriptor,
@@ -2456,7 +2449,6 @@
24562449
error::Error,
24572450
fmt,
24582451
future::{ready, Ready},
2459-
marker::PhantomData,
24602452
ops::Range,
24612453
slice,
24622454
sync::Arc,
@@ -2510,17 +2502,15 @@
25102502
<span class="attribute">#[cfg(any(not(target_arch = <span class="string">&quot;wasm32&quot;</span>), feature = <span class="string">&quot;emscripten&quot;</span>))]
25112503
</span><span class="kw">pub fn </span>enumerate_adapters(<span class="kw-2">&amp;</span><span class="self">self</span>, backends: wgt::Backends) -&gt; Vec&lt;wgc::id::AdapterId&gt; {
25122504
<span class="self">self</span>.<span class="number">0
2513-
</span>.enumerate_adapters(wgc::instance::AdapterInputs::Mask(backends, |<span class="kw">_</span>| {
2514-
PhantomData
2515-
}))
2505+
</span>.enumerate_adapters(wgc::instance::AdapterInputs::Mask(backends, |<span class="kw">_</span>| ()))
25162506
}
25172507

25182508
<span class="attribute">#[cfg(any(not(target_arch = <span class="string">&quot;wasm32&quot;</span>), feature = <span class="string">&quot;emscripten&quot;</span>))]
25192509
</span><span class="kw">pub unsafe fn </span>create_adapter_from_hal&lt;A: wgc::hub::HalApi&gt;(
25202510
<span class="kw-2">&amp;</span><span class="self">self</span>,
25212511
hal_adapter: hal::ExposedAdapter&lt;A&gt;,
25222512
) -&gt; wgc::id::AdapterId {
2523-
<span class="self">self</span>.<span class="number">0</span>.create_adapter_from_hal(hal_adapter, PhantomData)
2513+
<span class="self">self</span>.<span class="number">0</span>.create_adapter_from_hal(hal_adapter, ())
25242514
}
25252515

25262516
<span class="kw">pub unsafe fn </span>adapter_as_hal&lt;A: wgc::hub::HalApi, F: FnOnce(<span class="prelude-ty">Option</span>&lt;<span class="kw-2">&amp;</span>A::Adapter&gt;) -&gt; R, R&gt;(
@@ -2546,7 +2536,7 @@
25462536
hal_device,
25472537
<span class="kw-2">&amp;</span>desc.map_label(|l| l.map(Borrowed)),
25482538
trace_dir,
2549-
PhantomData,
2539+
(),
25502540
);
25512541
<span class="kw">if let </span><span class="prelude-val">Some</span>(err) = error {
25522542
<span class="self">self</span>.handle_error_fatal(err, <span class="string">&quot;Adapter::create_device_from_hal&quot;</span>);
@@ -2571,7 +2561,7 @@
25712561
hal_texture,
25722562
device.id,
25732563
<span class="kw-2">&amp;</span>desc.map_label(|l| l.map(Borrowed)),
2574-
PhantomData,
2564+
(),
25752565
);
25762566
<span class="kw">if let </span><span class="prelude-val">Some</span>(cause) = error {
25772567
<span class="self">self</span>.handle_error(
@@ -2618,7 +2608,7 @@
26182608
<span class="self">self</span>: <span class="kw-2">&amp;</span>Arc&lt;<span class="self">Self</span>&gt;,
26192609
layer: <span class="kw-2">*mut </span>std::ffi::c_void,
26202610
) -&gt; <span class="kw">crate</span>::Surface {
2621-
<span class="kw">let </span>id = <span class="self">self</span>.<span class="number">0</span>.instance_create_surface_metal(layer, PhantomData);
2611+
<span class="kw">let </span>id = <span class="self">self</span>.<span class="number">0</span>.instance_create_surface_metal(layer, ());
26222612
<span class="kw">crate</span>::Surface {
26232613
context: Arc::clone(<span class="self">self</span>),
26242614
id: Surface {
@@ -2633,7 +2623,7 @@
26332623
<span class="self">self</span>: <span class="kw-2">&amp;</span>Arc&lt;<span class="self">Self</span>&gt;,
26342624
canvas: <span class="kw-2">&amp;</span>web_sys::HtmlCanvasElement,
26352625
) -&gt; Surface {
2636-
<span class="kw">let </span>id = <span class="self">self</span>.<span class="number">0</span>.create_surface_webgl_canvas(canvas, PhantomData);
2626+
<span class="kw">let </span>id = <span class="self">self</span>.<span class="number">0</span>.create_surface_webgl_canvas(canvas, ());
26372627
Surface {
26382628
id,
26392629
configured_device: Mutex::default(),
@@ -2645,9 +2635,7 @@
26452635
<span class="self">self</span>: <span class="kw-2">&amp;</span>Arc&lt;<span class="self">Self</span>&gt;,
26462636
canvas: <span class="kw-2">&amp;</span>web_sys::OffscreenCanvas,
26472637
) -&gt; Surface {
2648-
<span class="kw">let </span>id = <span class="self">self
2649-
</span>.<span class="number">0
2650-
</span>.create_surface_webgl_offscreen_canvas(canvas, PhantomData);
2638+
<span class="kw">let </span>id = <span class="self">self</span>.<span class="number">0</span>.create_surface_webgl_offscreen_canvas(canvas, ());
26512639
Surface {
26522640
id,
26532641
configured_device: Mutex::default(),
@@ -2659,9 +2647,7 @@
26592647
<span class="self">self</span>: <span class="kw-2">&amp;</span>Arc&lt;<span class="self">Self</span>&gt;,
26602648
visual: <span class="kw-2">*mut </span>std::ffi::c_void,
26612649
) -&gt; <span class="kw">crate</span>::Surface {
2662-
<span class="kw">let </span>id = <span class="self">self
2663-
</span>.<span class="number">0
2664-
</span>.instance_create_surface_from_visual(visual, PhantomData);
2650+
<span class="kw">let </span>id = <span class="self">self</span>.<span class="number">0</span>.instance_create_surface_from_visual(visual, ());
26652651
<span class="kw">crate</span>::Surface {
26662652
context: Arc::clone(<span class="self">self</span>),
26672653
id: Surface {
@@ -3294,7 +3280,7 @@
32943280
handle: <span class="kw-2">&amp;</span>(<span class="kw">impl </span>raw_window_handle::HasRawWindowHandle + raw_window_handle::HasRawDisplayHandle),
32953281
) -&gt; <span class="self">Self</span>::SurfaceId {
32963282
Surface {
3297-
id: <span class="self">self</span>.<span class="number">0</span>.instance_create_surface(handle, PhantomData),
3283+
id: <span class="self">self</span>.<span class="number">0</span>.instance_create_surface(handle, ()),
32983284
configured_device: Mutex::new(<span class="prelude-val">None</span>),
32993285
}
33003286
}
@@ -3309,7 +3295,7 @@
33093295
force_fallback_adapter: options.force_fallback_adapter,
33103296
compatible_surface: options.compatible_surface.map(|surface| surface.id.id),
33113297
},
3312-
wgc::instance::AdapterInputs::Mask(wgt::Backends::all(), |<span class="kw">_</span>| PhantomData),
3298+
wgc::instance::AdapterInputs::Mask(wgt::Backends::all(), |<span class="kw">_</span>| ()),
33133299
);
33143300
ready(id.ok())
33153301
}
@@ -3333,7 +3319,7 @@
33333319
<span class="kw-2">*</span>adapter,
33343320
<span class="kw-2">&amp;</span>desc.map_label(|l| l.map(Borrowed)),
33353321
trace_dir,
3336-
PhantomData
3322+
()
33373323
));
33383324
<span class="kw">if let </span><span class="prelude-val">Some</span>(err) = error {
33393325
<span class="macro">log::error!</span>(<span class="string">&quot;Error in Adapter::request_device: {}&quot;</span>, err);
@@ -3463,7 +3449,7 @@
34633449
.lock()
34643450
.expect(<span class="string">&quot;Surface was not configured?&quot;</span>);
34653451
<span class="kw">match </span><span class="macro">wgc::gfx_select!</span>(
3466-
device_id =&gt; global.surface_get_current_texture(surface.id, PhantomData)
3452+
device_id =&gt; global.surface_get_current_texture(surface.id, ())
34673453
) {
34683454
<span class="prelude-val">Ok</span>(wgc::present::SurfaceOutput { status, texture_id }) =&gt; (
34693455
texture_id.map(|id| Texture {
@@ -3568,7 +3554,7 @@
35683554
</span>ShaderSource::Naga(module) =&gt; wgc::pipeline::ShaderModuleSource::Naga(module),
35693555
};
35703556
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(
3571-
device.id =&gt; global.device_create_shader_module(device.id, <span class="kw-2">&amp;</span>descriptor, source, PhantomData)
3557+
device.id =&gt; global.device_create_shader_module(device.id, <span class="kw-2">&amp;</span>descriptor, source, ())
35723558
);
35733559
<span class="kw">if let </span><span class="prelude-val">Some</span>(cause) = error {
35743560
<span class="self">self</span>.handle_error(
@@ -3595,7 +3581,7 @@
35953581
</span>shader_bound_checks: wgt::ShaderBoundChecks::unchecked(),
35963582
};
35973583
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(
3598-
device.id =&gt; global.device_create_shader_module_spirv(device.id, <span class="kw-2">&amp;</span>descriptor, Borrowed(<span class="kw-2">&amp;</span>desc.source), PhantomData)
3584+
device.id =&gt; global.device_create_shader_module_spirv(device.id, <span class="kw-2">&amp;</span>descriptor, Borrowed(<span class="kw-2">&amp;</span>desc.source), ())
35993585
);
36003586
<span class="kw">if let </span><span class="prelude-val">Some</span>(cause) = error {
36013587
<span class="self">self</span>.handle_error(
@@ -3620,7 +3606,7 @@
36203606
entries: Borrowed(desc.entries),
36213607
};
36223608
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(
3623-
device.id =&gt; global.device_create_bind_group_layout(device.id, <span class="kw-2">&amp;</span>descriptor, PhantomData)
3609+
device.id =&gt; global.device_create_bind_group_layout(device.id, <span class="kw-2">&amp;</span>descriptor, ())
36243610
);
36253611
<span class="kw">if let </span><span class="prelude-val">Some</span>(cause) = error {
36263612
<span class="self">self</span>.handle_error(
@@ -3721,7 +3707,7 @@
37213707
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(device.id =&gt; global.device_create_bind_group(
37223708
device.id,
37233709
<span class="kw-2">&amp;</span>descriptor,
3724-
PhantomData
3710+
()
37253711
));
37263712
<span class="kw">if let </span><span class="prelude-val">Some</span>(cause) = error {
37273713
<span class="self">self</span>.handle_error(
@@ -3764,7 +3750,7 @@
37643750
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(device.id =&gt; global.device_create_pipeline_layout(
37653751
device.id,
37663752
<span class="kw-2">&amp;</span>descriptor,
3767-
PhantomData
3753+
()
37683754
));
37693755
<span class="kw">if let </span><span class="prelude-val">Some</span>(cause) = error {
37703756
<span class="self">self</span>.handle_error(
@@ -3799,8 +3785,8 @@
37993785
<span class="kw">let </span>implicit_pipeline_ids = <span class="kw">match </span>desc.layout {
38003786
<span class="prelude-val">Some</span>(<span class="kw">_</span>) =&gt; <span class="prelude-val">None</span>,
38013787
<span class="prelude-val">None </span>=&gt; <span class="prelude-val">Some</span>(wgc::device::ImplicitPipelineIds {
3802-
root_id: PhantomData,
3803-
group_ids: <span class="kw-2">&amp;</span>[PhantomData; wgc::MAX_BIND_GROUPS],
3788+
root_id: (),
3789+
group_ids: <span class="kw-2">&amp;</span>[(); wgc::MAX_BIND_GROUPS],
38043790
}),
38053791
};
38063792
<span class="kw">let </span>descriptor = pipe::RenderPipelineDescriptor {
@@ -3830,7 +3816,7 @@
38303816
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(device.id =&gt; global.device_create_render_pipeline(
38313817
device.id,
38323818
<span class="kw-2">&amp;</span>descriptor,
3833-
PhantomData,
3819+
(),
38343820
implicit_pipeline_ids
38353821
));
38363822
<span class="kw">if let </span><span class="prelude-val">Some</span>(cause) = error {
@@ -3859,8 +3845,8 @@
38593845
<span class="kw">let </span>implicit_pipeline_ids = <span class="kw">match </span>desc.layout {
38603846
<span class="prelude-val">Some</span>(<span class="kw">_</span>) =&gt; <span class="prelude-val">None</span>,
38613847
<span class="prelude-val">None </span>=&gt; <span class="prelude-val">Some</span>(wgc::device::ImplicitPipelineIds {
3862-
root_id: PhantomData,
3863-
group_ids: <span class="kw-2">&amp;</span>[PhantomData; wgc::MAX_BIND_GROUPS],
3848+
root_id: (),
3849+
group_ids: <span class="kw-2">&amp;</span>[(); wgc::MAX_BIND_GROUPS],
38643850
}),
38653851
};
38663852
<span class="kw">let </span>descriptor = pipe::ComputePipelineDescriptor {
@@ -3876,7 +3862,7 @@
38763862
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(device.id =&gt; global.device_create_compute_pipeline(
38773863
device.id,
38783864
<span class="kw-2">&amp;</span>descriptor,
3879-
PhantomData,
3865+
(),
38803866
implicit_pipeline_ids
38813867
));
38823868
<span class="kw">if let </span><span class="prelude-val">Some</span>(cause) = error {
@@ -3908,7 +3894,7 @@
39083894
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(device.id =&gt; global.device_create_buffer(
39093895
device.id,
39103896
<span class="kw-2">&amp;</span>desc.map_label(|l| l.map(Borrowed)),
3911-
PhantomData
3897+
()
39123898
));
39133899
<span class="kw">if let </span><span class="prelude-val">Some</span>(cause) = error {
39143900
<span class="self">self</span>.handle_error(
@@ -3934,7 +3920,7 @@
39343920
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(device.id =&gt; global.device_create_texture(
39353921
device.id,
39363922
<span class="kw-2">&amp;</span>desc.map_label(|l| l.map(Borrowed)),
3937-
PhantomData
3923+
()
39383924
));
39393925
<span class="kw">if let </span><span class="prelude-val">Some</span>(cause) = error {
39403926
<span class="self">self</span>.handle_error(
@@ -3977,7 +3963,7 @@
39773963
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(device.id =&gt; global.device_create_sampler(
39783964
device.id,
39793965
<span class="kw-2">&amp;</span>descriptor,
3980-
PhantomData
3966+
()
39813967
));
39823968
<span class="kw">if let </span><span class="prelude-val">Some</span>(cause) = error {
39833969
<span class="self">self</span>.handle_error(
@@ -4000,7 +3986,7 @@
40003986
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(device.id =&gt; global.device_create_query_set(
40013987
device.id,
40023988
<span class="kw-2">&amp;</span>desc.map_label(|l| l.map(Borrowed)),
4003-
PhantomData
3989+
()
40043990
));
40053991
<span class="kw">if let </span><span class="prelude-val">Some</span>(cause) = error {
40063992
<span class="self">self</span>.handle_error_nolabel(<span class="kw-2">&amp;</span>device.error_sink, cause, <span class="string">&quot;Device::create_query_set&quot;</span>);
@@ -4017,7 +4003,7 @@
40174003
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(device.id =&gt; global.device_create_command_encoder(
40184004
device.id,
40194005
<span class="kw-2">&amp;</span>desc.map_label(|l| l.map(Borrowed)),
4020-
PhantomData
4006+
()
40214007
));
40224008
<span class="kw">if let </span><span class="prelude-val">Some</span>(cause) = error {
40234009
<span class="self">self</span>.handle_error(
@@ -4183,7 +4169,7 @@
41834169
};
41844170
<span class="kw">let </span>global = <span class="kw-2">&amp;</span><span class="self">self</span>.<span class="number">0</span>;
41854171
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(
4186-
texture.id =&gt; global.texture_create_view(texture.id, <span class="kw-2">&amp;</span>descriptor, PhantomData)
4172+
texture.id =&gt; global.texture_create_view(texture.id, <span class="kw-2">&amp;</span>descriptor, ())
41874173
);
41884174
<span class="kw">if let </span><span class="prelude-val">Some</span>(cause) = error {
41894175
<span class="self">self</span>.handle_error(
@@ -4289,7 +4275,7 @@
42894275
index: u32,
42904276
) -&gt; <span class="self">Self</span>::BindGroupLayoutId {
42914277
<span class="kw">let </span>global = <span class="kw-2">&amp;</span><span class="self">self</span>.<span class="number">0</span>;
4292-
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(<span class="kw-2">*</span>pipeline =&gt; global.compute_pipeline_get_bind_group_layout(<span class="kw-2">*</span>pipeline, index, PhantomData));
4278+
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(<span class="kw-2">*</span>pipeline =&gt; global.compute_pipeline_get_bind_group_layout(<span class="kw-2">*</span>pipeline, index, ()));
42934279
<span class="kw">if let </span><span class="prelude-val">Some</span>(err) = error {
42944280
<span class="macro">panic!</span>(<span class="string">&quot;Error reflecting bind group {}: {}&quot;</span>, index, err);
42954281
}
@@ -4301,7 +4287,7 @@
43014287
index: u32,
43024288
) -&gt; <span class="self">Self</span>::BindGroupLayoutId {
43034289
<span class="kw">let </span>global = <span class="kw-2">&amp;</span><span class="self">self</span>.<span class="number">0</span>;
4304-
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(<span class="kw-2">*</span>pipeline =&gt; global.render_pipeline_get_bind_group_layout(<span class="kw-2">*</span>pipeline, index, PhantomData));
4290+
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(<span class="kw-2">*</span>pipeline =&gt; global.render_pipeline_get_bind_group_layout(<span class="kw-2">*</span>pipeline, index, ()));
43054291
<span class="kw">if let </span><span class="prelude-val">Some</span>(err) = error {
43064292
<span class="macro">panic!</span>(<span class="string">&quot;Error reflecting bind group {}: {}&quot;</span>, index, err);
43074293
}
@@ -4624,7 +4610,7 @@
46244610
<span class="kw">let </span>(id, error) = <span class="macro">wgc::gfx_select!</span>(encoder.parent() =&gt; global.render_bundle_encoder_finish(
46254611
encoder,
46264612
<span class="kw-2">&amp;</span>desc.map_label(|l| l.map(Borrowed)),
4627-
PhantomData
4613+
()
46284614
));
46294615
<span class="kw">if let </span><span class="prelude-val">Some</span>(err) = error {
46304616
<span class="self">self</span>.handle_error_fatal(err, <span class="string">&quot;RenderBundleEncoder::finish&quot;</span>);
@@ -4671,7 +4657,7 @@
46714657
) -&gt; QueueWriteBuffer {
46724658
<span class="kw">let </span>global = <span class="kw-2">&amp;</span><span class="self">self</span>.<span class="number">0</span>;
46734659
<span class="kw">match </span><span class="macro">wgc::gfx_select!</span>(
4674-
<span class="kw-2">*</span>queue =&gt; global.queue_create_staging_buffer(<span class="kw-2">*</span>queue, size, PhantomData)
4660+
<span class="kw-2">*</span>queue =&gt; global.queue_create_staging_buffer(<span class="kw-2">*</span>queue, size, ())
46754661
) {
46764662
<span class="prelude-val">Ok</span>((buffer_id, ptr)) =&gt; QueueWriteBuffer {
46774663
buffer_id,

0 commit comments

Comments
 (0)