Skip to content

Commit 98522aa

Browse files
committed
attempt to fix ci #3
1 parent b66c010 commit 98522aa

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

naga/src/back/spv/writer.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,12 +381,10 @@ impl Writer {
381381
argument.ty,
382382
binding,
383383
)?;
384+
iface.varying_ids.push(varying_id);
384385
let id = match binding {
385386
&crate::Binding::BuiltIn(crate::BuiltIn::Payload) => varying_id,
386387
_ => {
387-
if binding != &crate::Binding::BuiltIn(crate::BuiltIn::Intersection) {
388-
iface.varying_ids.push(varying_id);
389-
}
390388
let id = self.id_gen.next();
391389
prelude.body.push(Instruction::load(
392390
argument_type_id,

naga/tests/out/spv/ray-pipeline.spvasm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ OpExtension "SPV_KHR_ray_tracing"
1010
%1 = OpExtInstImport "GLSL.std.450"
1111
OpMemoryModel Logical GLSL450
1212
OpEntryPoint RayGenerationNV %15 "ray_gen" %12 %23
13-
OpEntryPoint AnyHitNV %38 "discard_any_hit"
14-
OpEntryPoint AnyHitNV %47 "any_hit" %44
15-
OpEntryPoint ClosestHitNV %55 "closest_hit" %53
16-
OpEntryPoint MissNV %61 "miss"
13+
OpEntryPoint AnyHitNV %38 "discard_any_hit" %34 %35
14+
OpEntryPoint AnyHitNV %47 "any_hit" %41 %42 %44
15+
OpEntryPoint ClosestHitNV %55 "closest_hit" %50 %51 %53
16+
OpEntryPoint MissNV %61 "miss" %60
1717
OpEntryPoint IntersectionNV %64 "intersect_return"
1818
OpMemberDecorate %8 0 Offset 0
1919
OpMemberDecorate %8 1 Offset 4

0 commit comments

Comments
 (0)