Wgpu 26 released.

This commit is contained in:
charlotte 2025-07-10 13:38:20 -07:00
parent 3591ba3113
commit cb45943753
8 changed files with 19 additions and 10 deletions

View File

@ -20,7 +20,7 @@ serde = { version = "1.0", features = [
], default-features = false, optional = true } ], default-features = false, optional = true }
thiserror = { version = "2", default-features = false } thiserror = { version = "2", default-features = false }
derive_more = { version = "2", default-features = false, features = ["from"] } derive_more = { version = "2", default-features = false, features = ["from"] }
wgpu-types = { path = "../../../../gfx-rs/wgpu/wgpu-types", default-features = false, optional = true } wgpu-types = { version= "26", default-features = false, optional = true }
encase = { version = "0.10", default-features = false, optional = true } encase = { version = "0.10", default-features = false, optional = true }
[features] [features]

View File

@ -70,7 +70,7 @@ image = { version = "0.25.2", default-features = false }
# misc # misc
bitflags = { version = "2.3", features = ["serde"] } bitflags = { version = "2.3", features = ["serde"] }
bytemuck = { version = "1.5" } bytemuck = { version = "1.5" }
wgpu-types = { path = "../../../../gfx-rs/wgpu/wgpu-types", default-features = false } wgpu-types = { version= "26", default-features = false }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
thiserror = { version = "2", default-features = false } thiserror = { version = "2", default-features = false }
futures-lite = "2.0.1" futures-lite = "2.0.1"

View File

@ -27,7 +27,7 @@ bevy_platform = { path = "../bevy_platform", version = "0.17.0-dev", default-fea
# other # other
bitflags = { version = "2.3", features = ["serde"] } bitflags = { version = "2.3", features = ["serde"] }
bytemuck = { version = "1.5" } bytemuck = { version = "1.5" }
wgpu-types = { path = "../../../../gfx-rs/wgpu/wgpu-types", default-features = false } wgpu-types = { version= "26", default-features = false }
serde = { version = "1", default-features = false, features = [ serde = { version = "1", default-features = false, features = [
"derive", "derive",
], optional = true } ], optional = true }

View File

@ -109,7 +109,7 @@ uuid = { version = "1.13.1", default-features = false, optional = true, features
"serde", "serde",
] } ] }
variadics_please = "1.1" variadics_please = "1.1"
wgpu-types = { path = "../../../../gfx-rs/wgpu/wgpu-types", features = [ wgpu-types = { version= "26", features = [
"serde", "serde",
], optional = true, default-features = false } ], optional = true, default-features = false }

View File

