diff --git a/Cargo.toml b/Cargo.toml index ce995c7..92ccc21 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,7 +55,7 @@ git = "https://github.com/PistonDevelopers/event" [dependencies.pistoncore-window] git = "https://github.com/PistonDevelopers/window" -[dependencies.device] +[dependencies.gfx_device_gl] git = "https://github.com/gfx-rs/gfx-rs" [dependencies.gfx] @@ -64,9 +64,6 @@ git = "https://github.com/gfx-rs/gfx-rs" [dependencies.gfx_macros] git = "https://github.com/gfx-rs/gfx-rs" -[dependencies.render] -git = "https://github.com/gfx-rs/gfx-rs" - [dependencies.shader_version] git = "https://github.com/PistonDevelopers/shader_version" diff --git a/src/main.rs b/src/main.rs index 500eb99..8a12d83 100644 --- a/src/main.rs +++ b/src/main.rs @@ -9,17 +9,16 @@ extern crate gfx_macros; extern crate cam; extern crate current; -extern crate device; extern crate event; extern crate flate; extern crate fps_counter; extern crate gfx; +extern crate "gfx_device_gl" as device; extern crate gfx_macros; extern crate gfx_voxel; extern crate image; extern crate input; extern crate quack; -extern crate render; extern crate sdl2; extern crate sdl2_window; extern crate shader_version; diff --git a/src/shader.rs b/src/shader.rs index 5a9848a..16cc92c 100644 --- a/src/shader.rs +++ b/src/shader.rs @@ -2,7 +2,7 @@ use device; use device::draw::CommandBuffer; use gfx; use gfx::{ Device, DeviceHelper, ToSlice }; -use render; +use gfx::render; use vecmath::Matrix4; static VERTEX: gfx::ShaderSource<'static> = shaders! {