diff options
| author | Jay Kwak <82421531+jkwak-work@users.noreply.github.com> | 2024-07-18 13:21:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-18 13:21:12 -0700 |
| commit | ad379b7c532bef5ac49e6d730027ac8751e618d7 (patch) | |
| tree | f2d35837844130036f4e91c9ef965a1b57068056 /tests/pipeline/rasterization | |
| parent | 1677a25f44d6f608c8aecd4e5c0ceeb94573c10e (diff) | |
Update spirv-header and spirv-tools to Jun/2024 (#4679)
The following external directories are updated.
It is to use a new SPIRV keyword, "OpExtInstWithForwardRefs".
Related to #4304
external/spirv-header:
> commit 2acb319af38d43be3ea76bfabf3998e5281d8d12
> Author: Kévin Petit kevin.petit@arm.com
> Date: Wed Jun 12 16:41:14 2024 +0100
> SPV_ARM_cooperative_matrix_layouts (#433)
external/spirv-tools:
> commit ce46482db7ab3ea9c52fce832d27ca40b14f8e87
> Author: Nathan Gauër brioche@google.com
> Date: Thu Jun 6 12:17:51 2024 +0200
> Add KHR suffix to OpExtInstWithForwardRef opcode. (#5704)
> The KHR suffix was missing from the published SPIR-V extension.
> This is now fixed, but requires some patches in SPIRV-Tools.
external/spirv-tools-generated:
This is generated from spirv-tools
Diffstat (limited to 'tests/pipeline/rasterization')
| -rw-r--r-- | tests/pipeline/rasterization/mesh/hello.slang | 4 | ||||
| -rw-r--r-- | tests/pipeline/rasterization/mesh/mesh-PerPrimitiveEXT.slang | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/pipeline/rasterization/mesh/hello.slang b/tests/pipeline/rasterization/mesh/hello.slang index 8a64805c0..558a761fa 100644 --- a/tests/pipeline/rasterization/mesh/hello.slang +++ b/tests/pipeline/rasterization/mesh/hello.slang @@ -11,8 +11,8 @@ // SPIRV: OpEntryPoint MeshEXT %main // SPIRV-DAG: OpExecutionMode %main OutputVertices 3 -// SPIRV-DAG: OpExecutionMode %main OutputPrimitivesNV 1 -// SPIRV-DAG: OpExecutionMode %main OutputTrianglesNV +// SPIRV-DAG: OpExecutionMode %main OutputPrimitives{{NV|EXT}} 1 +// SPIRV-DAG: OpExecutionMode %main OutputTriangles{{NV|EXT}} // SPIRV: OpSetMeshOutputsEXT diff --git a/tests/pipeline/rasterization/mesh/mesh-PerPrimitiveEXT.slang b/tests/pipeline/rasterization/mesh/mesh-PerPrimitiveEXT.slang index 4294314a6..b5f4f215e 100644 --- a/tests/pipeline/rasterization/mesh/mesh-PerPrimitiveEXT.slang +++ b/tests/pipeline/rasterization/mesh/mesh-PerPrimitiveEXT.slang @@ -2,10 +2,10 @@ //TEST:SIMPLE(filecheck=CHECK):-target spirv -entry main -stage mesh -emit-spirv-directly // CHECK: OpDecorate %gl_PrimitiveID BuiltIn PrimitiveId -// CHECK: OpDecorate %gl_PrimitiveID PerPrimitiveNV +// CHECK: OpDecorate %gl_PrimitiveID PerPrimitive{{NV|EXT}} // CHECK: OpDecorate {{.*}} BuiltIn CullPrimitiveEXT -// CHECK: OpDecorate {{.*}} PerPrimitiveNV +// CHECK: OpDecorate {{.*}} PerPrimitive{{NV|EXT}} const static let color: float3[] = { float3(1.0, 0.0, 0.0), |