@ -90,7 +90,7 @@ codespan-reporting = "0.12.0"
# It is enabled for now to avoid having to do a significant overhaul of the renderer just for wasm. # It is enabled for now to avoid having to do a significant overhaul of the renderer just for wasm.
# When the 'atomics' feature is enabled `fragile-send-sync-non-atomic` does nothing # When the 'atomics' feature is enabled `fragile-send-sync-non-atomic` does nothing
# and Bevy instead wraps `wgpu` types to verify they are not used off their origin thread. # and Bevy instead wraps `wgpu` types to verify they are not used off their origin thread.
wgpu = { path = "../../../../gfx-rs/wgpu/wgpu", default-features = false, features = [ wgpu = { version = "26", default-features = false, features = [
"wgsl", "wgsl",
"dx12", "dx12",
"metal", "metal",
@ -99,7 +99,7 @@ wgpu = { path = "../../../../gfx-rs/wgpu/wgpu", default-features = false, featur
"naga-ir", "naga-ir",
"fragile-send-sync-non-atomic-wasm", "fragile-send-sync-non-atomic-wasm",
] } ] }
naga = { path = "../../../../gfx-rs/wgpu/naga", features = ["wgsl-in"] } naga = { version = "26", features = ["wgsl-in"] }
serde = { version = "1", features = ["derive"] } serde = { version = "1", features = ["derive"] }
bytemuck = { version = "1.5", features = ["derive", "must_cast"] } bytemuck = { version = "1.5", features = ["derive", "must_cast"] }
downcast-rs = { version = "2", default-features = false, features = ["std"] } downcast-rs = { version = "2", default-features = false, features = ["std"] }
@ -125,7 +125,7 @@ wesl = { version = "0.1.2", optional = true }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
# Omit the `glsl` feature in non-WebAssembly by default. # Omit the `glsl` feature in non-WebAssembly by default.
naga_oil = { path = "../../../naga_oil", default-features = false, features = [ naga_oil = { git = "https://github.com/tychedelia/naga_oil", branch = "wgpu-26", default-features = false, features = [
"test_shader", "test_shader",
] } ] }
@ -133,7 +133,7 @@ naga_oil = { path = "../../../naga_oil", default-features = false, features = [
proptest = "1" proptest = "1"
[target.'cfg(target_arch = "wasm32")'.dependencies] [target.'cfg(target_arch = "wasm32")'.dependencies]
naga_oil = { path = "../../../naga_oil" } naga_oil = { git = "https://github.com/tychedelia/naga_oil", branch = "wgpu-26" }
js-sys = "0.3" js-sys = "0.3"
web-sys = { version = "0.3.67", features = [ web-sys = { version = "0.3.67", features = [
'Blob', 'Blob',

View File

@ -60,7 +60,7 @@ pub use wgpu::{
TexelCopyBufferInfo, TexelCopyBufferLayout, TexelCopyTextureInfo, TextureAspect, TexelCopyBufferInfo, TexelCopyBufferLayout, TexelCopyTextureInfo, TextureAspect,
TextureDescriptor, TextureDimension, TextureFormat, TextureFormatFeatureFlags, TextureDescriptor, TextureDimension, TextureFormat, TextureFormatFeatureFlags,
TextureFormatFeatures, TextureSampleType, TextureUsages, TextureView as WgpuTextureView, TextureFormatFeatures, TextureSampleType, TextureUsages, TextureView as WgpuTextureView,
TextureViewDescriptor, TextureViewDimension, Tlas, TlasInstance, TlasPackage, VertexAttribute, TextureViewDescriptor, TextureViewDimension, Tlas, TlasInstance, VertexAttribute,
VertexBufferLayout as RawVertexBufferLayout, VertexFormat, VertexState as RawVertexState, VertexBufferLayout as RawVertexBufferLayout, VertexFormat, VertexState as RawVertexState,
VertexStepMode, COPY_BUFFER_ALIGNMENT, VertexStepMode, COPY_BUFFER_ALIGNMENT,
}; };

View File

@ -294,6 +294,14 @@ pub async fn initialize_renderer(
max_non_sampler_bindings: limits max_non_sampler_bindings: limits
.max_non_sampler_bindings .max_non_sampler_bindings
.min(constrained_limits.max_non_sampler_bindings), .min(constrained_limits.max_non_sampler_bindings),
max_blas_primitive_count: limits.max_blas_primitive_count
.min(constrained_limits.max_blas_primitive_count),
max_blas_geometry_count: limits
.max_blas_geometry_count
.min(constrained_limits.max_blas_geometry_count),
max_tlas_instance_count: limits
.max_tlas_instance_count
.min(constrained_limits.max_tlas_instance_count),
max_color_attachments: limits max_color_attachments: limits
.max_color_attachments .max_color_attachments
.min(constrained_limits.max_color_attachments), .min(constrained_limits.max_color_attachments),
@ -306,6 +314,7 @@ pub async fn initialize_renderer(
max_subgroup_size: limits max_subgroup_size: limits
.max_subgroup_size .max_subgroup_size
.min(constrained_limits.max_subgroup_size), .min(constrained_limits.max_subgroup_size),
max_acceleration_structures_per_shader_stage: 0,
}; };
} }

View File

@ -59,7 +59,7 @@ cfg-if = "1.0"
raw-window-handle = "0.6" raw-window-handle = "0.6"
serde = { version = "1.0", features = ["derive"], optional = true } serde = { version = "1.0", features = ["derive"], optional = true }
bytemuck = { version = "1.5", optional = true } bytemuck = { version = "1.5", optional = true }
wgpu-types = { path = "../../../../gfx-rs/wgpu/wgpu-types", optional = true } wgpu-types = { version= "26", optional = true }
accesskit = "0.19" accesskit = "0.19"
tracing = { version = "0.1", default-features = false, features = ["std"] } tracing = { version = "0.1", default-features = false, features = ["std"] }