…mpaction

# Conflicts:
#	wgpu-core/src/resource.rs

…ned in

# Conflicts:
#	.gitattributes
#	wgpu-core/src/command/compute.rs
#	wgpu-core/src/command/render.rs
#	wgpu-core/src/device/life.rs
#	wgpu-core/src/device/resource.rs
#	wgpu-core/src/track/mod.rs

…pu_core)

# Conflicts:
#	naga/src/back/spv/writer.rs
#	wgpu-core/src/hub.rs
#	wgpu-core/src/registry.rs
#	wgpu/src/backend/wgpu_core.rs

fix validation

…ing2

 Merge commit 'fb3b33d09233140533a9e431256a8690bf4c5d42' from wgpu/trunk into ray-tracing

…rds do not support (and it now works!) currently missing validation

…cing-updated

# Conflicts:
#	Cargo.lock
#	wgpu-core/src/command/mod.rs
#	wgpu-core/src/device/resource.rs
#	wgpu-core/src/track/mod.rs
#	wgpu-core/src/validation.rs
#	wgpu/src/backend/webgpu.rs
#	wgpu/src/context.rs

…cing-updated

# Conflicts:
#	wgpu-core/src/command/compute.rs
#	wgpu-core/src/track/mod.rs

…rs (not the tlas_s)

# Conflicts:
#	.gitattributes
#	examples/src/ray_cube_compute/mod.rs
#	examples/src/ray_cube_fragment/mod.rs
#	examples/src/ray_scene/mod.rs
#	wgpu-core/src/command/compute.rs
#	wgpu-core/src/command/ray_tracing.rs
#	wgpu-core/src/device/life.rs
#	wgpu-core/src/device/queue.rs
#	wgpu-core/src/device/ray_tracing.rs
#	wgpu-core/src/device/resource.rs
#	wgpu-core/src/hub.rs
#	wgpu-core/src/track/mod.rs
#	wgpu/src/backend/webgpu.rs
#	wgpu/src/backend/wgpu_core.rs

…cing-updated

# Conflicts:
#	wgpu-core/src/binding_model.rs
#	wgpu-core/src/command/mod.rs
#	wgpu-core/src/device/mod.rs
#	wgpu-core/src/device/queue.rs

…cing-updated

# Conflicts:
#	wgpu-core/src/device/life.rs
#	wgpu-core/src/device/queue.rs
#	wgpu-core/src/device/resource.rs

Merge with trunk

…ructures and command_encoder_build_acceleration_structures_unsafe_tlas

Deduplicate blas building code

…cing-updated

# Conflicts:
#	wgpu-core/src/binding_model.rs
#	wgpu-core/src/command/compute.rs
#	wgpu-core/src/command/mod.rs
#	wgpu-core/src/command/render.rs
#	wgpu-core/src/device/global.rs
#	wgpu-core/src/device/queue.rs
#	wgpu-core/src/device/resource.rs
#	wgpu-core/src/hub.rs
#	wgpu-core/src/track/mod.rs
#	wgpu/src/lib.rs

…bytes

…' into ray-tracing-compaction

# Conflicts:
#	player/src/lib.rs
#	wgpu-core/src/command/ray_tracing.rs
#	wgpu-core/src/device/ray_tracing.rs
#	wgpu-core/src/resource.rs
#	wgpu-hal/src/dx12/device.rs
#	wgpu-types/src/lib.rs

…cing-updated

# Conflicts:
#	wgpu/src/context.rs

…cing-updated

# Conflicts:
#	wgpu-core/src/binding_model.rs
#	wgpu-core/src/command/mod.rs
#	wgpu-core/src/device/global.rs
#	wgpu-core/src/device/queue.rs
#	wgpu-core/src/hub.rs

# Conflicts:
#	tests/tests/root.rs
#	wgpu-core/src/command/compute.rs
#	wgpu-core/src/command/mod.rs
#	wgpu-core/src/command/ray_tracing.rs
#	wgpu-core/src/command/render.rs
#	wgpu-core/src/device/life.rs
#	wgpu-core/src/device/queue.rs
#	wgpu-core/src/device/ray_tracing.rs
#	wgpu-core/src/device/resource.rs
#	wgpu-core/src/hub.rs
#	wgpu-core/src/lock/rank.rs
#	wgpu-core/src/ray_tracing.rs
#	wgpu-core/src/resource.rs
#	wgpu-core/src/track/mod.rs
#	wgpu/src/backend/wgpu_core.rs
#	wgpu/src/context.rs
#	wgpu/src/ray_tracing.rs

…cing-updated