Skip to content

Commit

Permalink
Fixes #182, gfx-rs device and render refactoring.
Browse files Browse the repository at this point in the history
  • Loading branch information
toqueteos committed Feb 4, 2015
1 parent 7b069bb commit 291e4a5
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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"

Expand Down
3 changes: 1 addition & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/shader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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! {
Expand Down

0 comments on commit 291e4a5

Please sign in to comment.