Update proc-bitfield to git version

kelpsyberry · Apr 4, 2024 · d1e3722 · d1e3722
1 parent ff8d5c7
commit d1e3722
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -32,7 +32,7 @@ debugger-hooks = ["bft-r", "bft-w"]
 
 [dependencies]
 emu-utils = { git = "https://github.com/kelpsyberry/emu-utils" }
-proc-bitfield = { version = "0.3", features = ["nightly"] }
+proc-bitfield = { git = "https://github.com/kelpsyberry/proc-bitfield", features = ["nightly"] }
 bitflags = "2.5"
 cfg-if = "1.0"
 slog = { version = "2.7", optional = true }

diff --git a/frontend/desktop/Cargo.toml b/frontend/desktop/Cargo.toml
@@ -63,7 +63,7 @@ bitflags = "2.5"
 miniz_oxide = { version = "0.7", features = ["simd"] }
 fatfs = { version = "0.3", optional = true }
 tempfile = { version = "3.10", optional = true }
-proc-bitfield = { version = "0.3", features = ["nightly"] }
+proc-bitfield = { git = "https://github.com/kelpsyberry/proc-bitfield", features = ["nightly"] }
 
 # Config
 serde = { version = "1.0", features = ["derive"] }

diff --git a/render/soft-2d/base/Cargo.toml b/render/soft-2d/base/Cargo.toml
@@ -8,4 +8,4 @@ publish = false
 
 [dependencies]
 dust-core = { path = "../../../core" }
-proc-bitfield = { version = "0.3", features = ["nightly"] }
+proc-bitfield = { git = "https://github.com/kelpsyberry/proc-bitfield", features = ["nightly"] }
diff --git a/render/soft-3d/Cargo.toml b/render/soft-3d/Cargo.toml
@@ -6,4 +6,4 @@ publish = false
 
 [dependencies]
 dust-core = { path = "../../core" }
-proc-bitfield = { version = "0.3", features = ["nightly"] }
+proc-bitfield = { git = "https://github.com/kelpsyberry/proc-bitfield", features = ["nightly"] }
diff --git a/render/soft-3d/src/lib.rs b/render/soft-3d/src/lib.rs
@@ -410,7 +410,7 @@ impl Renderer {
  for poly_addr in 0..rendering_data.poly_ram_level {
  let poly_addr = unsafe { PolyAddr::new_unchecked(poly_addr) };
  let poly = &rendering_data.poly_ram[poly_addr.get() as usize];
- let verts_len = poly.attrs.verts_len();
+ let verts_len = unsafe { poly.attrs.verts_len() };
 
  if verts_len.get() < 3 {
  continue;
@@ -657,7 +657,7 @@ impl Renderer {
  ) = match &mut poly.edges {
  Edges::Normal(edges) => {
  let raw_poly = rendering_data.poly_ram[poly.poly_addr.get() as usize];
- let verts_len = raw_poly.attrs.verts_len();
+ let verts_len = unsafe { raw_poly.attrs.verts_len() };
 
  macro_rules! process_edge {
  ($vert_i: expr, $edge: expr, $increasing: expr) => {{

diff --git a/render/wgpu-2d/Cargo.toml b/render/wgpu-2d/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 dust-core = { path = "../../core" }
 emu-utils = { git = "https://github.com/kelpsyberry/emu-utils", features = ["triple-buffer"] }
 dust-soft-2d-base = { path = "../soft-2d/base" }
-proc-bitfield = { version = "0.3", features = ["nightly"] }
+proc-bitfield = { git = "https://github.com/kelpsyberry/proc-bitfield", features = ["nightly"] }
 wgpu = "0.19"
 crossbeam-channel = "0.5"
 parking_lot = "0.12"
diff --git a/render/wgpu-3d/Cargo.toml b/render/wgpu-3d/Cargo.toml
@@ -11,7 +11,7 @@ threaded = ["emu-utils", "crossbeam-channel", "parking_lot"]
 dust-core = { path = "../../core", features = ["3d-hi-res-coords"] }
 dust-soft-3d = { path = "../soft-3d" }
 emu-utils = { git = "https://github.com/kelpsyberry/emu-utils", features = ["triple-buffer"], optional = true}
-proc-bitfield = { version = "0.3", features = ["nightly"] }
+proc-bitfield = { git = "https://github.com/kelpsyberry/proc-bitfield", features = ["nightly"] }
 ahash = "0.8"
 wgpu = "0.19"
 crossbeam-channel = { version = "0.5", optional = true }

diff --git a/render/wgpu-3d/src/lib.rs b/render/wgpu-3d/src/lib.rs
@@ -1618,7 +1618,7 @@ impl Renderer {
  toon_used |= poly.attrs.mode() == 2;
  fog_used |= poly.attrs.fog_enabled();
 
- let verts_len = poly.attrs.verts_len();
+ let verts_len = unsafe { poly.attrs.verts_len() };
 
  if verts_len.get() < 3 || poly.attrs.mode() == 3 {
  // TODO: Do process shadow/shadow mask polygons