Merge remote-tracking branch 'upstream/master' into fix-gl-msaa-float

.clippy.toml

@@ -0,0 +1 @@
+large-error-threshold = 225 # bytes

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   RUST_BACKTRACE: 1
-  RUST_VERSION: 1.64
+  RUST_VERSION: 1.65
   PKG_CONFIG_ALLOW_CROSS: 1 # allow android to work
   RUSTFLAGS: --cfg=web_sys_unstable_apis -D warnings
   RUSTDOCFLAGS: -Dwarnings
@@ -23,7 +23,7 @@ env:
 # entirely on clippy jobs and reduce it to line-numbers
 # only for ones where we run tests.
 #
-# Additionally, we disable incremental builds entirely 
+# Additionally, we disable incremental builds entirely
 # as our caching system doesn't actually cache our crates.
 # It adds overhead to the build and another point of failure.
 
@@ -38,7 +38,7 @@ jobs:
             os: windows-2022
             target: x86_64-pc-windows-msvc
             kind: native
-          
+
           # MacOS
           - name: MacOS x86_64
             os: macos-12
@@ -49,7 +49,7 @@ jobs:
             os: macos-12
             target: aarch64-apple-darwin
             kind: native
-          
+
           # IOS
           - name: IOS aarch64
             os: macos-12
@@ -175,7 +175,7 @@ jobs:
           - name: Linux x86_64
             os: ubuntu-22.04
             backends: vulkan gl
-    
+
     name: Test ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
 
@@ -195,24 +195,24 @@ jobs:
         uses: taiki-e/install-action@nextest
       - name: install cargo-llvm-cov
         uses: taiki-e/install-action@cargo-llvm-cov
-        
+
       - name: install swiftshader
         if: matrix.os == 'ubuntu-22.04'
         shell: bash
         run: |
           set -e
-          
+
           mkdir -p swiftshader
           curl -LsSf https://github.com/gfx-rs/ci-build/releases/latest/download/swiftshader-linux-x86_64.tar.xz | tar -xf - -C swiftshader
 
           echo "LD_LIBRARY_PATH=$PWD/swiftshader" >> $GITHUB_ENV
-        
+
       - name: install llvmpipe, vulkan sdk
         if: matrix.os == 'ubuntu-22.04'
         shell: bash
         run: |
           set -e
-          
+
           sudo apt-get update -y -qq
 
           # vulkan sdk
@@ -264,7 +264,7 @@ jobs:
         uses: codecov/codecov-action@v3
         with:
           files: lcov.info
-  
+
   doctest:
     name: Doctest
     runs-on: ubuntu-22.04
@@ -327,11 +327,13 @@ jobs:
       - name: checkout repo
         uses: actions/checkout@v3
 
-      - name: install rust
+      - name: install rust ${{ env.RUST_VERSION }}
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: ${{ env.RUST_VERSION }}
+          override: true
+          components: clippy
 
       - name: disable debug
         shell: bash

.github/workflows/cts.yml

@@ -9,6 +9,7 @@ on:
 
 env:
   RUST_BACKTRACE: 1
+  RUST_VERSION: 1.65
 
 jobs:
   cts:
@@ -46,12 +47,13 @@ jobs:
           cd cts
           git checkout $(cat ../wgpu/cts_runner/revision.txt)
 
-      - name: install rust
+      - name: install rust ${{ env.RUST_VERSION }}
         uses: actions-rs/toolchain@v1
         with:
-          toolchain: stable
+          toolchain: ${{ env.RUST_VERSION }}
           target: ${{ matrix.target }}
           profile: minimal
+          override: true
 
       - name: caching
         uses: Swatinem/rust-cache@v1
@@ -91,4 +93,4 @@ jobs:
               echo "=== Running $test ===";
               DENO_WEBGPU_BACKEND=$backend cargo run --manifest-path ../wgpu/cts_runner/Cargo.toml --frozen -- ./tools/run_deno --verbose "$test";
             done
-          done
+          done

CHANGELOG.md

