From b69b0e43e27ec94c0397774db804b4077b062b21 Mon Sep 17 00:00:00 2001
From: Alexey Panteleev <alpanteleev@nvidia.com>
Date: Mon, 25 Apr 2022 15:43:39 -0700
Subject: Fixed the implementation of RayQuery flags passed through the generic
 parameter on GLSL. (#2207)

Improved the trace-ray-inline test to check that the flag is not ignored anymore.
---
 source/slang/hlsl.meta.slang | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source')

diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang
index e404aa626..2c969e174 100644
--- a/source/slang/hlsl.meta.slang
+++ b/source/slang/hlsl.meta.slang
@@ -5026,7 +5026,7 @@ __target_intrinsic(hlsl, RayQuery)
 __target_intrinsic(glsl, rayQueryEXT)
 __glsl_extension(GL_EXT_ray_query)
 __glsl_version(460)
-struct RayQuery <let rayFlags : RAY_FLAG = RAY_FLAG_NONE>
+struct RayQuery <let rayFlagsGeneric : RAY_FLAG = RAY_FLAG_NONE>
 {
     // Initialize the query object in a "fresh" state.
     //
@@ -5074,7 +5074,7 @@ struct RayQuery <let rayFlags : RAY_FLAG = RAY_FLAG_NONE>
     {
         __rayQueryInitializeEXT(
             accelerationStructure,
-            rayFlags,
+            rayFlags | rayFlagsGeneric,
             instanceInclusionMask,
             ray.Origin,
             ray.TMin,
-- 
cgit v1.2.3