Merge #578

578: Comment fixes, header update r=kvark a=kvark Matches review fixes in https://phabricator.services.mozilla.com/D70707 Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
gfx-rs · Apr 13, 2020 · 49dbe08 · 49dbe08
2 parents 8d1185f + 379ea37
commit 49dbe08
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/ffi/wgpu.h b/ffi/wgpu.h
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-/* Generated with cbindgen:0.14.0 */
+/* Generated with cbindgen:0.14.1 */
 
 /* DO NOT MODIFY THIS MANUALLY! This file was generated using cbindgen.
  * To generate this file:

diff --git a/wgpu-core/src/id.rs b/wgpu-core/src/id.rs
@@ -24,6 +24,9 @@ pub struct Id<T>(NonZeroU64, PhantomData<T>);
 impl<T> Default for Id<T> {
     fn default() -> Self {
         Id(
+            // Create an ID that doesn't make sense:
+            // the high `BACKEND_BITS` are to be set to 0, which matches `Backend::Empty`,
+            // the other bits are all 1s
             unsafe { NonZeroU64::new_unchecked(!0 >> BACKEND_BITS) },
             PhantomData,
         )

diff --git a/wgpu-core/src/track/texture.rs b/wgpu-core/src/track/texture.rs
@@ -300,7 +300,7 @@ mod test {
         assert_eq!(
             ts1.merge(id, &ts2, None),
             Ok(()),
-            "failed to merge with an emtpy"
+            "failed to merge with an empty"
         );
 
         ts2.mips.push(PlaneStates::from_slice(&[(