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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/pipeline/ray-tracing/trace-ray-inline.slang | 2 | ||||
| -rw-r--r-- | tests/pipeline/ray-tracing/trace-ray-inline.slang.glsl | 2 | ||||
| -rw-r--r-- | tests/pipeline/ray-tracing/trace-ray-inline.slang.hlsl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/pipeline/ray-tracing/trace-ray-inline.slang b/tests/pipeline/ray-tracing/trace-ray-inline.slang index 774a392a8..6bbc776c5 100644 --- a/tests/pipeline/ray-tracing/trace-ray-inline.slang +++ b/tests/pipeline/ray-tracing/trace-ray-inline.slang @@ -104,7 +104,7 @@ void main(uint3 tid : SV_DispatchThreadID) { uint index = tid.x; - RayQuery<RAY_FLAG_NONE> query; + RayQuery<RAY_FLAG_SKIP_PROCEDURAL_PRIMITIVES> query; MyProceduralHitAttrs committedProceduralAttrs; MyRayPayload payload = { -1 }; diff --git a/tests/pipeline/ray-tracing/trace-ray-inline.slang.glsl b/tests/pipeline/ray-tracing/trace-ray-inline.slang.glsl index 7808de0df..e591fc391 100644 --- a/tests/pipeline/ray-tracing/trace-ray-inline.slang.glsl +++ b/tests/pipeline/ray-tracing/trace-ray-inline.slang.glsl @@ -93,7 +93,7 @@ void main() payload_5 = _S2; RayDesc_0 ray_0 = { C_0._data.origin_0, C_0._data.tMin_0, C_0._data.direction_0, C_0._data.tMax_0 }; - rayQueryInitializeEXT((query_0), (myAccelerationStructure_0), (C_0._data.rayFlags_0), (C_0._data.instanceMask_0), (ray_0.Origin_0), (ray_0.TMin_0), (ray_0.Direction_0), (ray_0.TMax_0)); + rayQueryInitializeEXT((query_0), (myAccelerationStructure_0), (C_0._data.rayFlags_0 | 512), (C_0._data.instanceMask_0), (ray_0.Origin_0), (ray_0.TMin_0), (ray_0.Direction_0), (ray_0.TMax_0)); MyProceduralHitAttrs_0 _S3; committedProceduralAttrs_0 = _S3; diff --git a/tests/pipeline/ray-tracing/trace-ray-inline.slang.hlsl b/tests/pipeline/ray-tracing/trace-ray-inline.slang.hlsl index cdea1668a..97d972328 100644 --- a/tests/pipeline/ray-tracing/trace-ray-inline.slang.hlsl +++ b/tests/pipeline/ray-tracing/trace-ray-inline.slang.hlsl @@ -75,7 +75,7 @@ void main(vector<uint,3> tid_0 : SV_DISPATCHTHREADID) MyRayPayload_0 payload_7; MyProceduralHitAttrs_0 committedProceduralAttrs_3; - RayQuery<int(0) > query_0; + RayQuery<int(512) > query_0; MyRayPayload_0 _S1 = { int(-1) }; RayDesc ray_0 = { C_0.origin_0, C_0.tMin_0, C_0.direction_0, C_0.tMax_0 }; |