archive-gh-me/wgpu
1
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2025-12-08 21:26:17 +00:00
Code Issues Projects Releases Wiki Activity

[naga] Make Naga tests build when no features are enabled. (#7989)

Browse Source
This commit is contained in:
Jim Blandy 2025-07-23 09:09:45 -07:00 committed by GitHub
parent b8c462ac31
commit 2fcd41377c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
naga/tests/naga/validation.rs
View File

@ -34,7 +34,7 @@ fn populate_atomic_result() {
// the differences between the test cases. // the differences between the test cases.
fn try_variant( fn try_variant(
variant: Variant, variant: Variant,
) -> Result<naga::valid::ModuleInfo, naga::WithSpan<naga::valid::ValidationError>> { ) -> Result<ModuleInfo, naga::WithSpan<naga::valid::ValidationError>> {
let span = naga::Span::default(); let span = naga::Span::default();
let mut module = Module::default(); let mut module = Module::default();
let ty_u32 = module.types.insert( let ty_u32 = module.types.insert(
@ -135,7 +135,7 @@ fn populate_call_result() {
// the differences between the test cases. // the differences between the test cases.
fn try_variant( fn try_variant(
variant: Variant, variant: Variant,
) -> Result<naga::valid::ModuleInfo, naga::WithSpan<naga::valid::ValidationError>> { ) -> Result<ModuleInfo, naga::WithSpan<naga::valid::ValidationError>> {
let span = naga::Span::default(); let span = naga::Span::default();
let mut module = Module::default(); let mut module = Module::default();
let ty_u32 = module.types.insert( let ty_u32 = module.types.insert(
@ -211,9 +211,7 @@ fn emit_workgroup_uniform_load_result() {
// //
// Looking at uses of the `wg_load` makes it easy to identify the // Looking at uses of the `wg_load` makes it easy to identify the
// differences between the two variants. // differences between the two variants.
fn variant( fn variant(wg_load: bool) -> Result<ModuleInfo, naga::WithSpan<naga::valid::ValidationError>> {
wg_load: bool,
) -> Result<naga::valid::ModuleInfo, naga::WithSpan<naga::valid::ValidationError>> {
let span = naga::Span::default(); let span = naga::Span::default();
let mut module = Module::default(); let mut module = Module::default();
let ty_u32 = module.types.insert( let ty_u32 = module.types.insert(
@ -284,7 +282,7 @@ fn builtin_cross_product_args() {
fn variant( fn variant(
size: VectorSize, size: VectorSize,
arity: usize, arity: usize,
) -> Result<naga::valid::ModuleInfo, naga::WithSpan<naga::valid::ValidationError>> { ) -> Result<ModuleInfo, naga::WithSpan<naga::valid::ValidationError>> {
let span = naga::Span::default(); let span = naga::Span::default();
let mut module = Module::default(); let mut module = Module::default();
let ty_vec3f = module.types.insert( let ty_vec3f = module.types.insert(
@ -546,7 +544,7 @@ fn main(input: VertexOutput) {{
#[allow(dead_code)] #[allow(dead_code)]
struct BindingArrayFixture { struct BindingArrayFixture {
module: naga::Module, module: Module,
span: naga::Span, span: naga::Span,
ty_u32: naga::Handle<naga::Type>, ty_u32: naga::Handle<naga::Type>,
ty_array: naga::Handle<naga::Type>, ty_array: naga::Handle<naga::Type>,
@ -556,7 +554,7 @@ struct BindingArrayFixture {
impl BindingArrayFixture { impl BindingArrayFixture {
fn new() -> Self { fn new() -> Self {
let mut module = naga::Module::default(); let mut module = Module::default();
let span = naga::Span::default(); let span = naga::Span::default();
let ty_u32 = module.types.insert( let ty_u32 = module.types.insert(
naga::Type { naga::Type {
@ -694,7 +692,7 @@ error: Function [1] 'main' is invalid
#[cfg(feature = "wgsl-in")] #[cfg(feature = "wgsl-in")]
#[test] #[test]
fn bad_texture_dimensions_level() { fn bad_texture_dimensions_level() {
fn validate(level: &str) -> Result<naga::valid::ModuleInfo, naga::valid::ValidationError> { fn validate(level: &str) -> Result<ModuleInfo, naga::valid::ValidationError> {
let source = format!( let source = format!(
r#" r#"
@group(0) @binding(0) @group(0) @binding(0)
@ -710,9 +708,7 @@ fn bad_texture_dimensions_level() {
.map_err(|err| err.into_inner()) // discard spans .map_err(|err| err.into_inner()) // discard spans
} }
fn is_bad_level_error( fn is_bad_level_error(result: Result<ModuleInfo, naga::valid::ValidationError>) -> bool {
result: Result<naga::valid::ModuleInfo, naga::valid::ValidationError>,
) -> bool {
matches!( matches!(
result, result,
Err(naga::valid::ValidationError::Function { Err(naga::valid::ValidationError::Function {
@ -739,7 +735,7 @@ fn arity_check() {
use naga::Span; use naga::Span;
let _ = env_logger::builder().is_test(true).try_init(); let _ = env_logger::builder().is_test(true).try_init();
type Result = core::result::Result<naga::valid::ModuleInfo, naga::valid::ValidationError>; type Result = core::result::Result<ModuleInfo, naga::valid::ValidationError>;
fn validate(fun: ir::MathFunction, args: &[usize]) -> Result { fn validate(fun: ir::MathFunction, args: &[usize]) -> Result {
let nowhere = Span::default(); let nowhere = Span::default();
@ -924,6 +920,7 @@ fn main() {
/// Parse and validate the module defined in `source`. /// Parse and validate the module defined in `source`.
/// ///
/// Panics if unsuccessful. /// Panics if unsuccessful.
#[cfg(feature = "wgsl-in")]
fn parse_validate(source: &str) -> (Module, ModuleInfo) { fn parse_validate(source: &str) -> (Module, ModuleInfo) {
let module = naga::front::wgsl::parse_str(source).expect("module should parse"); let module = naga::front::wgsl::parse_str(source).expect("module should parse");
let info = valid::Validator::new(Default::default(), valid::Capabilities::all()) let info = valid::Validator::new(Default::default(), valid::Capabilities::all())
@ -947,6 +944,7 @@ fn parse_validate(source: &str) -> (Module, ModuleInfo) {
/// ///
/// The optional `unused_body` can introduce additional objects to the module, /// The optional `unused_body` can introduce additional objects to the module,
/// to verify that they are adjusted correctly by compaction. /// to verify that they are adjusted correctly by compaction.
#[cfg(feature = "wgsl-in")]
fn override_test(test_case: &str, unused_body: Option<&str>) { fn override_test(test_case: &str, unused_body: Option<&str>) {
use hashbrown::HashMap; use hashbrown::HashMap;
use naga::back::pipeline_constants::PipelineConstantError; use naga::back::pipeline_constants::PipelineConstantError;