Merge branch 'trunk' into naga-ray-tracing-pipelines

Author: Vecvec

.github/actions/install-mesa/action.yml

@@ -4,10 +4,10 @@ inputs:
   # Sourced from https://archive.mesa3d.org/. Bumping this requires
   # updating the mesa build in https://github.com/gfx-rs/ci-build and creating a new release.
   version:
-    default: "25.2.6"
+    default: "25.2.7"
   # Corresponds to https://github.com/gfx-rs/ci-build/releases
   ci-binary-build:
-    default: "build25"
+    default: "build26"
 runs:
   using: "composite"
   steps:

CHANGELOG.md

@@ -106,6 +106,30 @@ One other breaking change worth noting is that in WGSL `@builtin(view_index)` no
 
 By @SupaMaggie70Incorporated in [#8206](https://github.com/gfx-rs/wgpu/pull/8206).
 
+#### Error Scopes are now thread-local
+
+Device error scopes now operate on a per-thread basis. This allows them to be used easily within multithreaded contexts,
+without having the error scope capture errors from other threads.
+
+When the `std` feature is **not** enabled, we have no way to differentiate between threads, so error scopes return to be
+global operations.
+
+By @cwfitzgerald in [#8685](https://github.com/gfx-rs/wgpu/pull/8685)
+
+#### Log Levels
+
+We have received complaints about wgpu being way too log spammy at log levels `info`/`warn`/`error`. We have
+adjusted our log policy and changed logging such that `info` and above should be silent unless some exceptional
+event happens. Our new log policy is as follows:
+
+- Error: if we can’t (for some reason, usually a bug) communicate an error any other way.
+- Warning: similar, but there may be one-shot warnings about almost certainly sub-optimal.
+- Info: do not use
+- Debug: Used for interesting events happening inside wgpu.
+- Trace: Used for all events that might be useful to either `wgpu` or application developers.
+
+By @cwfitzgerald in [#8579](https://github.com/gfx-rs/wgpu/pull/8579).
+
 ### New Features
 
 - Added support for transient textures on Vulkan and Metal. By @opstic in [#8247](https://github.com/gfx-rs/wgpu/pull/8247)
@@ -117,7 +141,6 @@ By @SupaMaggie70Incorporated in [#8206](https://github.com/gfx-rs/wgpu/pull/8206
 #### General
 
 - Require new enable extensions when using ray queries and position fetch (`wgpu_ray_query`, `wgpu_ray_query_vertex_return`). By @Vecvec in [#8545](https://github.com/gfx-rs/wgpu/pull/8545).
-- Lower `max_blas_primitive_count` due to a bug in llvmpipe. By @Vecvec in [#8446](https://github.com/gfx-rs/wgpu/pull/8446).
 - Texture now has `from_custom`. By @R-Cramer4 in [#8315](https://github.com/gfx-rs/wgpu/pull/8315).
 - Using both the wgpu command encoding APIs and `CommandEncoder::as_hal_mut` on the same encoder will now result in a panic.
 - Allow `include_spirv!` and `include_spirv_raw!` macros to be used in constants and statics. By @clarfonthey in [#8250](https://github.com/gfx-rs/wgpu/pull/8250).

Cargo.lock

@@ -68,6 +68,7 @@ authors = ["gfx-rs developers"]
 naga = { version = "27.0.0", path = "./naga" }
 naga-test = { path = "./naga-test" }
 wgpu = { version = "27.0.0", path = "./wgpu", default-features = false, features = [
+    "std",
     "serde",
     "wgsl",
     "vulkan",

Cargo.toml

@@ -1,5 +1,5 @@
-#[cfg_attr(target_arch = "wasm32", no_main)]
-#[cfg(not(target_arch = "wasm32"))]
+#![cfg_attr(target_arch = "wasm32", no_main)]
+#![cfg(not(target_arch = "wasm32"))]
 use pollster::block_on;
 use wgpu_benchmark::Benchmark;
 

benches/benches/wgpu-benchmark/main.rs

@@ -60,16 +60,11 @@ fn init_logger() {
             let query_level: Option<log::LevelFilter> = parse_url_query_string(&query_string, "RUST_LOG")
                 .and_then(|x| x.parse().ok());
 
-            // We keep wgpu at Error level, as it's very noisy.
             let base_level = query_level.unwrap_or(log::LevelFilter::Info);
-            let wgpu_level = query_level.unwrap_or(log::LevelFilter::Error);
 
             // On web, we use fern, as console_log doesn't have filtering on a per-module level.
             fern::Dispatch::new()
                 .level(base_level)
-                .level_for("wgpu_core", wgpu_level)
-                .level_for("wgpu_hal", wgpu_level)
-                .level_for("naga", wgpu_level)
                 .chain(fern::Output::call(console_log::log))
                 .apply()
                 .unwrap();
@@ -79,10 +74,6 @@ fn init_logger() {
             // of these default filters.
             env_logger::builder()
                 .filter_level(log::LevelFilter::Info)
-                // We keep wgpu at Error level, as it's very noisy.
-                .filter_module("wgpu_core", log::LevelFilter::Info)
-                .filter_module("wgpu_hal", log::LevelFilter::Error)
-                .filter_module("naga", log::LevelFilter::Error)
                 .parse_default_env()
                 .init();
         }

examples/features/src/framework.rs

@@ -441,7 +441,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
                             _ => false,
                         })
                 {
-                    log::info!(
+                    log::debug!(
                         "Skipping function {:?} (name {:?}) because global {:?} is inaccessible",
                         handle,
                         function.name,
@@ -945,7 +945,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
 
         if let Some(ref binding) = global.binding {
             if let Err(err) = self.options.resolve_resource_binding(binding) {
-                log::info!(
+                log::debug!(
                     "Skipping global {:?} (name {:?}) for being inaccessible: {}",
                     handle,
                     global.name,
@@ -1190,7 +1190,7 @@ impl<'a, W: fmt::Write> super::Writer<'a, W> {
         {
             Ok(bindings) => bindings,
             Err(err) => {
-                log::info!(
+                log::debug!(
                     "Skipping global {:?} (name {:?}) for being inaccessible: {}",
                     handle,
                     global.name,

naga/src/back/hlsl/writer.rs

@@ -2684,7 +2684,7 @@ impl Writer {
                 // because the entry point and its callees didn't use them,
                 // then we must skip it.
                 if !ep_info.dominates_global_use(info) {
-                    log::info!("Skip function {:?}", ir_function.name);
+                    log::debug!("Skip function {:?}", ir_function.name);
                     continue;
                 }
 

naga/src/back/spv/writer.rs

@@ -1669,7 +1669,7 @@ impl MacroCall {
                         num_args += 1;
 
                         if shadow {
-                            log::warn!("Assuming LOD {:?} is zero", args[2],);
+                            log::debug!("Assuming LOD {:?} is zero", args[2],);
 
                             SampleLevel::Zero
                         } else {
@@ -1681,7 +1681,7 @@ impl MacroCall {
                         num_args += 2;
 
                         if shadow {
-                            log::warn!(
+                            log::debug!(
                                 "Assuming gradients {:?} and {:?} are not greater than 1",
                                 args[2],
                                 args[3],

naga/src/front/glsl/builtins.rs

@@ -799,7 +799,15 @@ impl<I: Iterator<Item = u32>> Frontend<I> {
                 dec.specialization_constant_id = Some(self.next()?);
             }
             other => {
-                log::warn!("Unknown decoration {other:?}");
+                let level = match other {
+                    // Block decorations show up everywhere and we don't
+                    // really care about them, so to prevent log spam
+                    // we demote them to debug level.
+                    spirv::Decoration::Block => log::Level::Debug,
+                    _ => log::Level::Warn,
+                };
+
+                log::log!(level, "Unknown decoration {other:?}");
                 for _ in base_words + 1..inst.wc {
                     let _var = self.next()?;
                 }
@@ -4747,7 +4755,7 @@ impl<I: Iterator<Item = u32>> Frontend<I> {
             let generator = self.next()?;
             let _bound = self.next()?;
             let _schema = self.next()?;
-            log::info!("Generated by {generator} version {version_raw:x}");
+            log::debug!("Generated by {generator} version {version_raw:x}");
             crate::Module::default()
         };
 
@@ -4817,7 +4825,7 @@ impl<I: Iterator<Item = u32>> Frontend<I> {
         }
 
         if !self.upgrade_atomics.is_empty() {
-            log::info!("Upgrading atomic pointers...");
+            log::debug!("Upgrading atomic pointers...");
             module.upgrade_atomics(&self.upgrade_atomics)?;
         }
 
@@ -4827,7 +4835,7 @@ impl<I: Iterator<Item = u32>> Frontend<I> {
             self.process_entry_point(&mut module, ep, fun_id)?;
         }
 
-        log::info!("Patching...");
+        log::debug!("Patching...");
         {
             let mut nodes = petgraph::algo::toposort(&self.function_call_graph, None)
                 .map_err(|cycle| Error::FunctionCallCycle(cycle.node_id()))?;
@@ -4867,11 +4875,11 @@ impl<I: Iterator<Item = u32>> Frontend<I> {
         }
 
         if !self.future_decor.is_empty() {
-            log::warn!("Unused item decorations: {:?}", self.future_decor);
+            log::debug!("Unused item decorations: {:?}", self.future_decor);
             self.future_decor.clear();
         }
         if !self.future_member_decor.is_empty() {
-            log::warn!("Unused member decorations: {:?}", self.future_member_decor);
+            log::debug!("Unused member decorations: {:?}", self.future_member_decor);
             self.future_member_decor.clear();
         }