Merge branch 'trunk' of github.com:gfx-rs/wgpu into bump_raw_window_h…

…andle_to_6_0_0

.deny.toml

@@ -6,7 +6,8 @@ skip-tree = [
 	{ name = "wgpu-info" },
 ]
 skip = [
-	{ name = "wgpu" }
+	{ name = "wgpu" },
+	{ name = "fastrand" }
 ]
 wildcards = "deny"
 

.github/workflows/ci.yml

@@ -270,17 +270,14 @@ jobs:
           # Windows
           - name: Windows x86_64
             os: windows-2022
-            backends: dx12
 
           # Mac
           - name: Mac aarch64
             os: [self-hosted, macOS]
-            backends: vulkan metal
 
           # Linux
           - name: Linux x86_64
             os: ubuntu-22.04
-            backends: vulkan gl
 
     name: Test ${{ matrix.name }}
     runs-on: ${{ matrix.os }}
@@ -294,16 +291,10 @@ jobs:
         with:
           tool: cargo-nextest,cargo-llvm-cov
 
-      - name: install swiftshader
-        if: matrix.os == 'ubuntu-22.04'
-        shell: bash
+      - name: Install Repo MSRV toolchain
         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 "VK_ICD_FILENAMES=$PWD/swiftshader/vk_swiftshader_icd.json" >> $GITHUB_ENV
+          rustup toolchain install ${{ env.REPO_MSRV }} --no-self-update --profile=minimal
+          cargo -V
 
       - name: install llvmpipe, vulkan sdk
         if: matrix.os == 'ubuntu-22.04'
@@ -317,8 +308,10 @@ jobs:
           wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add -
           sudo wget -qO /etc/apt/sources.list.d/lunarg-vulkan-jammy.list https://packages.lunarg.com/vulkan/lunarg-vulkan-jammy.list
 
+          sudo add-apt-repository ppa:kisak/kisak-mesa
+
           sudo apt-get update
-          sudo apt install -y libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev vulkan-sdk
+          sudo apt install -y libegl1-mesa libgl1-mesa-dri libxcb-xfixes0-dev vulkan-sdk mesa-vulkan-drivers
 
       - name: disable debug
         shell: bash
@@ -334,22 +327,12 @@ jobs:
         with:
           key: test-${{ matrix.os }}-${{ env.CACHE_SUFFIX }}
 
-      - name: run wgpu-info
-        shell: bash
-        run: |
-          set -e
-
-          cargo llvm-cov --no-cfg-coverage run --bin wgpu-info --no-report --features vulkan-portability
-
       - name: run tests
         shell: bash
         run: |
           set -e
 
-          for backend in ${{ matrix.backends }}; do
-            echo "======= NATIVE TESTS $backend ======";
-            WGPU_BACKEND=$backend cargo llvm-cov --no-cfg-coverage nextest --no-fail-fast --no-report --features vulkan-portability
-          done
+          cargo xtask test --llvm-cov
 
       - uses: actions/upload-artifact@v3
         if: always() # We want artifacts even if the tests fail.
@@ -421,6 +404,7 @@ jobs:
       - name: run rustfmt
         run: |
           cargo fmt -- --check
+          cargo fmt --manifest-path xtask/Cargo.toml -- --check
 
   check-cts-runner:
     name: Clippy cts_runner

.gitignore

@@ -28,3 +28,6 @@ cts/
 
 # Readme says to put angle in working directory
 *.dll
+
+# Cached GPU config
+.gpuconfig

CHANGELOG.md

@@ -44,6 +44,12 @@ Bottom level categories:
 
 - Update Naga to 9eb3a1dc (2023-10-12), which includes support for WGSL constant expressions. By @jimblandy in [#4233](https://github.com/gfx-rs/wgpu/pull/4233)
 
+#### Support desktop OpenGL via WGL on Windows
+
+Added creating of full OpenGL contexts to the GLES backend using WGL to support older devices.
+
+By @Zoxc in [#4248](https://github.com/gfx-rs/wgpu/pull/4248)
+
 #### Pass timestamp queries
 
 Addition of `TimestampWrites` to compute and render passes to allow profiling.
@@ -101,7 +107,6 @@ By @teoxoy in [#4185](https://github.com/gfx-rs/wgpu/pull/4185)
 - Add WinUI 3 SwapChainPanel support. By @ddrboxman in [#4191](https://github.com/gfx-rs/wgpu/pull/4191)
 
 ### Changes
-
 #### General
 
 - Omit texture store bound checks since they are no-ops if out of bounds on all APIs. By @teoxoy in [#3975](https://github.com/gfx-rs/wgpu/pull/3975)
@@ -115,6 +120,10 @@ By @teoxoy in [#4185](https://github.com/gfx-rs/wgpu/pull/4185)
 - Add `Rgb10a2Uint` format. By @teoxoy in [4199](https://github.com/gfx-rs/wgpu/pull/4199)
 - Validate that resources are used on the right device. By @nical in [4207](https://github.com/gfx-rs/wgpu/pull/4207)
 - Expose instance flags. By @nical in [4230](https://github.com/gfx-rs/wgpu/pull/4230)
+- Add support for the bgra8unorm-storage feature. By @jinleili and @nical in [#4228](https://github.com/gfx-rs/wgpu/pull/4228)
+- Calls to lost devices now return `DeviceError::Lost` instead of `DeviceError::Invalid`. By @bradwerth in [#4238]([https://github.com/gfx-rs/wgpu/pull/4238])
+- Let the `"strict_asserts"` feature enable check that wgpu-core's lock-ordering tokens are unique per thread. By @jimblandy in [#4258]([https://github.com/gfx-rs/wgpu/pull/4258])
+- Allow filtering labels out before they are passed to GPU drivers by @nical in [https://github.com/gfx-rs/wgpu/pull/4246](4246)
 
 #### Vulkan
 
@@ -168,6 +177,10 @@ By @teoxoy in [#4185](https://github.com/gfx-rs/wgpu/pull/4185)
 - Ensure that limit requests and reporting is done correctly. By @OptimisticPeach in [#4107](https://github.com/gfx-rs/wgpu/pull/4107)
 - Validate usage of polygon mode. By @teoxoy in [#4196](https://github.com/gfx-rs/wgpu/pull/4196)
 
+#### GLES
+
+- enable/disable blending per attachment only when available (on ES 3.2 or higher). By @teoxoy in [#4234](https://github.com/gfx-rs/wgpu/pull/4234)
+
 #### Testing
 
 - Skip `test_multithreaded_compute` on MoltenVK. By @jimblandy in [#4096](https://github.com/gfx-rs/wgpu/pull/4096).