Skip to content

Commit 3633fa1

Browse files
nicalnical
committed
Deploying to master from @ gfx-rs/wgpu@d34707e 🚀
1 parent e6edb40 commit 3633fa1

File tree

17 files changed

+45
-45
lines changed

17 files changed

+45
-45
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/src/naga/back/hlsl/ray.rs.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,11 @@
205205
<span class="macro">writeln!</span>(<span class="self">self</span>.out, <span class="string">" ret.t = rq.CommittedRayT();"</span>)<span class="question-mark">?</span>;
206206
<span class="macro">writeln!</span>(
207207
<span class="self">self</span>.out,
208-
<span class="string">" ret.instance_custom_index = rq.CommittedInstanceID();"
208+
<span class="string">" ret.instance_custom_data = rq.CommittedInstanceID();"
209209
</span>)<span class="question-mark">?</span>;
210210
<span class="macro">writeln!</span>(
211211
<span class="self">self</span>.out,
212-
<span class="string">" ret.instance_id = rq.CommittedInstanceIndex();"
212+
<span class="string">" ret.instance_index = rq.CommittedInstanceIndex();"
213213
</span>)<span class="question-mark">?</span>;
214214
<span class="macro">writeln!</span>(
215215
<span class="self">self</span>.out,
@@ -292,11 +292,11 @@
292292

293293
<span class="macro">writeln!</span>(
294294
<span class="self">self</span>.out,
295-
<span class="string">" ret.instance_custom_index = rq.CandidateInstanceID();"
295+
<span class="string">" ret.instance_custom_data = rq.CandidateInstanceID();"
296296
</span>)<span class="question-mark">?</span>;
297297
<span class="macro">writeln!</span>(
298298
<span class="self">self</span>.out,
299-
<span class="string">" ret.instance_id = rq.CandidateInstanceIndex();"
299+
<span class="string">" ret.instance_index = rq.CandidateInstanceIndex();"
300300
</span>)<span class="question-mark">?</span>;
301301
<span class="macro">writeln!</span>(
302302
<span class="self">self</span>.out,

‎doc/src/naga/front/type_gen.rs.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -611,13 +611,13 @@
611611
offset: <span class="number">4</span>,
612612
},
613613
<span class="kw">crate</span>::StructMember {
614-
name: <span class="prelude-val">Some</span>(<span class="string">"instance_custom_index"</span>.to_string()),
614+
name: <span class="prelude-val">Some</span>(<span class="string">"instance_custom_data"</span>.to_string()),
615615
ty: ty_flag,
616616
binding: <span class="prelude-val">None</span>,
617617
offset: <span class="number">8</span>,
618618
},
619619
<span class="kw">crate</span>::StructMember {
620-
name: <span class="prelude-val">Some</span>(<span class="string">"instance_id"</span>.to_string()),
620+
name: <span class="prelude-val">Some</span>(<span class="string">"instance_index"</span>.to_string()),
621621
ty: ty_flag,
622622
binding: <span class="prelude-val">None</span>,
623623
offset: <span class="number">12</span>,

‎doc/src/player/lib.rs.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@
662662
.map(|instance| wgc::ray_tracing::TlasInstance {
663663
blas_id: instance.blas_id,
664664
transform: <span class="kw-2">&amp;</span>instance.transform,
665-
custom_index: instance.custom_index,
665+
custom_data: instance.custom_data,
666666
mask: instance.mask,
667667
})
668668
});

‎doc/src/wgpu/api/blas.rs.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
///
234234
/// This must only use the lower 24 bits, if any bits are outside that range (byte 4 does not equal 0) the TlasInstance becomes
235235
/// invalid and generates a validation error when built
236-
</span><span class="kw">pub </span>custom_index: u32,
236+
</span><span class="kw">pub </span>custom_data: u32,
237237
<span class="doccomment">/// Mask for the instance used inside the shader to filter instances.
238238
/// Reports hit only if `(shader_cull_mask &amp; tlas_instance.mask) != 0u`.
239239
</span><span class="kw">pub </span>mask: u8,
@@ -243,19 +243,19 @@
243243
<span class="doccomment">/// Construct TlasInstance.
244244
/// - blas: Reference to the bottom level acceleration structure
245245
/// - transform: Transform buffer offset in bytes (optional, required if transform buffer is present)
246-
/// - custom_index: Custom index for the instance used inside the shader (max 24 bits)
246+
/// - custom_data: Custom index for the instance used inside the shader (max 24 bits)
247247
/// - mask: Mask for the instance used inside the shader to filter instances
248248
///
249249
/// Note: while one of these contains a reference to a BLAS that BLAS will not be dropped,
250250
/// but it can still be destroyed. Destroying a BLAS that is referenced by one or more
251251
/// TlasInstance(s) will immediately make them invalid. If one or more of those invalid
252252
/// TlasInstances is inside a TlasPackage that is attempted to be built, the build will
253253
/// generate a validation error.
254-
</span><span class="kw">pub fn </span>new(blas: <span class="kw-2">&amp;</span>Blas, transform: [f32; <span class="number">12</span>], custom_index: u32, mask: u8) -&gt; <span class="self">Self </span>{
254+
</span><span class="kw">pub fn </span>new(blas: <span class="kw-2">&amp;</span>Blas, transform: [f32; <span class="number">12</span>], custom_data: u32, mask: u8) -&gt; <span class="self">Self </span>{
255255
<span class="self">Self </span>{
256256
blas: blas.inner.clone(),
257257
transform,
258-
custom_index,
258+
custom_data,
259259
mask,
260260
}
261261
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6099,7 +6099,7 @@
60996099
.map(|instance| wgc::ray_tracing::TlasInstance {
61006100
blas_id: instance.blas.as_core().id,
61016101
transform: <span class="kw-2">&amp;</span>instance.transform,
6102-
custom_index: instance.custom_index,
6102+
custom_data: instance.custom_data,
61036103
mask: instance.mask,
61046104
})
61056105
});

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1616,7 +1616,7 @@
16161616
instance.map(|instance| TraceTlasInstance {
16171617
blas_id: instance.blas_id,
16181618
transform: <span class="kw-2">*</span>instance.transform,
1619-
custom_index: instance.custom_index,
1619+
custom_data: instance.custom_data,
16201620
mask: instance.mask,
16211621
})
16221622
})
@@ -1664,7 +1664,7 @@
16641664
instance.as_ref().map(|instance| TlasInstance {
16651665
blas_id: instance.blas_id,
16661666
transform: <span class="kw-2">&amp;</span>instance.transform,
1667-
custom_index: instance.custom_index,
1667+
custom_data: instance.custom_data,
16681668
mask: instance.mask,
16691669
})
16701670
});
@@ -1732,7 +1732,7 @@
17321732

