From 09854a4596019ddb3bb315b8836b5c88e718cdc7 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Tue, 12 Sep 2023 11:13:11 +0800 Subject: Add Mesh and Task shader support to GFX (#3190) * Bump vulkan headers Also just use vulkan-headers as a submodule * Add drawMeshTasks to gfx graphics pipelines * Add DispatchMesh overload with no payload, with GLSL intrinsic * Require spirv 1.4 for mesh shaders * Add vulkan mesh shader feature discovery * Add mesh shader stage bits to vk-util * Add mesh and task shader support to render-test * Add mesh and task tests * Preserve "payload" specifier in task shaders * Add mesh shader pipeline support to gfx * Add TODO * Add numThreads attribute for amplification stage * Add payload to task shader test * Drop dependency on d3dx12 * Allow passing payloads from task to mesh shaders * regenerate vs projects * check DispatchMesh name correctly * Add mesh shader tests to failing tests * Detect wave-ops feature on vulkan * Add fuse-product to expected failures This fails because the global varaible `count` is not initialized * Add required extension to WaveMaskMatch SPIR-V impl * Remove meshShader member from pipeline desc * Identify mesh shader support on d3d12 --- tests/language-feature/saturated-cooperation/fuse-product.slang | 5 ++--- tests/language-feature/saturated-cooperation/fuse.slang | 5 ++--- tests/language-feature/saturated-cooperation/fuse3.slang | 5 ++--- tests/language-feature/saturated-cooperation/simple.slang | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) (limited to 'tests/language-feature') diff --git a/tests/language-feature/saturated-cooperation/fuse-product.slang b/tests/language-feature/saturated-cooperation/fuse-product.slang index 2d1029140..d59df2db3 100644 --- a/tests/language-feature/saturated-cooperation/fuse-product.slang +++ b/tests/language-feature/saturated-cooperation/fuse-product.slang @@ -1,8 +1,7 @@ -//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX():-vk -compute -shaderobj -output-using-type -//TEST(compute):COMPARE_COMPUTE_EX():-dx12 -profile sm_6_5 -use-dxil -compute -shaderobj -output-using-type +//TEST(compute, vulkan):COMPARE_COMPUTE_EX():-vk -compute -shaderobj -output-using-type -render-features wave-ops +//TEST(compute):COMPARE_COMPUTE_EX():-dx12 -profile sm_6_5 -use-dxil -compute -shaderobj -output-using-type -render-features wave-ops //TEST:SIMPLE(filecheck=CHECK):-target hlsl -profile cs_6_5 -entry computeMain -line-directive-mode none //TEST:SIMPLE(filecheck=CHECK):-target glsl -profile cs_6_5 -entry computeMain -line-directive-mode none -// Disabled because some testing infra (swiftshader) doens't support the necessary wave ops // // This test checks that we fuse calls to saturated cooperation, even with different input values diff --git a/tests/language-feature/saturated-cooperation/fuse.slang b/tests/language-feature/saturated-cooperation/fuse.slang index 1492be4f3..5feb46e2e 100644 --- a/tests/language-feature/saturated-cooperation/fuse.slang +++ b/tests/language-feature/saturated-cooperation/fuse.slang @@ -1,6 +1,5 @@ -//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX():-vk -compute -shaderobj -output-using-type -//TEST(compute):COMPARE_COMPUTE_EX():-dx12 -profile sm_6_5 -use-dxil -compute -shaderobj -output-using-type -// Disabled because some testing infra (swiftshader) doens't support the necessary wave ops +//TEST(compute, vulkan):COMPARE_COMPUTE_EX():-vk -compute -shaderobj -output-using-type -render-features wave-ops +//TEST(compute):COMPARE_COMPUTE_EX():-dx12 -profile sm_6_5 -use-dxil -compute -shaderobj -output-using-type -render-features wave-ops // // This test checks whether adjacent calls to saturated_cooperation are fused diff --git a/tests/language-feature/saturated-cooperation/fuse3.slang b/tests/language-feature/saturated-cooperation/fuse3.slang index 6d5fd9e06..884f65652 100644 --- a/tests/language-feature/saturated-cooperation/fuse3.slang +++ b/tests/language-feature/saturated-cooperation/fuse3.slang @@ -1,6 +1,5 @@ -//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX():-vk -compute -shaderobj -output-using-type -//TEST(compute):COMPARE_COMPUTE_EX():-dx12 -profile sm_6_5 -use-dxil -compute -shaderobj -output-using-type -// Disabled because some testing infra (swiftshader) doens't support the necessary wave ops +//TEST(compute, vulkan):COMPARE_COMPUTE_EX():-vk -compute -shaderobj -output-using-type -render-features wave-ops +//TEST(compute):COMPARE_COMPUTE_EX():-dx12 -profile sm_6_5 -use-dxil -compute -shaderobj -output-using-type -render-features wave-ops // // This test checks whether more than 2 adjacent calls to saturated_cooperation diff --git a/tests/language-feature/saturated-cooperation/simple.slang b/tests/language-feature/saturated-cooperation/simple.slang index 3b9fb24e7..d2ea6faed 100644 --- a/tests/language-feature/saturated-cooperation/simple.slang +++ b/tests/language-feature/saturated-cooperation/simple.slang @@ -1,6 +1,5 @@ -//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX():-vk -compute -shaderobj -output-using-type -//TEST(compute):COMPARE_COMPUTE_EX():-dx12 -profile sm_6_5 -use-dxil -compute -shaderobj -output-using-type -// Disabled because some testing infra (swiftshader) doens't support the necessary wave ops +//TEST(compute, vulkan):COMPARE_COMPUTE_EX():-vk -compute -shaderobj -output-using-type -render-features wave-ops +//TEST(compute):COMPARE_COMPUTE_EX():-dx12 -profile sm_6_5 -use-dxil -compute -shaderobj -output-using-type -render-features wave-ops //TEST_INPUT:ubuffer(data=[0 3 2 2], stride=4):out,name=outputBuffer RWStructuredBuffer outputBuffer; -- cgit v1.2.3