Skip to content

Commit 234192c

Browse files
committed
Fix CI: add missing capability deps and patch difftest rspirv
- Add ShaderViewportMaskNV, ShaderViewportIndexLayerEXT, and SPV_NV_viewport_array2 to all-builtins.rs compile flags to satisfy ShaderStereoViewNV capability dependency chain. - Add rspirv/spirv patch to difftest workspace Cargo.toml to match root workspace, fixing compilation errors from newer SPIR-V opcodes (ConditionalEntryPointINTEL, TypeUntypedPointerKHR, etc.) that only exist in the sdk-update branch.
1 parent d17b4d3 commit 234192c

3 files changed

Lines changed: 11 additions & 7 deletions

File tree

tests/compiletests/ui/spirv-attr/all-builtins.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// build-pass
22
// only-vulkan1.1
3-
// compile-flags: -Ctarget-feature=+DeviceGroup,+DrawParameters,+FragmentBarycentricNV,+FragmentBarycentricKHR,+FragmentDensityEXT,+FragmentFullyCoveredEXT,+Geometry,+GroupNonUniform,+GroupNonUniformBallot,+MeshShadingNV,+MultiView,+MultiViewport,+RayTracingKHR,+SampleRateShading,+ShaderSMBuiltinsNV,+ShaderStereoViewNV,+StencilExportEXT,+Tessellation,+ext:SPV_AMD_shader_explicit_vertex_parameter,+ext:SPV_EXT_fragment_fully_covered,+ext:SPV_EXT_fragment_invocation_density,+ext:SPV_EXT_shader_stencil_export,+ext:SPV_KHR_ray_tracing,+ext:SPV_NV_fragment_shader_barycentric,+ext:SPV_NV_mesh_shader,+ext:SPV_NV_shader_sm_builtins,+ext:SPV_NV_stereo_view_rendering
3+
// compile-flags: -Ctarget-feature=+DeviceGroup,+DrawParameters,+FragmentBarycentricNV,+FragmentBarycentricKHR,+FragmentDensityEXT,+FragmentFullyCoveredEXT,+Geometry,+GroupNonUniform,+GroupNonUniformBallot,+MeshShadingNV,+MultiView,+MultiViewport,+RayTracingKHR,+SampleRateShading,+ShaderSMBuiltinsNV,+ShaderStereoViewNV,+ShaderViewportIndexLayerEXT,+ShaderViewportMaskNV,+StencilExportEXT,+Tessellation,+ext:SPV_AMD_shader_explicit_vertex_parameter,+ext:SPV_EXT_fragment_fully_covered,+ext:SPV_EXT_fragment_invocation_density,+ext:SPV_EXT_shader_stencil_export,+ext:SPV_KHR_ray_tracing,+ext:SPV_NV_fragment_shader_barycentric,+ext:SPV_NV_mesh_shader,+ext:SPV_NV_shader_sm_builtins,+ext:SPV_NV_stereo_view_rendering,+ext:SPV_NV_viewport_array2
44

55
use spirv_std::glam::*;
66
use spirv_std::matrix::Matrix4x3;

tests/difftests/tests/Cargo.lock

Lines changed: 4 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/difftests/tests/Cargo.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,12 @@ num-traits = { version = "0.2.15", default-features = false }
6868
glam = { version = ">=0.30.8", default-features = false }
6969
bytemuck = { version = "1.14", features = ["derive"] }
7070

71+
# Patch rspirv/spirv to use newer versions with additional SPIR-V opcodes needed by spirv-tools.
72+
# Must match the root workspace patch in /Cargo.toml.
73+
[patch.crates-io]
74+
rspirv = { git = "https://github.com/gfx-rs/rspirv", branch = "sdk-update" }
75+
spirv = { git = "https://github.com/gfx-rs/rspirv", branch = "sdk-update", package = "spirv" }
76+
7177
# Enable incremental by default in release mode.
7278
[profile.release]
7379
incremental = true

0 commit comments

Comments
 (0)