Updating to easygpu 0.2/wgpu 0.13.1

khonsulabs · Jul 31, 2022 · 6998f2c · 6998f2c
1 parent a0075ab
commit 6998f2c
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 20 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,8 +3,8 @@ members = ["kludgine", "core", "app", "xtask"]
 resolver = "2"
 
 [patch.crates-io]
-easygpu = { git = "https://github.com/khonsulabs/easygpu.git", branch = "main" }
-easygpu-lyon = { git = "https://github.com/khonsulabs/easygpu.git", branch = "main" }
+# easygpu = { git = "https://github.com/khonsulabs/easygpu.git", branch = "main" }
+# easygpu-lyon = { git = "https://github.com/khonsulabs/easygpu.git", branch = "main" }
 # must be commented out for CI to succeed
 # easygpu = { path = "../easygpu/easygpu", version = "0.1.0" }
 # easygpu-lyon = { path = "../easygpu/lyon", version = "0.1.0" }

diff --git a/app/Cargo.toml b/app/Cargo.toml
@@ -30,7 +30,6 @@ tokio = { version = "1.16.1", features = ["full"], optional = true }
 
 once_cell = "1.9.0"
 lazy_static = "1.4.0"
-platforms = "2.0.0"
 thiserror = "1.0.30"
 anyhow = "1.0.53"
 futures = "0.3.19"
diff --git a/app/src/lib.rs b/app/src/lib.rs
@@ -4,7 +4,6 @@
     clippy::cargo,
     missing_docs,
     // clippy::missing_docs_in_private_items,
-    clippy::nursery,
     clippy::pedantic,
     future_incompatible,
     rust_2018_idioms,

diff --git a/app/src/runtime.rs b/app/src/runtime.rs
@@ -10,7 +10,6 @@ use kludgine_core::{
     },
 };
 use parking_lot::{MappedRwLockReadGuard, Mutex, RwLock, RwLockReadGuard};
-use platforms::target::{OS, TARGET_OS};
 
 use crate::{
     application::Application,
@@ -223,7 +222,7 @@ impl Runtime {
     }
 
     const fn should_run_in_exclusive_mode() -> bool {
-        matches!(TARGET_OS, OS::Android | OS::iOS)
+        cfg!(any(target_os = "android", target_os = "ios"))
     }
 
     /// Executes the runtime's event loop.

diff --git a/app/src/window/open.rs b/app/src/window/open.rs
@@ -148,7 +148,7 @@ impl<T: Window> OpenWindow<T> {
         }
     }
 
-    pub(crate) fn next_redraw_target(&self) -> RedrawTarget {
+    pub(crate) const fn next_redraw_target(&self) -> RedrawTarget {
         self.redraw_status.next_redraw_target
     }
 
@@ -268,7 +268,7 @@ pub enum UpdateSchedule {
 impl RedrawTarget {
     pub(crate) const fn next_update_instant(&self) -> Option<UpdateSchedule> {
         match self {
-            RedrawTarget::Never => None,
+            Self::Never => None,
             Self::None => Some(UpdateSchedule::Now),
             Self::Scheduled(scheduled_for) => Some(UpdateSchedule::Scheduled(*scheduled_for)),
         }

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -29,8 +29,8 @@ serialization = ["serde", "figures/serde", "palette/serializing"]
 
 [dependencies]
 approx = "0.5.1"
-easygpu = "0.1.0"
-easygpu-lyon = "0.1.0"
+easygpu = "0.2.0"
+easygpu-lyon = "0.2.0"
 image = { version = "0.24.0", default-features = false }
 palette = "0.6.0"
 futures-timer = "3.0.2"
@@ -39,7 +39,6 @@ futures = "0.3.19"
 instant = "0.1.12"
 flume = "0.10.10"
 rusttype = { version = "0.9.2", features = ["gpu_cache"] }
-platforms = "2.0.0"
 ttf-parser = "0.14.0"
 json = "0.12.4"
 serde = { version = "1.0.136", optional = true, features = ["derive"] }

diff --git a/core/src/lib.rs b/core/src/lib.rs
@@ -5,7 +5,6 @@
     clippy::cargo,
     missing_docs,
     // clippy::missing_docs_in_private_items,
-    clippy::nursery,
     clippy::pedantic,
     future_incompatible,
     rust_2018_idioms,

diff --git a/core/src/scene.rs b/core/src/scene.rs
@@ -5,7 +5,6 @@ use std::{
 };
 
 use figures::{DisplayScale, Displayable, One, Pixels, Points, Rectlike, SizedRect};
-use platforms::target::{OS, TARGET_OS};
 use winit::{event::VirtualKeyCode, window::Theme};
 
 use crate::{
@@ -179,20 +178,31 @@ impl Modifiers {
     /// returns `control`.
     #[must_use]
     pub const fn primary_modifier(&self) -> bool {
-        match TARGET_OS {
-            OS::MacOS | OS::iOS => self.operating_system,
-            _ => self.control,
+        #[cfg(any(target_os = "macos", target_os = "ios"))]
+        {
+            self.operating_system
+        }
+
+        #[cfg(not(any(target_os = "macos", target_os = "ios")))]
+        {
+            self.control
         }
     }
 
     /// Returns true if the command key/Apple key is pressed. This only returns
     /// true if `operating_system` key is true and the current operating system
     /// is Mac or iOS.
     #[must_use]
+    #[allow(clippy::unused_self)]
     pub const fn command_key(&self) -> bool {
-        match TARGET_OS {
-            OS::MacOS | OS::iOS => self.operating_system,
-            _ => false,
+        #[cfg(any(target_os = "macos", target_os = "ios"))]
+        {
+            self.operating_system
+        }
+
+        #[cfg(not(any(target_os = "macos", target_os = "ios")))]
+        {
+            false
         }
     }
 }

diff --git a/kludgine/src/lib.rs b/kludgine/src/lib.rs
@@ -5,7 +5,6 @@
     clippy::cargo,
     missing_docs,
     // clippy::missing_docs_in_private_items,
-    clippy::nursery,
     clippy::pedantic,
     future_incompatible,
     rust_2018_idioms,