Remove shaderc dependency through default feature

GabrielMajeri · May 20, 2019 · 3f7db3a · 3f7db3a
1 parent 4222a9c
commit 3f7db3a
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 14 deletions.
diff --git a/amethyst_animation/Cargo.toml b/amethyst_animation/Cargo.toml
@@ -22,7 +22,7 @@ amethyst_assets = { path = "../amethyst_assets/", version = "0.6.0" }
 amethyst_core = { path = "../amethyst_core/", version = "0.5.0" }
 amethyst_error = { path = "../amethyst_error/", version = "0.1.0" }
 amethyst_derive = { path = "../amethyst_derive", version = "0.3.0" }
-amethyst_rendy = { path = "../amethyst_rendy/", version = "0.1.0" }
+amethyst_rendy = { path = "../amethyst_rendy", version = "0.1.0" }
 derivative = "1.0"
 fnv = "1"
 hibitset = { version = "0.5.1", features = ["parallel"] }

diff --git a/amethyst_gltf/Cargo.toml b/amethyst_gltf/Cargo.toml
@@ -18,7 +18,7 @@ travis-ci = { repository = "amethyst/amethyst" }
 [dependencies]
 amethyst_assets = { path = "../amethyst_assets/", version = "0.6.0" }
 amethyst_animation = { path = "../amethyst_animation/", version = "0.5.0" }
-amethyst_rendy = { path = "../amethyst_rendy/" }
+amethyst_rendy = { path = "../amethyst_rendy", version = "0.1.0" }
 amethyst_core = { path = "../amethyst_core/", version = "0.5.0" }
 amethyst_error = { path = "../amethyst_error/", version = "0.1.0" }
 err-derive = "0.1"

diff --git a/amethyst_rendy/Cargo.toml b/amethyst_rendy/Cargo.toml
@@ -20,7 +20,7 @@ hibitset = "0.5.4"
 lazy_static = "1.3"
 log = "0.4"
 palette = { version = "0.4", features = ["serde"] }
-rendy = { git = "https://github.com/amethyst/rendy.git", features = ["command", "descriptor", "factory", "frame", "graph", "memory", "mesh", "shader", "resource", "texture", "util", "wsi", "empty", "mesh-obj", "texture-image", "texture-palette", "serde-1"] }
+rendy = { git = "https://github.com/amethyst/rendy.git", default-features = false, features = ["command", "descriptor", "factory", "frame", "graph", "memory", "mesh", "shader", "resource", "texture", "util", "wsi", "empty", "mesh-obj", "texture-image", "texture-palette", "serde-1"] }
 # rendy = { git = "https://github.com/frizi/rendy.git", branch = "fence-reset", features = ["full", "empty", "serde-1"] }
 # rendy = { path = "../../rendy/rendy/", features = ["full", "empty", "serde-1"] }
 ron = "0.4"

diff --git a/amethyst_test/src/amethyst_application.rs b/amethyst_test/src/amethyst_application.rs
@@ -1,4 +1,4 @@
-use std::{any::Any, hash::Hash, marker::PhantomData, panic, path::PathBuf, sync::Mutex, thread};
+use std::{any::Any, marker::PhantomData, panic, path::PathBuf, sync::Mutex, thread};
 
 use amethyst::{
     self,

diff --git a/examples/pong_tutorial_02/main.rs b/examples/pong_tutorial_02/main.rs
@@ -71,16 +71,6 @@ struct ExampleGraph {
     dirty: bool,
 }
 
-impl ExampleGraph {
-    pub fn new() -> Self {
-        Self {
-            last_dimensions: None,
-            surface_format: None,
-            dirty: true,
-        }
-    }
-}
-
 impl GraphCreator<DefaultBackend> for ExampleGraph {
     // This trait method reports to the renderer if the graph must be rebuilt, usually because
     // the window has been resized. This implementation checks the screen size and returns true