WIP: Context dynamic dispatch

wgpu-core/src/id.rs

@@ -93,6 +93,13 @@ impl<T> From<SerialId> for Id<T> {
 }
 
 impl<T> Id<T> {
+ /// # Safety
+ ///
+ /// The raw id must be valid for the type.
+ pub unsafe fn from_raw(raw: NonZeroId) -> Self {
+ Self(raw, PhantomData)
+ }
+
  #[allow(dead_code)]
  pub(crate) fn dummy(index: u32) -> Valid<Self> {
  Valid(Id::zip(index, 1, Backend::Empty))
@@ -165,12 +172,17 @@ pub(crate) struct Valid<I>(pub I);
 /// need to construct `Id` values directly, or access their components, like the
 /// WGPU recording player, may use this trait to do so.
 pub trait TypedId: Copy {
+ fn as_raw(&self) -> NonZeroId;
  fn zip(index: Index, epoch: Epoch, backend: Backend) -> Self;
  fn unzip(self) -> (Index, Epoch, Backend);
 }
 
 #[allow(trivial_numeric_casts)]
 impl<T> TypedId for Id<T> {
+ fn as_raw(&self) -> NonZeroId {
+ self.0
+ }
+
  fn zip(index: Index, epoch: Epoch, backend: Backend) -> Self {
  assert_eq!(0, epoch >> EPOCH_BITS);
  assert_eq!(0, (index as IdType) >> INDEX_BITS);

wgpu/Cargo.toml

@@ -77,6 +77,9 @@ test = true
 
 [features]
 default = ["wgsl"]
+# Apply run-time checks, even in release builds. These are in addition
+# to the validation carried out at public APIs in all builds.
+strict_asserts = ["wgc/strict_asserts"]
 spirv = ["naga/spv-in"]
 glsl = ["naga/glsl-in"]
 wgsl = ["wgc?/wgsl"]

wgpu/src/assertions.rs

@@ -0,0 +1,50 @@
+// TODO: Do not merge without docs
+#![allow(missing_docs)]
+
+#[cfg(feature = "strict_asserts")]
+#[macro_export]
+macro_rules! strict_assert {
+ ( $( $arg:tt )* ) => {
+ assert!( $( $arg )* )
+ }
+}
+
+#[cfg(feature = "strict_asserts")]
+#[macro_export]
+macro_rules! strict_assert_eq {
+ ( $( $arg:tt )* ) => {
+ assert_eq!( $( $arg )* )
+ }
+}
+
+#[cfg(feature = "strict_asserts")]
+#[macro_export]
+macro_rules! strict_assert_ne {
+ ( $( $arg:tt )* ) => {
+ assert_ne!( $( $arg )* )
+ }
+}
+
+#[cfg(not(feature = "strict_asserts"))]
+#[macro_export]
+macro_rules! strict_assert {
+ ( $( $arg:tt )* ) => {
+ debug_assert!( $( $arg )* )
+ };
+}
+
+#[cfg(not(feature = "strict_asserts"))]
+#[macro_export]
+macro_rules! strict_assert_eq {
+ ( $( $arg:tt )* ) => {
+ debug_assert_eq!( $( $arg )* )
+ };
+}
+
+#[cfg(not(feature = "strict_asserts"))]
+#[macro_export]
+macro_rules! strict_assert_ne {
+ ( $( $arg:tt )* ) => {
+ debug_assert_ne!( $( $arg )* )
+ };
+}