summaryrefslogtreecommitdiffstats
path: root/tests/render
diff options
context:
space:
mode:
authorTim Foley <tfoleyNV@users.noreply.github.com>2021-03-17 12:55:30 -0700
committerGitHub <noreply@github.com>2021-03-17 12:55:30 -0700
commit6e5d85efb9fa5f647f7f0c7ef784a9fd09b29023 (patch)
tree6206ef11502a1a5d9c1dc00df359be9aececffdf /tests/render
parentb64a23cccfe9876d53cda773afc796bd975fa7e5 (diff)
Remove old code paths from render-test (#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
Diffstat (limited to 'tests/render')
-rw-r--r--tests/render/cross-compile-entry-point.slang4
-rw-r--r--tests/render/cross-compile0.hlsl4
-rw-r--r--tests/render/imported-parameters.hlsl4
-rw-r--r--tests/render/nointerpolation.hlsl4
-rw-r--r--tests/render/render0.hlsl2
-rw-r--r--tests/render/tess.hlsl2
-rw-r--r--tests/render/unused-discard.hlsl4
7 files changed, 12 insertions, 12 deletions
diff --git a/tests/render/cross-compile-entry-point.slang b/tests/render/cross-compile-entry-point.slang
index fa35833f0..24d3c711d 100644
--- a/tests/render/cross-compile-entry-point.slang
+++ b/tests/render/cross-compile-entry-point.slang
@@ -1,5 +1,5 @@
-//TEST(render):COMPARE_HLSL_CROSS_COMPILE_RENDER:
-//TEST(render):COMPARE_HLSL_CROSS_COMPILE_RENDER: -dx12
+//DISABLED_TEST(render):COMPARE_HLSL_CROSS_COMPILE_RENDER:
+//DISABLED_TEST(render):COMPARE_HLSL_CROSS_COMPILE_RENDER: -dx12
// This is a test to ensure that we can cross-compile a complete entry point.
diff --git a/tests/render/cross-compile0.hlsl b/tests/render/cross-compile0.hlsl
index 3d25c93e5..33eb8a460 100644
--- a/tests/render/cross-compile0.hlsl
+++ b/tests/render/cross-compile0.hlsl
@@ -1,5 +1,5 @@
-//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
-//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
+//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
+//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
// This is a basic test case for cross-compilation behavior.
//
diff --git a/tests/render/imported-parameters.hlsl b/tests/render/imported-parameters.hlsl
index 0bee75bf9..40ea18e2a 100644
--- a/tests/render/imported-parameters.hlsl
+++ b/tests/render/imported-parameters.hlsl
@@ -1,5 +1,5 @@
-//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
-//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
+//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
+//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
// This test is trying to ensure that we can
// correctly handle cases where top-level shader
diff --git a/tests/render/nointerpolation.hlsl b/tests/render/nointerpolation.hlsl
index 644692e36..0819849ac 100644
--- a/tests/render/nointerpolation.hlsl
+++ b/tests/render/nointerpolation.hlsl
@@ -1,5 +1,5 @@
-//TEST(smoke):COMPARE_HLSL_RENDER:
-//TEST(smoke):COMPARE_HLSL_RENDER: -dx12
+//DISABLED_TEST(smoke):COMPARE_HLSL_RENDER:
+//DISABLED_TEST(smoke):COMPARE_HLSL_RENDER: -dx12
// Confirm that the `nointerpolation` modifier
// makes it through Slang codegen with the
diff --git a/tests/render/render0.hlsl b/tests/render/render0.hlsl
index e6849fe60..967f23adb 100644
--- a/tests/render/render0.hlsl
+++ b/tests/render/render0.hlsl
@@ -1,4 +1,4 @@
-//TEST(smoke):COMPARE_HLSL_RENDER:
+//DISABLED_TEST(smoke):COMPARE_HLSL_RENDER:
// Starting with a basic test for the ability to render stuff...
cbuffer Uniforms
diff --git a/tests/render/tess.hlsl b/tests/render/tess.hlsl
index 873c0bc8c..3d3e87c34 100644
--- a/tests/render/tess.hlsl
+++ b/tests/render/tess.hlsl
@@ -1,4 +1,4 @@
-//TEST:COMPARE_HLSL: -profile sm_5_1 -entry HS -stage hull -entry DS -stage domain
+//DISABLED_TEST:COMPARE_HLSL: -profile sm_5_1 -entry HS -stage hull -entry DS -stage domain
// tests/render/tess.hlsl
diff --git a/tests/render/unused-discard.hlsl b/tests/render/unused-discard.hlsl
index 2a99b77bb..e94391ec9 100644
--- a/tests/render/unused-discard.hlsl
+++ b/tests/render/unused-discard.hlsl
@@ -1,5 +1,5 @@
-//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
-//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
+//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
+//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
// This is a basic test case for cross-compilation behavior.
//