diff options
| author | Alexey Panteleev <alpanteleev@nvidia.com> | 2022-04-25 15:43:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 15:43:39 -0700 |
| commit | b69b0e43e27ec94c0397774db804b4077b062b21 (patch) | |
| tree | 1d67fec483bddfad36d04d81b1a5e7e672455d41 /source | |
| parent | bec92dd292226a2cc51e2d8e585743df739f16c8 (diff) | |
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.
Diffstat (limited to 'source')
| -rw-r--r-- | source/slang/hlsl.meta.slang | 4 |
1 files changed, 2 insertions, 2 deletions
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, |