From f0560824fec06e331cca40ade7b181ff1577dc3c Mon Sep 17 00:00:00 2001
From: Markus Siglreithmaier <m.siglreith@gmail.com>
Date: Tue, 31 Aug 2021 10:09:05 +0200
Subject: [PATCH] std: fix ray query initialization and proceed result (#740)

---
 crates/spirv-std/src/ray_tracing.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/crates/spirv-std/src/ray_tracing.rs b/crates/spirv-std/src/ray_tracing.rs
index 7c8bf9a3ec..23403feb66 100644
--- a/crates/spirv-std/src/ray_tracing.rs
+++ b/crates/spirv-std/src/ray_tracing.rs
@@ -219,11 +219,12 @@ impl RayQuery {
         ray_tmax: f32,
     ) {
         asm! {
+            "%acceleration_structure = OpLoad _ {acceleration_structure}",
             "%origin = OpLoad _ {ray_origin}",
             "%direction = OpLoad _ {ray_direction}",
             "OpRayQueryInitializeKHR \
                 {ray_query} \
-                {acceleration_structure} \
+                %acceleration_structure \
                 {ray_flags} \
                 {cull_mask} \
                 %origin \
@@ -256,7 +257,7 @@ impl RayQuery {
             "%u32_0 = OpConstant %u32 0",
             "%u32_1 = OpConstant %u32 1",
             "%result = OpRayQueryProceedKHR %bool {ray_query}",
-            "{result} = OpSelect %u32 %result %u32_0 %u32_1",
+            "{result} = OpSelect %u32 %result %u32_1 %u32_0",
             ray_query = in(reg) self,
             result = out(reg) result,
         }