Skip to content

Commit 6e5d85e

Browse files
author
Tim Foley
authored
Remove old code paths from render-test (shader-slang#1760)
* Remove old code paths from render-test Historically, the `render-test` tool was using three different code paths: * One based on `gfx` and manual (non-reflection-based) parameter setting, used for OpenGL, D3D11, D3D12, and Vulkan * One for CPU that used reflection-based parameter setting but shared no code with the first * One for CUDA that used reflection-based parameter setting and shared some, but not all, code with the CPU path Recently we've updated `render-test` to include a fourth option: * Using `gfx` and the "shader object" system it exposes for a unified reflection-based parameter-setting system taht works across OpenGL, D3D11, D3D12, Vulkan, CUDA, and CPU This change removes the first three options and leaves only the single unified path. A sa result, a bunch of code in `render-test` is no longer needed, and the codebase no longer relies on things like the `IDescriptorSet`-related APIs in `gfx`. Several existing tests had to be disabled to make this change possible. Those tests will need to be audited and either re-enabled once we fix issues in the shader object system, or permanently removed if they don't test stuff we intend to support in the long run (e.g., global-scope type parameters, which aren't a clear necessity). * fixup: CUDA detection logic
1 parent b64a23c commit 6e5d85e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+150
-5706
lines changed

‎build/visual-studio/render-test-tool/render-test-tool.vcxproj

-4
Original file line numberDiff line numberDiff line change
@@ -179,17 +179,13 @@
179179
</PostBuildEvent>
180180
</ItemDefinitionGroup>
181181
<ItemGroup>
182-
<ClInclude Include="..\..\..\tools\render-test\bind-location.h" />
183-
<ClInclude Include="..\..\..\tools\render-test\cpu-compute-util.h" />
184182
<ClInclude Include="..\..\..\tools\render-test\options.h" />
185183
<ClInclude Include="..\..\..\tools\render-test\png-serialize-util.h" />
186184
<ClInclude Include="..\..\..\tools\render-test\shader-input-layout.h" />
187185
<ClInclude Include="..\..\..\tools\render-test\shader-renderer-util.h" />
188186
<ClInclude Include="..\..\..\tools\render-test\slang-support.h" />
189187
</ItemGroup>
190188
<ItemGroup>
191-
<ClCompile Include="..\..\..\tools\render-test\bind-location.cpp" />
192-
<ClCompile Include="..\..\..\tools\render-test\cpu-compute-util.cpp" />
193189
<ClCompile Include="..\..\..\tools\render-test\options.cpp" />
194190
<ClCompile Include="..\..\..\tools\render-test\png-serialize-util.cpp" />
195191
<ClCompile Include="..\..\..\tools\render-test\render-test-main.cpp" />

‎build/visual-studio/render-test-tool/render-test-tool.vcxproj.filters

-12
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@
99
</Filter>
1010
</ItemGroup>
1111
<ItemGroup>
12-
<ClInclude Include="..\..\..\tools\render-test\bind-location.h">
13-
<Filter>Header Files</Filter>
14-
</ClInclude>
15-
<ClInclude Include="..\..\..\tools\render-test\cpu-compute-util.h">
16-
<Filter>Header Files</Filter>
17-
</ClInclude>
1812
<ClInclude Include="..\..\..\tools\render-test\options.h">
1913
<Filter>Header Files</Filter>
2014
</ClInclude>
@@ -32,12 +26,6 @@
3226
</ClInclude>
3327
</ItemGroup>
3428
<ItemGroup>
35-
<ClCompile Include="..\..\..\tools\render-test\bind-location.cpp">
36-
<Filter>Source Files</Filter>
37-
</ClCompile>
38-
<ClCompile Include="..\..\..\tools\render-test\cpu-compute-util.cpp">
39-
<Filter>Source Files</Filter>
40-
</ClCompile>
4129
<ClCompile Include="..\..\..\tools\render-test\options.cpp">
4230
<Filter>Source Files</Filter>
4331
</ClCompile>

‎tests/compute/dynamic-dispatch-12.slang

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// doesn't work right on the shader object path for a bunch
66
// of complicated reasons.
77

8-
//TEST(compute):COMPARE_COMPUTE:-dx11
9-
//TEST(compute):COMPARE_COMPUTE:-cpu
10-
//TEST(compute):COMPARE_COMPUTE:-vk
11-
//TEST(compute):COMPARE_COMPUTE:-cuda
8+
//DISABLED_TEST(compute):COMPARE_COMPUTE:-dx11
9+
//DISABLED_TEST(compute):COMPARE_COMPUTE:-cpu
10+
//DISABLED_TEST(compute):COMPARE_COMPUTE:-vk
11+
//DISABLED_TEST(compute):COMPARE_COMPUTE:-cuda
1212

1313
[anyValueSize(8)]
1414
interface IInterface

‎tests/compute/dynamic-dispatch-13.slang

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Test using interface typed shader parameters wrapped inside a `StructuredBuffer`.
22

3-
//TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj
4-
//TEST(compute):COMPARE_COMPUTE:-dx11
5-
//TEST(compute):COMPARE_COMPUTE:-vk
6-
//TEST(compute):COMPARE_COMPUTE:-cuda -shaderobj
3+
//DISABLED_TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj
4+
//DISABLED_TEST(compute):COMPARE_COMPUTE:-dx11
5+
//DISABLED_TEST(compute):COMPARE_COMPUTE:-vk
6+
//DISABLED_TEST(compute):COMPARE_COMPUTE:-cuda -shaderobj
77

88
[anyValueSize(8)]
99
interface IInterface

‎tests/compute/dynamic-dispatch-14.slang

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// Test using interface typed shader parameters with associated types.
22

3-
//TEST(compute):COMPARE_COMPUTE:-dx11
4-
//TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj
5-
//TEST(compute):COMPARE_COMPUTE:-vk
6-
//TEST(compute):COMPARE_COMPUTE:-cuda -shaderobj
3+
//DISABLED_TEST(compute):COMPARE_COMPUTE:-dx11
4+
//DISABLED_TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj
5+
//DISABLED_TEST(compute):COMPARE_COMPUTE:-vk
6+
//DISABLED_TEST(compute):COMPARE_COMPUTE:-cuda -shaderobj
77

88
[anyValueSize(8)]
99
interface IAssoc

‎tests/compute/dynamic-dispatch-bindless-texture.slang

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Test using interface typed shader parameters with texture typed fields.
2-
//TEST(compute):COMPARE_COMPUTE:-cpu
3-
//TEST(compute):COMPARE_COMPUTE:-cuda
2+
//DISABLED_TEST(compute):COMPARE_COMPUTE:-cpu
3+
//DISABLED_TEST(compute):COMPARE_COMPUTE:-cuda
44

55
[anyValueSize(16)]
66
interface IInterface

‎tests/compute/entry-point-uniform-params.slang

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
//DISABLE_TEST:CPU_REFLECTION: -profile cs_5_0 -entry computeMain -target cpp
77
//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
8-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -cpu
9-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
10-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12
11-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
8+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -cpu
9+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
10+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12
11+
//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
1212

1313
struct Signs
1414
{

‎tests/compute/global-type-param-array.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//TEST(compute):COMPARE_COMPUTE:
1+
//DISABLED_TEST(compute):COMPARE_COMPUTE:
22

33
//TEST_INPUT: cbuffer(data=[1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0], stride=4):name impl
44
//TEST_INPUT: ubuffer(data=[0], stride=4):out,name outputBuffer

‎tests/compute/global-type-param1.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//TEST(smoke,compute):COMPARE_COMPUTE:
1+
//DISABLED_TEST(smoke,compute):COMPARE_COMPUTE:
22

33

44
//TEST_INPUT: ubuffer(data=[0], stride=4):out,name outputBufer

‎tests/compute/global-type-param2.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//TEST(smoke,compute):COMPARE_COMPUTE:
1+
//DISABLED_TEST(smoke,compute):COMPARE_COMPUTE:
22

33
//TEST_INPUT: ubuffer(data=[0], stride=4):out,name outputBuffer
44
//TEST_INPUT: cbuffer(data=[0.5 0 0 0], stride=4):name existingBuffer

‎tests/compute/interface-shader-param-in-struct.slang

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
// This test puts interface-type shader parameters
44
// inside of structure types to make sure that works
55

6-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
6+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
77

8-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
9-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
8+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
9+
//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
1010

1111
// A lot of the setup is the same as for `interface-shader-param`,
1212
// so look there if you want the comments.

‎tests/compute/interface-shader-param-legalization.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Test case where concrete type implementing
44
// an interface has resource-type fields nested in it.
55

6-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
6+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
77

88
interface IModifier
99
{

‎tests/compute/interface-shader-param.slang

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
// Test using interface tops as top-level shader parameters
44
// (whether global, or on an entry point).
55

6-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
6+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
77

8-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
9-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
8+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
9+
//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
1010
//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute
1111

1212
// First we will define some fake interfaces for testing.

‎tests/compute/interface-shader-param2.slang

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
// concrete types that have data within them, instead of
55
// just empty types.
66

7-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
7+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
88

9-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
10-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
9+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
10+
//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
1111

1212
// A lot of the setup is the same as for `interface-shader-param`,
1313
// so look there if you want the comments.

‎tests/compute/interface-shader-param3.slang

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
// interface types at more complicated places in the overall layout.
55
//
66

7-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
7+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
88

9-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
10-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
9+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
10+
//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
1111

1212
// A lot of the setup is the same as for `interface-shader-param`,
1313
// so look there if you want the comments.

‎tests/compute/interface-shader-param4.slang

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// shader parameters.
66
//
77

8-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
8+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
99

10-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
11-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
10+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
11+
//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
1212

1313
// A lot of the setup is the same as for `interface-shader-param`,
1414
// so look there if you want the comments.

‎tests/compute/parameter-block.slang

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//TEST(compute):COMPARE_COMPUTE:
2-
//TEST(compute):COMPARE_COMPUTE:-cpu
1+
//TEST_DISABLED(compute):COMPARE_COMPUTE:
2+
//TEST_DISABLED(compute):COMPARE_COMPUTE:-cpu
33

44
//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=block0.buffer
55
//TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):name=block1.buffer

‎tests/compute/performance-profile.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//TEST(compute):PERFORMANCE_PROFILE:-cpu -compute -compile-arg -O3 -compute-dispatch 256,1,1 -shaderobj
2-
//TEST(compute):PERFORMANCE_PROFILE:-cpu -compute -source-language cpp -compile-arg -O3 -compute-dispatch 256,1,1
2+
//TEST_DISABLED(compute):PERFORMANCE_PROFILE:-cpu -compute -source-language cpp -compile-arg -O3 -compute-dispatch 256,1,1
33
//TEST(compute):PERFORMANCE_PROFILE:-slang -compute -compute-dispatch 256,1,1 -shaderobj
44
//TEST(compute):PERFORMANCE_PROFILE:-slang -compute -dx12 -compute-dispatch 256,1,1 -shaderobj
55
//TEST(compute, vulkan):PERFORMANCE_PROFILE:-vk -compute -compute-dispatch 256,1,1 -shaderobj

‎tests/compute/rewriter-parameter-block-complex.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//TEST(compute):COMPARE_COMPUTE:
1+
//DISABLED_TEST(compute):COMPARE_COMPUTE:
22

33
//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out, name=outputBuffer
44

‎tests/compute/rewriter-parameter-block.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//TEST(compute):COMPARE_COMPUTE:
1+
//DISABLED_TEST(compute):COMPARE_COMPUTE:
22

33
//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
44

‎tests/compute/tagged-union.slang

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// tagged-union.slang
2-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
3-
//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12
4-
//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
2+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
3+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12
4+
//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
55

66

77
// The goal of this test is to show that we can generate

‎tests/compute/type-param-varying.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//TEST(compute):COMPARE_RENDER_COMPUTE:
1+
//DISABLED_TEST(compute):COMPARE_RENDER_COMPUTE:
22

33
//TEST_INPUT: global_type AssembledVertex
44
//TEST_INPUT: ubuffer(data=[0], stride=4):out

‎tests/compute/unbounded-array-of-array-syntax.slang

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
//IGNORE_TEST:CPU_REFLECTION: -profile cs_5_0 -entry computeMain -target cpp
2-
//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute
2+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute
33
//TEST:CROSS_COMPILE:-target dxbc-assembly -entry computeMain -profile cs_5_1
44
//TEST:CROSS_COMPILE:-target spirv-assembly -entry computeMain -profile cs_5_1
5-
//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute
5+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute
66

77
//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer
88
RWStructuredBuffer<int> outputBuffer;

‎tests/compute/unbounded-array-of-array.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//DISABLE_TEST:CPU_REFLECTION: -profile cs_5_0 -entry computeMain -target cpp
2-
//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute
2+
//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute
33

44
struct IntAoa { RWStructuredBuffer<int> array[]; }
55

‎tests/disabled-tests.txt

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
Tests that were disabled for Reasons
2+
====================================
3+
4+
This document is intended to track tests that have been disabled temporarily so that we can understand the cause and try to re-enable them when possible.
5+
6+
Test that don't work with shader objects in render-test
7+
-------------------------------------------------------
8+
9+
The following tests were disabled because they had been running on non `-shaderobj` code paths that have since been removed.
10+
These tests will need to be re-enabled together with changes to the shader object implementation, or removed entirely if they no longer test useful functionality.
11+
12+
* compute/dynamic-dispatch-12.slang
13+
* compute/dynamic-dispatch-13.slang
14+
* compute/dynamic-dispatch-14.slang
15+
* compute/dynamic-dispatch-bindless-texture.slang
16+
* compute/entry-point-uniform-params.slang
17+
* compute/global-type-param2.slang
18+
* compute/global-type-param-array.slang
19+
* compute/global-type-param1.slang
20+
* compute/interface-shader-param-in-struct.slang
21+
* compute/interface-shader-param-legalization.slang
22+
* compute/interface-shader-param.slang
23+
* compute/parameter-block.slang
24+
* compute/performance-profile.slang
25+
* compute/rewriter-parameter-block-complex.hlsl
26+
* compute/unbounded-array-of-array-syntax.slang
27+
* compute/unbounded-array-of-array.slang
28+
* render/cross-compile-entry-point.slang
29+
* compute/interface-shader-param2.slang
30+
* compute/interface-shader-param3.slang
31+
* compute/interface-shader-param4.slang
32+
* compute/rewriter-parameter-block.hlsl
33+
* compute/tagged-union.slang
34+
* compute/type-param-varying.slang
35+
* language-feature/shader-params/global-uniform-params.slang
36+
* tests/serialization/serialized-module-entry-point-test.slang
37+
* serialization/library-entry-point/library-entry-point-test.slang
38+
* render/cross-compile-entry-point.slang
39+
* render/cross-compile0.hlsl
40+
* render/imported-parameters.hlsl
41+
* render/nointerpolation.hlsl
42+
* render/render0.hlsl
43+
* render/tess.hlsl
44+
* render/unused-discard.hlsl

‎tests/language-feature/shader-params/global-uniform-params.slang

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// global-uniform-params.slang
22

3-
//TEST(compute):COMPARE_COMPUTE:
3+
//DISABLED_TEST(compute):COMPARE_COMPUTE:
44

55
// Test that code can use uniform parameters
66
// of "ordinary" type declared at the global scope

‎tests/render/cross-compile-entry-point.slang

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//TEST(render):COMPARE_HLSL_CROSS_COMPILE_RENDER:
2-
//TEST(render):COMPARE_HLSL_CROSS_COMPILE_RENDER: -dx12
1+
//DISABLED_TEST(render):COMPARE_HLSL_CROSS_COMPILE_RENDER:
2+
//DISABLED_TEST(render):COMPARE_HLSL_CROSS_COMPILE_RENDER: -dx12
33

44
// This is a test to ensure that we can cross-compile a complete entry point.
55

‎tests/render/cross-compile0.hlsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
2-
//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
1+
//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
2+
//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
33

44
// This is a basic test case for cross-compilation behavior.
55
//

‎tests/render/imported-parameters.hlsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
2-
//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
1+
//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
2+
//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
33

44
// This test is trying to ensure that we can
55
// correctly handle cases where top-level shader

‎tests/render/nointerpolation.hlsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//TEST(smoke):COMPARE_HLSL_RENDER:
2-
//TEST(smoke):COMPARE_HLSL_RENDER: -dx12
1+
//DISABLED_TEST(smoke):COMPARE_HLSL_RENDER:
2+
//DISABLED_TEST(smoke):COMPARE_HLSL_RENDER: -dx12
33

44
// Confirm that the `nointerpolation` modifier
55
// makes it through Slang codegen with the

‎tests/render/render0.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//TEST(smoke):COMPARE_HLSL_RENDER:
1+
//DISABLED_TEST(smoke):COMPARE_HLSL_RENDER:
22
// Starting with a basic test for the ability to render stuff...
33

44
cbuffer Uniforms

‎tests/render/tess.hlsl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//TEST:COMPARE_HLSL: -profile sm_5_1 -entry HS -stage hull -entry DS -stage domain
1+
//DISABLED_TEST:COMPARE_HLSL: -profile sm_5_1 -entry HS -stage hull -entry DS -stage domain
22

33
// tests/render/tess.hlsl
44

‎tests/render/unused-discard.hlsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
2-
//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
1+
//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
2+
//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
33

44
// This is a basic test case for cross-compilation behavior.
55
//

‎tests/serialization/library-entry-point/library-entry-point-test.slang

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// library-entry-point-test.slang
22

3-
//TEST:COMPILE: -module-name module -no-codegen -profile cs_5_0 -entry computeMain tests/serialization/library-entry-point/library-entry-point.slang -o tests/serialization/library-entry-point/library-entry-point.slang-lib
4-
//TEST:COMPARE_COMPUTE_EX: -no-default-entry-point -xslang -module-name -xslang module -slang -compute -xslang -r -xslang tests/serialization/library-entry-point/library-entry-point.slang-lib
3+
//DISABLED_TEST:COMPILE: -module-name module -no-codegen -profile cs_5_0 -entry computeMain tests/serialization/library-entry-point/library-entry-point.slang -o tests/serialization/library-entry-point/library-entry-point.slang-lib
4+
//DISABLED_TEST:COMPARE_COMPUTE_EX: -no-default-entry-point -xslang -module-name -xslang module -slang -compute -xslang -r -xslang tests/serialization/library-entry-point/library-entry-point.slang-lib
55

66
//TEST_INPUT:ubuffer(data=[0 0 0 0 ], stride=4):out,name outputBuffer
77

‎tests/serialization/serialized-module-entry-point-test.slang

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// serialized-module-entry-point-test.slang
22

3-
//TEST:COMPILE: -module-name module -target hlsl -profile cs_5_0 -entry computeMain tests/serialization/serialized-module-entry-point.slang -o tests/serialization/serialized-module-entry-point.slang-module
4-
//TEST:COMPILE: -module-name module tests/serialization/serialized-module.slang -o tests/serialization/serialized-module.slang-module -ir-compression none
5-
//TEST:COMPARE_COMPUTE_EX: -xslang -module-name -xslang module -slang -compute -xslang -r -xslang tests/serialization/serialized-module-entry-point.slang-module -xslang -r -xslang tests/serialization/serialized-module.slang-module -no-default-entry-point
3+
//DISABLED_TEST:COMPILE: -module-name module -target hlsl -profile cs_5_0 -entry computeMain tests/serialization/serialized-module-entry-point.slang -o tests/serialization/serialized-module-entry-point.slang-module
4+
//DISABLED_TEST:COMPILE: -module-name module tests/serialization/serialized-module.slang -o tests/serialization/serialized-module.slang-module -ir-compression none
5+
//DISABLED_TEST:COMPARE_COMPUTE_EX: -xslang -module-name -xslang module -slang -compute -xslang -r -xslang tests/serialization/serialized-module-entry-point.slang-module -xslang -r -xslang tests/serialization/serialized-module.slang-module -no-default-entry-point
66

77
//TEST_INPUT:ubuffer(data=[0 0 0 0 ], stride=4):out,name outputBuffer

0 commit comments

Comments
 (0)