Merge pull request #5 from gfx-rs/trunk

merge with gfx wgpu again
Vecvec · Dec 11, 2023 · 4e06007 · 4e06007
2 parents 4280f29 + f7c8767
commit 4e06007
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -189,6 +189,10 @@ Passing an owned value `window` to `Surface` will return a `Surface<'static>`. S
 
 - Record the names of WGSL `alias` declarations in Naga IR `Type`s. By @jimblandy in [#4733](https://github.com/gfx-rs/wgpu/pull/4733).
 
+#### Metal
+
+- Allow the `COPY_SRC` usage flag in surface configuration. By @Toqozz in [#4852](https://github.com/gfx-rs/wgpu/pull/4852).
+
 ### Examples
 
 - remove winit dependency from hello-compute example by @psvri in [#4699](https://github.com/gfx-rs/wgpu/pull/4699)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -171,7 +171,7 @@ deno_url = "0.125.0"
 deno_web = "0.156.0"
 deno_webidl = "0.125.0"
 deno_webgpu = { version = "0.85.0", path = "./deno_webgpu" }
-tokio = "1.34.0"
+tokio = "1.35.0"
 termcolor = "1.4.0"
 
 [patch."https://github.com/gfx-rs/naga"]

diff --git a/wgpu-hal/src/metal/adapter.rs b/wgpu-hal/src/metal/adapter.rs
@@ -339,7 +339,9 @@ impl crate::Adapter<super::Api> for super::Adapter {
             ],
 
             current_extent,
-            usage: crate::TextureUses::COLOR_TARGET | crate::TextureUses::COPY_DST, //TODO: expose more
+            usage: crate::TextureUses::COLOR_TARGET
+                | crate::TextureUses::COPY_SRC
+                | crate::TextureUses::COPY_DST,
         })
     }