From f1de1817ca10e34ec6a844100f10f0de3340c9f2 Mon Sep 17 00:00:00 2001 From: Yong He Date: Tue, 23 Apr 2024 12:14:21 -0700 Subject: Switch to direct-to-spirv backend as default. (#4002) * Switch to direct-to-spirv backend as default. * Fix slang-test. * Fix. * Fix. --- tests/pipeline/rasterization/mesh/hello.slang | 12 +++++++----- tests/pipeline/rasterization/mesh/primitive-output.slang | 1 - 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'tests/pipeline') diff --git a/tests/pipeline/rasterization/mesh/hello.slang b/tests/pipeline/rasterization/mesh/hello.slang index 54a50079d..8a64805c0 100644 --- a/tests/pipeline/rasterization/mesh/hello.slang +++ b/tests/pipeline/rasterization/mesh/hello.slang @@ -2,16 +2,18 @@ // Test that a simple mesh shader compiles -//TEST:CROSS_COMPILE(filecheck=SPIRV):-target spirv-assembly -entry main -stage mesh -profile glsl_450+spirv_1_4 -//TEST:CROSS_COMPILE(filecheck=DXIL):-target dxil-assembly -entry main -stage mesh -profile sm_6_6 +//TEST:SIMPLE(filecheck=SPIRV):-target spirv-assembly -entry main -stage mesh -profile glsl_450+spirv_1_4 +//TEST:SIMPLE(filecheck=DXIL):-target dxil-assembly -entry main -stage mesh -profile sm_6_6 // DXIL: call void @dx.op.setMeshOutputCounts // DXIL: call void @dx.op.storeVertexOutput.f32 // DXIL: call void @dx.op.emitIndices // SPIRV: OpEntryPoint MeshEXT %main -// SPIRV: OpExecutionMode %main OutputVertices 3 -// SPIRV: OpExecutionMode %main OutputPrimitivesNV 1 -// SPIRV: OpExecutionMode %main OutputTrianglesNV + +// SPIRV-DAG: OpExecutionMode %main OutputVertices 3 +// SPIRV-DAG: OpExecutionMode %main OutputPrimitivesNV 1 +// SPIRV-DAG: OpExecutionMode %main OutputTrianglesNV + // SPIRV: OpSetMeshOutputsEXT const static float2 positions[3] = { diff --git a/tests/pipeline/rasterization/mesh/primitive-output.slang b/tests/pipeline/rasterization/mesh/primitive-output.slang index c83574d85..683fe19d1 100644 --- a/tests/pipeline/rasterization/mesh/primitive-output.slang +++ b/tests/pipeline/rasterization/mesh/primitive-output.slang @@ -2,7 +2,6 @@ // Test that a simple mesh shader compiles -//TEST:CROSS_COMPILE:-target spirv -profile glsl_450+spirv_1_4 -entry main -stage mesh //TEST:SIMPLE(filecheck=SPV_CHECK):-target spirv -profile glsl_450+spirv_1_4 -entry main -stage mesh //SPV_CHECK-NOT: SPV_NV_mesh_shader -- cgit v1.2.3