Fix benchmarks for latest glium/glutin API

[mandelwow.git] / benches / shaded_cube.rs

diff --git a/benches/shaded_cube.rs b/benches/shaded_cube.rs
index 8ea5a0e53dc73788bc7d23bbda0c4861ec67c22f..6c51ab27dd6e1b41a5c09739cb0d44c9ab6a730c 100644 (file)
--- a/benches/shaded_cube.rs
+++ b/benches/shaded_cube.rs
@@ -1,27 +1,26 @@
 #![feature(test)]
-
-extern crate mandelwow_lib;
-#[macro_use(uniform)]
-extern crate glium;
-extern crate glutin;
 extern crate test;
 
-use glium::DisplayBuild;
-use mandelwow_lib::Cube;
+use glium::uniform;
 use mandelwow_lib::shaded_cube::*;
+use std::rc::Rc;
 
 #[bench]
 fn bench_shaded_cube(b: &mut test::Bencher) {
-    let display = glutin::WindowBuilder::new().build_glium().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 event_loop = glutin::event_loop::EventLoop::new();
+    let window = glutin::window::WindowBuilder::new();
+    let context = glutin::ContextBuilder::new();
+    let display = glium::Display::new(window, context, &event_loop).unwrap();
+
+    let program = Rc::new(shaded_program(&display));
+    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);
     });