diff options
| author | Jay Kwak <82421531+jkwak-work@users.noreply.github.com> | 2025-04-01 13:01:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-01 13:01:25 -0700 |
| commit | 6f3b8351c9cb50d16573fbb204b98b6810e97d48 (patch) | |
| tree | 22a830ae085d37fa337b590c4de185db9d4527a7 | |
| parent | 549aa897bcfedc28fb2ef8009396f846ea182b72 (diff) | |
Use coopvec supporting dxcompiler.dll and dxil.dll (#6719)
* Use coopvec supporting dxcompiler.dll and dxil.dll
* Fix the failing tests
| m--------- | external/slang-binaries | 0 | ||||
| -rw-r--r-- | tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-ahit.slang | 4 | ||||
| -rw-r--r-- | tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-int.slang | 7 | ||||
| -rw-r--r-- | tests/metal/texture.slang | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/external/slang-binaries b/external/slang-binaries -Subproject ae6616fa0e3fb0a8e343e55e9e4d63b5eecfdf6 +Subproject 8f6ab9c2fa6361201aee9c60bc7d3d3b4460d96 diff --git a/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-ahit.slang b/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-ahit.slang index 0d6d70b4a..e323e9e22 100644 --- a/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-ahit.slang +++ b/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-ahit.slang @@ -47,15 +47,13 @@ // DXIL: call i32 @dx.op.instanceID.i32 // DXIL: call i32 @dx.op.geometryIndex.i32 // DXIL: call i32 @dx.op.primitiveIndex.i32 + // DXIL: call float @dx.op.objectRayOrigin.f32 // DXIL: call float @dx.op.objectRayDirection.f32 // DXIL: call float @dx.op.objectToWorld.f32 // DXIL: call float @dx.op.worldToObject.f32 // DXIL: call i32 @dx.op.hitKind.i32 -// DXIL: call float @dx.op.objectRayOrigin.f32 -// DXIL: call float @dx.op.objectRayDirection.f32 -// DXIL: call float @dx.op.rayTCurrent.f32 // DXIL: call void @dx.op.acceptHitAndEndSearch // DXIL: call void @dx.op.ignoreHit diff --git a/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-int.slang b/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-int.slang index 74bd62b9e..9b59291f7 100644 --- a/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-int.slang +++ b/tests/hlsl-intrinsic/ray-tracing/rt-pipeline-intrinsics-int.slang @@ -32,11 +32,12 @@ // DXIL: main +// DXIL: call float @dx.op.worldRayOrigin.f32 +// DXIL: call float @dx.op.worldRayDirection.f32 + // DXIL: call i32 @dx.op.dispatchRaysIndex.i32 // DXIL: call i32 @dx.op.dispatchRaysDimensions.i32 -// DXIL: call float @dx.op.worldRayOrigin.f32 -// DXIL: call float @dx.op.worldRayDirection.f32 // DXIL: call float @dx.op.rayTMin.f32 // DXIL: call float @dx.op.rayTCurrent.f32 // DXIL: call i32 @dx.op.rayFlags.i32 @@ -50,8 +51,6 @@ // DXIL: call float @dx.op.objectToWorld.f32 // DXIL: call float @dx.op.worldToObject.f32 -// DXIL: call float @dx.op.rayTMin.f32 -// DXIL: call float @dx.op.rayTCurrent.f32 // DXIL: call i1 @dx.op.reportHit.struct.MyAttributes_0 float CheckRayDispatchValues() // all diff --git a/tests/metal/texture.slang b/tests/metal/texture.slang index 90a42e3d6..174717da4 100644 --- a/tests/metal/texture.slang +++ b/tests/metal/texture.slang @@ -741,7 +741,7 @@ bool TEST_texture<T>( return result; } -[numthreads(1, 1, 1)] +[numthreads(2, 2, 1)] void computeMain() { // SPIR: OpEntryPoint |