Rebase.

Author: tychedelia

crates/bevy_render/Cargo.toml

@@ -100,7 +100,7 @@ wgpu = { version = "26", default-features = false, features = [
   "naga-ir",
   "fragile-send-sync-non-atomic-wasm",
 ] }
-naga = { version = "25", features = ["wgsl-in"] }
+naga = { version = "26", features = ["wgsl-in"] }
 bytemuck = { version = "1.5", features = ["derive", "must_cast"] }
 downcast-rs = { version = "2", default-features = false, features = ["std"] }
 thiserror = { version = "2", default-features = false }

crates/bevy_shader/Cargo.toml

@@ -16,8 +16,8 @@ bevy_reflect = { path = "../bevy_reflect", version = "0.17.0-dev" }
 bevy_platform = { path = "../bevy_platform", version = "0.17.0-dev" }
 
 # other
-wgpu-types = { version = "25", default-features = false }
-naga = { version = "25", features = ["wgsl-in"] }
+wgpu-types = { version = "26", default-features = false }
+naga = { version = "26", features = ["wgsl-in"] }
 serde = { version = "1", features = ["derive"] }
 thiserror = { version = "2", default-features = false }
 wesl = { version = "0.1.2", optional = true }
@@ -26,12 +26,12 @@ tracing = { version = "0.1", default-features = false, features = ["std"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 # Omit the `glsl` feature in non-WebAssembly by default.
-naga_oil = { version = "0.18", default-features = false, features = [
+naga_oil = { git = "https://github.com/bevyengine/naga_oil", default-features = false, features = [
   "test_shader",
 ] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-naga_oil = { version = "0.18" }
+naga_oil = { git = "https://github.com/bevyengine/naga_oil" }
 
 [features]
 shader_format_glsl = ["naga/glsl-in", "naga/wgsl-out", "naga_oil/glsl"]