Merge branch 'trunk' into metal-icb-multi-draw-indirect

Author: matthargett

.github/workflows/ci.yml

@@ -844,8 +844,10 @@ jobs:
           rustup override set ${{ env.REPO_MSRV }}
           cargo -V
 
+      # NOTE: Keep this above the others, because this will fail if there are _any_ changes to
+      # files, even ones this step doesn't modify.
       - name: "Format `**/*.{md,js,html,yml}` files"
-        run: npx --yes prettier@3.8.1 --check .
+        run: "npx --yes prettier@3.8.1 --check --write . && git diff --exit-code"
 
       - name: Run `cargo fmt`
         run: |

CHANGELOG.md

@@ -96,12 +96,23 @@ Bottom level categories:
 
 #### Vulkan
 
+- Add OpenHarmony surface support via `VK_OHOS_surface`. Previously the Vulkan backend could not create a surface on OpenHarmony, leaving GLES as the only usable backend. By @ozongzi in [#9908](https://github.com/gfx-rs/wgpu/pull/9908).
 - Stop passing an un-waited fence to `vkAcquireNextImageKHR` on non-Windows platforms, which triggered `VUID-vkAcquireNextImageKHR-fence-10066` validation errors every frame since v30.0.0. By @ErichDonGubler in [#9855](https://github.com/gfx-rs/wgpu/issues/9855).
 
 #### GLES
 
 - Fixed signed integer `%` (and `%=`) returning the wrong result for negative operands in the GLSL (OpenGL/GLES) backend, e.g. `-1 % 768` yielding `255` instead of `-1`. GLSL's `%` is undefined when either operand is negative, so signed remainder is now lowered as `a - b * (a / b)`, matching the SPIR-V, HLSL, and Metal backends. By @mstampfli in [#9687](https://github.com/gfx-rs/wgpu/pull/9687).
 
+#### WebGPU
+
+- Recognize `GPUInternalError` when converting a WebGPU error, mapping it to `Error::Internal` instead of panicking with "Unexpected error". By @evilpies in [#9919](https://github.com/gfx-rs/wgpu/pull/9919).
+
+### Documentation
+
+#### General
+
+- Fix the `BlasAabbGeometry` docs to refer to the `stride` field instead of a nonexistent `size.stride`, and document the packed AABB buffer layout (each primitive a minimum then a maximum corner, two consecutive `vec3<f32>`). By @mstampfli in [#9934](https://github.com/gfx-rs/wgpu/pull/9934).
+
 ### Dependency Updates
 
 #### General
@@ -376,6 +387,7 @@ By @inner-daemons in [#9434](https://github.com/gfx-rs/wgpu/pull/9434).
 
 #### Vulkan
 
+- Use the imported queue family's supported shader stages when building buffer, texture, and acceleration structure barriers for raw Vulkan devices. By @ruihe774 in [#9594](https://github.com/gfx-rs/wgpu/pull/9594).
 - Fixed `SHADER_I16` not enabling `storage_buffer16_bit_access` or `storage_input_output16`, causing Vulkan validation errors when using 16-bit integers in buffers. By @JMS55 in [#9412](https://github.com/gfx-rs/wgpu/pull/9412).
 - Fixed validation errors when frames take longer than the specified swapchain acquire timeout. By @atlv24 in [#9405](https://github.com/gfx-rs/wgpu/pull/9405).
 - Fixed limits on Mesa's Honeykrisp / Asahi Linux. By @im-0 in [#9393](https://github.com/gfx-rs/wgpu/pull/9393).

README.md

@@ -65,17 +65,17 @@ Contributors are welcome! See [CONTRIBUTING.md][contrib] for more information.
 
 ## Supported Platforms
 
-| API    | Windows      | Linux/Android   | macOS/iOS | Web (wasm)  |
-| ------ | ------------ | --------------- | --------- | ----------- |
-| Vulkan | ✅           | ✅              | 🌋        |             |
-| Metal  |              |                 | ✅        |             |
-| DX12   | ✅           |                 |           |             |
-| OpenGL | 🆗 (GL 3.3+) | 🆗 (GL ES 3.0+) | 📐        | 🆗 (WebGL2) |
-| WebGPU |              |                 |           | ✅          |
+| API    | Windows             | Linux/Android   | macOS/iOS | Web (wasm)  |
+| ------ | ------------------- | --------------- | --------- | ----------- |
+| Vulkan | ✅                  | ✅              | 🌋        |             |
+| Metal  |                     |                 | ✅        |             |
+| DX12   | ✅                  |                 |           |             |
+| OpenGL | 🆗 (GL 3.3+), or 📐 | 🆗 (GL ES 3.0+) | 📐        | 🆗 (WebGL2) |
+| WebGPU |                     |                 |           | ✅          |
 
 ✅ = First Class Support  
 🆗 = Downlevel/Best Effort Support  
-📐 = Requires the [ANGLE](https://github.com/gfx-rs/wgpu/wiki/Running-on-ANGLE) translation layer (GL ES 3.0 only). Use the `angle` feature on macOS/iOS. On Windows, `gles` uses WGL by default; build with `cfg(windows_angle)` to use ANGLE instead.
+📐 = Requires the [ANGLE](https://github.com/gfx-rs/wgpu/wiki/Running-on-ANGLE) translation layer (GL ES 3.0 only). On macOS/iOS, use the `angle` feature. On Windows, `gles` uses WGL by default; build with `cfg(windows_angle)` to use ANGLE instead.
 🌋 = Requires the [MoltenVK](https://vulkan.lunarg.com/sdk/home#mac) translation layer  
 🛠️ = Unsupported, though open to contributions
 

player/src/bin/play.rs

@@ -68,7 +68,6 @@ fn main() {
     #[cfg(feature = "winit")]
     let instance_desc =
         instance_desc.with_display_handle(Box::new(event_loop.owned_display_handle()));
-    let instance_flags = instance_desc.flags;
     let instance = wgc::instance::Instance::new("player", instance_desc, None);
 
     let (backends, device_desc) =
@@ -96,9 +95,7 @@ fn main() {
     let info = adapter.get_info();
     log::info!("Using '{}'", info.name);
 
-    let (device, queue) = adapter
-        .request_device(&device_desc, instance_flags)
-        .unwrap();
+    let (device, queue) = adapter.request_device(&device_desc).unwrap();
 
     let mut player = Player::default();
 
@@ -151,7 +148,7 @@ fn main() {
                 }
                 .unwrap();
                 self.window = Some(window);
-                self.surface = Some(Arc::new(surface));
+                self.surface = Some(surface);
             }
 
             fn exiting(&mut self, _event_loop: &ActiveEventLoop) {

player/src/lib.rs

@@ -140,7 +140,7 @@ impl Player {
             }
             Action::CreateTextureView { id, parent, desc } => {
                 let parent_texture = self.resolve_texture_id(parent);
-                let (texture_view, _error) = device.create_texture_view(&parent_texture, &desc);
+                let (texture_view, _error) = parent_texture.create_view(&desc);
                 self.texture_views.insert(id, texture_view);
             }
             Action::DropTextureView(id) => {

player/tests/player/main.rs

@@ -74,24 +74,16 @@ impl Test<'_> {
         ron::de::from_str(&string).unwrap_or_else(|e| panic!("{path:?}:{} {}", e.span, e.code))
     }
 
-    fn run(
-        self,
-        dir: &Path,
-        instance_flags: wgt::InstanceFlags,
-        adapter: Arc<wgc::instance::Adapter>,
-    ) {
+    fn run(self, dir: &Path, adapter: Arc<wgc::instance::Adapter>) {
         let (device, queue) = adapter
-            .request_device(
-                &wgt::DeviceDescriptor {
-                    label: None,
-                    required_features: self.features,
-                    required_limits: wgt::Limits::default(),
-                    experimental_features: unsafe { wgt::ExperimentalFeatures::enabled() },
-                    memory_hints: wgt::MemoryHints::default(),
-                    trace: wgt::Trace::Off,
-                },
-                instance_flags,
-            )
+            .request_device(&wgt::DeviceDescriptor {
+                label: None,
+                required_features: self.features,
+                required_limits: wgt::Limits::default(),
+                experimental_features: unsafe { wgt::ExperimentalFeatures::enabled() },
+                memory_hints: wgt::MemoryHints::default(),
+                trace: wgt::Trace::Off,
+            })
             .unwrap();
 
         let mut player = Player::default();
@@ -182,7 +174,6 @@ impl Corpus {
                 println!("\t\tTest '{test_path:?}'");
 
                 let instance_desc = wgt::InstanceDescriptor::new_without_display_handle_from_env();
-                let instance_flags = instance_desc.flags;
                 let instance = wgc::instance::Instance::new("test", instance_desc, None);
                 let adapter = match instance.request_adapter(
                     &wgt::RequestAdapterOptions::default(),
@@ -211,7 +202,7 @@ impl Corpus {
                     println!("\t\tSkipped due to missing compute shader capability");
                     continue;
                 }
-                test.run(dir, instance_flags, adapter);
+                test.run(dir, adapter);
             }
         }
     }

tests/wasm/runner/package-lock.json

@@ -332,9 +332,8 @@ impl Global {
         let fid = hub.texture_views.prepare(id_in);
 
         let texture = hub.textures.get(texture_id);
-        let device = &texture.device;
 
-        let (view, error) = device.create_texture_view(&texture, desc);
+        let (view, error) = texture.create_view(desc);
 
         let id = fid.assign(view);