From 6e5d85efb9fa5f647f7f0c7ef784a9fd09b29023 Mon Sep 17 00:00:00 2001 From: Tim Foley Date: Wed, 17 Mar 2021 12:55:30 -0700 Subject: 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 --- tests/render/cross-compile-entry-point.slang | 4 ++-- tests/render/cross-compile0.hlsl | 4 ++-- tests/render/imported-parameters.hlsl | 4 ++-- tests/render/nointerpolation.hlsl | 4 ++-- tests/render/render0.hlsl | 2 +- tests/render/tess.hlsl | 2 +- tests/render/unused-discard.hlsl | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) (limited to 'tests/render') 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. // -- cgit v1.2.3