diff options
| -rw-r--r-- | tests/expected-failure-github.txt | 2 | ||||
| -rw-r--r-- | tests/hlsl-intrinsic/texture/partial-resident-texture.slang | 10 | ||||
| -rw-r--r-- | tools/test-server/test-server-main.cpp | 14 |
3 files changed, 21 insertions, 5 deletions
diff --git a/tests/expected-failure-github.txt b/tests/expected-failure-github.txt index b9b1e4b39..e7298312b 100644 --- a/tests/expected-failure-github.txt +++ b/tests/expected-failure-github.txt @@ -13,3 +13,5 @@ tests/bugs/buffer-swizzle-store.slang.3 syn (wgpu) tests/compute/interface-shader-param-in-struct.slang.4 syn (wgpu) tests/compute/interface-shader-param.slang.5 syn (wgpu) tests/language-feature/shader-params/interface-shader-param-ordinary.slang.4 syn (wgpu) +gfx-unit-test-tool/RayTracingTestAD3D12.internal +gfx-unit-test-tool/RayTracingTestBD3D12.internal diff --git a/tests/hlsl-intrinsic/texture/partial-resident-texture.slang b/tests/hlsl-intrinsic/texture/partial-resident-texture.slang index 878ef02d3..ba7e31835 100644 --- a/tests/hlsl-intrinsic/texture/partial-resident-texture.slang +++ b/tests/hlsl-intrinsic/texture/partial-resident-texture.slang @@ -15,12 +15,12 @@ RWByteAddressBuffer iBuf; //TEST_INPUT: Sampler:name samplerState SamplerState samplerState; -__generic<T : __BuiltinArithmeticType, let N:int> -bool TEST_texture( - Texture2D<vector<T,N>> t2D, - Texture2DMS<vector<T,N>> t2DMS) +bool TEST_texture<T>( + Texture2D<T> t2D, + Texture2DMS<T> t2DMS) + where T : ITexelElement, IArithmetic { - typealias TN = vector<T,N>; + typealias TN = T; constexpr const int2 offset = int2(0, 0); uint status; float clamp = 0; diff --git a/tools/test-server/test-server-main.cpp b/tools/test-server/test-server-main.cpp index 16867f4cb..1f1fbd066 100644 --- a/tools/test-server/test-server-main.cpp +++ b/tools/test-server/test-server-main.cpp @@ -18,6 +18,20 @@ #include <stdlib.h> #include <string.h> +#if defined(_WIN32) +// https://devblogs.microsoft.com/directx/gettingstarted-dx12agility/#2.-set-agility-sdk-parameters + +extern "C" +{ + __declspec(dllexport) extern const uint32_t D3D12SDKVersion = 711; +} + +extern "C" +{ + __declspec(dllexport) extern const char* D3D12SDKPath = u8".\\D3D12\\"; +} +#endif + namespace TestServer { using namespace Slang; |