17331733
<span class="kw">let </span><span class="kw-2">mut </span>instance_count = <span class="number">0</span>;
17341734
<span class="kw">for </span>instance <span class="kw">in </span>package.instances.flatten() {
1735-
<span class="kw">if </span>instance.custom_index &gt;= (<span class="number">1u32 </span>&lt;&lt; <span class="number">24u32</span>) {
1735+
<span class="kw">if </span>instance.custom_data &gt;= (<span class="number">1u32 </span>&lt;&lt; <span class="number">24u32</span>) {
17361736
<span class="kw">return </span><span class="prelude-val">Err</span>(BuildAccelerationStructureError::TlasInvalidCustomIndex(
17371737
tlas.error_ident(),
17381738
));
@@ -1744,7 +1744,7 @@
17441744
instance_buffer_staging_source.extend(device.raw().tlas_instance_to_bytes(
17451745
hal::TlasInstance {
17461746
transform: <span class="kw-2">*</span>instance.transform,
1747-
custom_index: instance.custom_index,
1747+
custom_data: instance.custom_data,
17481748
mask: instance.mask,
17491749
blas_address: blas.handle,
17501750
},

‎doc/src/wgpu_core/ray_tracing.rs.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@
431431
</span><span class="kw">pub struct </span>TlasInstance&lt;<span class="lifetime">'a</span>&gt; {
432432
<span class="kw">pub </span>blas_id: BlasId,
433433
<span class="kw">pub </span>transform: <span class="kw-2">&amp;</span><span class="lifetime">'a </span>[f32; <span class="number">12</span>],
434-
<span class="kw">pub </span>custom_index: u32,
434+
<span class="kw">pub </span>custom_data: u32,
435435
<span class="kw">pub </span>mask: u8,
436436
}
437437

@@ -499,7 +499,7 @@
499499
</span><span class="kw">pub struct </span>TraceTlasInstance {
500500
<span class="kw">pub </span>blas_id: BlasId,
501501
<span class="kw">pub </span>transform: [f32; <span class="number">12</span>],
502-
<span class="kw">pub </span>custom_index: u32,
502+
<span class="kw">pub </span>custom_data: u32,
503503
<span class="kw">pub </span>mask: u8,
504504
}
505505

‎doc/src/wgpu_hal/lib.rs.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4894,7 +4894,7 @@
48944894
<span class="attr">#[derive(Debug, Copy, Clone)]
48954895
</span><span class="kw">pub struct </span>TlasInstance {
48964896
<span class="kw">pub </span>transform: [f32; <span class="number">12</span>],
4897-
<span class="kw">pub </span>custom_index: u32,
4897+
<span class="kw">pub </span>custom_data: u32,
48984898
<span class="kw">pub </span>mask: u8,
48994899
<span class="kw">pub </span>blas_address: u64,
49004900
}

‎doc/src/wgpu_hal/vulkan/device.rs.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5262,7 +5262,7 @@
52625262
<span class="kw">const </span>MAX_U24: u32 = (<span class="number">1u32 </span>&lt;&lt; <span class="number">24u32</span>) - <span class="number">1u32</span>;
52635263
<span class="kw">let </span>temp = RawTlasInstance {
52645264
transform: instance.transform,
5265-
custom_index_and_mask: (instance.custom_index &amp; MAX_U24)
5265+
custom_data_and_mask: (instance.custom_data &amp; MAX_U24)
52665266
| (u32::from(instance.mask) &lt;&lt; <span class="number">24</span>),
52675267
shader_binding_table_record_offset_and_flags: <span class="number">0</span>,
52685268
acceleration_structure_reference: instance.blas_address,

0 commit comments

Comments
 (0)