Move Naga IR types from naga/src/lib.rs to naga/src/ir/mod.rs.

The types remain available at their original paths by `pub use ir::*`.
This may or may not be a temporary measure for migration.

The only changes to the moved code are:
* Fixing doc links.
* Moving `pub use block::Block` to the top.
This commit is contained in:
Kevin Reid authored and Jim Blandy committed 2025-03-18 17:06:04 -07:00
1 parent 4db992a66d
commit ee78d61390
5 files changed
+2428 -2407

No files matched your search

+3
View File
@@ -209,6 +209,9 @@ By @wumpf in [#7144](https://github.com/gfx-rs/wgpu/pull/7144)
#### Naga
- Naga IR types are now available in the module `naga::ir` (e.g. `naga::ir::Module`).
The original names (e.g. `naga::Module`) remain present for compatibility.
By @kpreid in [#7365](https://github.com/gfx-rs/wgpu/pull/7365).
- Refactored `use` statements to simplify future `no_std` support. By @bushrat011899 in [#7256](https://github.com/gfx-rs/wgpu/pull/7256)
#### Vulkan
File renamed without changes.
+2416
View File
File diff suppressed because it is too large. Load diff
+4 -2402
View File
File diff suppressed because it is too large. Load diff
+5 -5
View File
@@ -273,7 +273,7 @@ error: Entry point main at Compute is invalid
┌─ wgsl:3:13
│
3 │ let a = cross(vec2(0., 1.), vec2(0., 1.));
│ ^^^^^ naga::Expression [6]
│ ^^^^^ naga::ir::Expression [6]
│
= Expression [6] is invalid
= Argument [0] to Cross as expression [2] has an invalid type.
@@ -287,7 +287,7 @@ error: Entry point main at Compute is invalid
┌─ wgsl:3:13
│
3 │ let a = cross(vec4(0., 1., 2., 3.), vec4(0., 1., 2., 3.));
│ ^^^^^ naga::Expression [10]
│ ^^^^^ naga::ir::Expression [10]
│
= Expression [10] is invalid
= Argument [0] to Cross as expression [4] has an invalid type.
@@ -628,7 +628,7 @@ error: Function [1] 'main' is invalid
│ \n7 │ ╭ fn main() {
8 │ │ foo();
│ │ ^^^^ invalid function call
│ ╰──────────────────────────^ naga::Function [1]
│ ╰──────────────────────────^ naga::ir::Function [1]
│ \n = Call to [0] is invalid
= Requires 1 arguments, but 0 are provided
@@ -647,7 +647,7 @@ error: Entry point main at Compute is invalid
┌─ wgsl:4:9
│
4 │ _ = select(1, 2, 9001);
│ ^^^^^^ naga::Expression [3]
│ ^^^^^^ naga::ir::Expression [3]
│
= Expression [3] is invalid
= Expected selection condition to be a boolean value, got Scalar(Scalar { kind: Sint, width: 4 })
@@ -667,7 +667,7 @@ error: Entry point main at Compute is invalid
┌─ wgsl:4:9
│
4 │ _ = select(true, 1, false);
│ ^^^^^^ naga::Expression [3]
│ ^^^^^^ naga::ir::Expression [3]
│
= Expression [3] is invalid
= Expected selection argument types to match, but reject value of type Scalar(Scalar { kind: Bool, width: 1 }) does not match accept value of value Scalar(Scalar { kind: Sint, width: 4 })