Update benches to latest glium display setup api

[mandelwow.git] / benches / shaded_cube.rs

diff --git a/benches/shaded_cube.rs b/benches/shaded_cube.rs
index 8ea5a0e53dc73788bc7d23bbda0c4861ec67c22f..501976b8d15d5e32064d080e4cdff03380d7949f 100644 (file)
--- a/benches/shaded_cube.rs
+++ b/benches/shaded_cube.rs
@@ -6,22 +6,24 @@ extern crate glium;
 extern crate glutin;
 extern crate test;
 
-use glium::DisplayBuild;
-use mandelwow_lib::Cube;
 use mandelwow_lib::shaded_cube::*;
 
 #[bench]
 fn bench_shaded_cube(b: &mut test::Bencher) {
-    let display = glutin::WindowBuilder::new().build_glium().unwrap();
+    let events_loop = glium::glutin::EventsLoop::new();
+    let window = glium::glutin::WindowBuilder::new();
+    let context = glium::glutin::ContextBuilder::new();
+    let display = glium::Display::new(window, context, &events_loop).unwrap();
+
     let program = shaded_program(&display);
-    let bounds = Cube { xmin: -2., xmax: 0.7, ymin: -1., ymax:  1., zmin: -1.1, zmax:  1.1 };
-    let cube = ShadedCube::new(&display, &bounds, &program);
+    let cube = ShadedCube::new(&display, &program);
     let mut frame = display.draw();
     b.iter(|| {
-        let mat = [[1., 0., 0., 0.], [0., 1., 0., 0.], [0., 0., 1., 0.], [0., 0., 0., 1.0f32]];
+        let model =     [[0.7, 0.5, -0.5, 0.0], [0.0, 0.7, 0.7, 0.0], [0.7, -0.5,  0.5,  0.0], [0., 0., -3.0, 1.0f32]];
+        let perspview = [[0.5, 0.0,  0.0, 0.0], [0.0, 1.0, 0.0, 0.0], [0.0,  0.0, -1.0, -1.0], [0., 0., -0.2, 0.0f32]];
         let uniforms = uniform! {
-            model: mat,
-            viewpersp: mat,
+            model: model,
+            perspview: perspview,
         };
         cube.draw(&mut frame, &uniforms);
     });