@@ -47,8 +47,10 @@ Bottom level categories:
 - Convert all `Default` Implementations on Enums to `derive(Default)`
 - Implement `Default` for `CompositeAlphaMode`
 - Improve compute shader validation error message. By @haraldreingruber in [#3139](https://github.com/gfx-rs/wgpu/pull/3139)
+- New downlevel feature `UNRESTRICTED_INDEX_BUFFER` to indicate support for using `INDEX` together with other non-copy/map usages (unsupported on WebGL). By @Wumpf in [#3157](https://github.com/gfx-rs/wgpu/pull/3157)
 
 #### WebGPU
+
 - Implement `queue_validate_write_buffer` by @jinleili in [#3098](https://github.com/gfx-rs/wgpu/pull/3098)
 
 #### GLES
@@ -63,10 +65,16 @@ Bottom level categories:
 - Add the `"wgsl"` feature, to enable WGSL shaders in `wgpu-core` and `wgpu`. Enabled by default in `wgpu`. By @daxpedda in [#2890](https://github.com/gfx-rs/wgpu/pull/2890).
 - Implement `Clone` for `ShaderSource` and `ShaderModuleDescriptor` in `wgpu`. By @daxpedda in [#3086](https://github.com/gfx-rs/wgpu/pull/3086).
 - Add `get_default_config` for `Surface` to simplify user creation of `SurfaceConfiguration`. By @jinleili in [#3034](https://github.com/gfx-rs/wgpu/pull/3034)
+- Native adapters can now use MSAA x2 and x8 if it's supported , previously only x1 and x4 were supported . By @39ali in [3140](https://github.com/gfx-rs/wgpu/pull/3140)
 
 #### GLES
 
 - Surfaces support now `TextureFormat::Rgba8Unorm` and (non-web only) `TextureFormat::Bgra8Unorm`. By @Wumpf in [#3070](https://github.com/gfx-rs/wgpu/pull/3070)
+- Support alpha to coverage. By @Wumpf in [#3156](https://github.com/gfx-rs/wgpu/pull/3156)
+
+#### WebGPU
+
+- Add `MULTISAMPLE_X2`, `MULTISAMPLE_X4` and `MULTISAMPLE_X8` to `TextureFormatFeatureFlags`. By @39ali in [3140](https://github.com/gfx-rs/wgpu/pull/3140)
 
 ### Bug Fixes
 
@@ -75,27 +83,45 @@ Bottom level categories:
 - Bother to free the `hal::Api::CommandBuffer` when a `wgpu_core::command::CommandEncoder` is dropped. By @jimblandy in [#3069](https://github.com/gfx-rs/wgpu/pull/3069).
 - Fixed the mipmap example by adding the missing WRITE_TIMESTAMP_INSIDE_PASSES feature. By @Olaroll in [#3081](https://github.com/gfx-rs/wgpu/pull/3081).
 - Avoid panicking in some interactions with invalid resources by @nical in (#3094)[https://github.com/gfx-rs/wgpu/pull/3094]
+- Remove `wgpu_types::Features::DEPTH24PLUS_STENCIL8`, making `wgpu::TextureFormat::Depth24PlusStencil8` available on all backends. By @Healthire in (#3151)[https://github.com/gfx-rs/wgpu/pull/3151]
+- Fix an integer overflow in `queue_write_texture` by @nical in (#3146)[https://github.com/gfx-rs/wgpu/pull/3146]
 
 #### WebGPU
+
 - Use `log` instead of `println` in hello example by @JolifantoBambla in [#2858](https://github.com/gfx-rs/wgpu/pull/2858)
 
 #### GLES
 
 - Fixed WebGL not displaying srgb targets correctly if a non-screen filling viewport was previously set. By @Wumpf in [#3093](https://github.com/gfx-rs/wgpu/pull/3093)
 - Fix disallowing multisampling for float textures if otherwise supported. By @Wumpf in [#3183](https://github.com/gfx-rs/wgpu/pull/3183)
 
+#### deno-webgpu
+
+- Let `setVertexBuffer` and `setIndexBuffer` calls on
+  `GPURenderBundleEncoder` throw an error if the `size` argument is
+  zero, rather than treating that as "until the end of the buffer".
+  By @jimblandy in [#3171](https://github.com/gfx-rs/wgpu/pull/3171)
+
 ### Examples
+
 - Log adapter info in hello example on wasm target by @JolifantoBambla in [#2858](https://github.com/gfx-rs/wgpu/pull/2858)
 
 ### Testing/Internal
 
-- Update the `minimum supported rust version` to 1.62
+- Update the `minimum supported rust version` to 1.65
 - Use cargo 1.64 workspace inheritance feature. By @jinleili in [#3107](https://github.com/gfx-rs/wgpu/pull/3107)
 
 #### Vulkan
 
 - Don't use a pointer to a local copy of a `PhysicalDeviceDriverProperties` struct after it has gone out of scope. In fact, don't make a local copy at all. Introduce a helper function for building `CStr`s from C character arrays, and remove some `unsafe` blocks. By @jimblandy in [#3076](https://github.com/gfx-rs/wgpu/pull/3076).
 
+## wgpu-0.14.1 (2022-11-02)
+
+### Bug Fixes
+
+- Make `wgpu::TextureFormat::Depth24PlusStencil8` available on all backends by making the feature unconditionally available and the feature unneeded to use the format. By @Healthire and @cwfitzgerald in [#3165](https://github.com/gfx-rs/wgpu/pull/3165)
+
+
 ## wgpu-0.14.0 (2022-10-05)
 
 ### Major Changes
@@ -187,6 +213,7 @@ both `raw_window_handle::HasRawWindowHandle` and `raw_window_handle::HasRawDispl
 - Report Apple M2 gpu as integrated. By @i509VCB [#3036](https://github.com/gfx-rs/wgpu/pull/3036)
 
 #### WebGPU
+
 - When called in a web worker, `Context::init()` now uses `web_sys::WorkerGlobalContext` to create a `wgpu::Instance` instead of trying to access the unavailable `web_sys::Window` by @JolifantoBambla in [#2858](https://github.com/gfx-rs/wgpu/pull/2858)
 
 ### Changes
@@ -203,6 +230,7 @@ both `raw_window_handle::HasRawWindowHandle` and `raw_window_handle::HasRawDispl
 - Don't use `PhantomData` for `IdentityManager`'s `Input` type. By @jimblandy in [#2972](https://github.com/gfx-rs/wgpu/pull/2972)
 - Changed Naga variant in ShaderSource to `Cow<'static, Module>`, to allow loading global variables by @daxpedda in [#2903](https://github.com/gfx-rs/wgpu/pull/2903)
 - Updated the maximum binding index to match the WebGPU specification by @nical in [#2957](https://github.com/gfx-rs/wgpu/pull/2957)
+- Add `unsafe_op_in_unsafe_fn` to Clippy lints in the entire workspace. By @ErichDonGubler in [#3044](https://github.com/gfx-rs/wgpu/pull/3044).
 
 #### Metal
 
@@ -342,6 +370,7 @@ Added items to the public API
 - Update present_mode docs as most of them don't automatically fall back to Fifo anymore. by @Elabajaba in [#2855](https://github.com/gfx-rs/wgpu/pull/2855)
 
 #### Hal
+
 - Document safety requirements for `Adapter::from_external` in gles hal by @i509VCB in [#2863](https://github.com/gfx-rs/wgpu/pull/2863)
 - Make `AdapterContext` a publicly accessible type in the gles hal by @i509VCB in [#2870](https://github.com/gfx-rs/wgpu/pull/2870)
 

Cargo.toml

@@ -17,7 +17,7 @@ default-members = ["wgpu", "wgpu-hal", "wgpu-info"]
 
 [workspace.package]
 edition = "2021"
-rust-version = "1.64"
+rust-version = "1.65"
 keywords = ["graphics"]
 license = "MIT OR Apache-2.0"
 homepage = "https://wgpu.rs/"

README.md

@@ -31,7 +31,7 @@ For an overview of all the components in the gfx-rs ecosystem, see [the big pict
 
 ### MSRV policy
 
-Minimum Supported Rust Version is **1.64**.
+Minimum Supported Rust Version is **1.65**.
 It is enforced on CI (in "/.github/workflows/ci.yml") with `RUST_VERSION` variable.
 This version can only be upgraded in breaking releases.
 
@@ -93,15 +93,15 @@ Note that the WGSL specification is still under development,
 so the [draft specification][wgsl spec] does not exactly describe what `wgpu` supports.
 See [below](#tracking-the-webgpu-and-wgsl-draft-specifications) for details.
 
-To enable SPIR-V shaders, enable the `spirv` feature of wgpu.  
+To enable SPIR-V shaders, enable the `spirv` feature of wgpu.
 To enable GLSL shaders, enable the `glsl` feature of wgpu.
 
 ### Angle
 
 [Angle](http://angleproject.org) is a translation layer from GLES to other backends, developed by Google.
 We support running our GLES3 backend over it in order to reach platforms with GLES2 or DX11 support, which aren't accessible otherwise.
 In order to run with Angle, "angle" feature has to be enabled, and Angle libraries placed in a location visible to the application.
-These binaries can be downloaded from [gfbuild-angle](https://github.com/DileSoft/gfbuild-angle) artifacts, [manual compilation](https://github.com/google/angle/blob/main/doc/DevSetup.md) may be required on Macs with Apple silicon. 
+These binaries can be downloaded from [gfbuild-angle](https://github.com/DileSoft/gfbuild-angle) artifacts, [manual compilation](https://github.com/google/angle/blob/main/doc/DevSetup.md) may be required on Macs with Apple silicon.
 
 On Windows, you generally need to copy them into the working directory, in the same directory as the executable, or somewhere in your path.
 On Linux, you can point to them using `LD_LIBRARY_PATH` environment.
@@ -204,7 +204,7 @@ Exactly which WGSL features `wgpu` supports depends on how you are using it:
   for catching up to the WGSL specification,
   but in general there is no up-to-date summary
   of the differences between Naga and the WGSL spec.
-  
+
 - When running in a web browser (by compilation to WebAssembly)
   without the `"webgl"` feature enabled,
   `wgpu` relies on the browser's own WebGPU implementation.

deno_webgpu/src/bundle.rs

@@ -1,6 +1,6 @@
 // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
 
-use deno_core::error::AnyError;
+use deno_core::error::{type_error, AnyError};
 use deno_core::op;
 use deno_core::OpState;
 use deno_core::Resource;
@@ -255,16 +255,14 @@ pub fn op_webgpu_render_bundle_encoder_set_index_buffer(
     let render_bundle_encoder_resource = state
         .resource_table
         .get::<WebGpuRenderBundleEncoder>(render_bundle_encoder_rid)?;
+    let size = Some(
+        std::num::NonZeroU64::new(size).ok_or_else(|| type_error("size must be larger than 0"))?,
+    );
 
     render_bundle_encoder_resource
         .0
         .borrow_mut()
-        .set_index_buffer(
-            buffer_resource.0,
-            index_format,
-            offset,
-            std::num::NonZeroU64::new(size),
-        );
+        .set_index_buffer(buffer_resource.0, index_format, offset, size);
 
     Ok(WebGpuResult::empty())
 }
@@ -284,13 +282,16 @@ pub fn op_webgpu_render_bundle_encoder_set_vertex_buffer(
     let render_bundle_encoder_resource = state
         .resource_table
         .get::<WebGpuRenderBundleEncoder>(render_bundle_encoder_rid)?;
+    let size = Some(
+        std::num::NonZeroU64::new(size).ok_or_else(|| type_error("size must be larger than 0"))?,
+    );
 
     wgpu_core::command::bundle_ffi::wgpu_render_bundle_set_vertex_buffer(
         &mut render_bundle_encoder_resource.0.borrow_mut(),
         slot,
         buffer_resource.0,
         offset,
-        std::num::NonZeroU64::new(size),
+        size,
     );
 
     Ok(WebGpuResult::empty())

deno_webgpu/src/lib.rs

@@ -1,5 +1,7 @@
 // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
 
+#![warn(unsafe_op_in_unsafe_fn)]
+
 use deno_core::error::AnyError;
 use deno_core::include_js_files;
 use deno_core::op;

player/src/lib.rs

@@ -6,6 +6,8 @@
  *   so that we don't accidentally try to use the same ID.
 !*/
 
+#![warn(unsafe_op_in_unsafe_fn)]
+
 use wgc::device::trace;
 
 use std::{borrow::Cow, fmt::Debug, fs, marker::PhantomData, path::Path};