This commit is contained in:
Pierre Krieger 2015-04-02 22:04:17 +02:00
parent 2e1fe8283f
commit d33c138164
8 changed files with 32 additions and 48 deletions

View file

@ -6,7 +6,7 @@ extern crate android_glue;
extern crate glutin;
use std::thread::Thread;
use std::thread;
mod support;
@ -22,15 +22,15 @@ fn main() {
let window2 = glutin::Window::new().unwrap();
let window3 = glutin::Window::new().unwrap();
let t1 = Thread::scoped(move || {
let t1 = thread::scoped(move || {
run(window1, (0.0, 1.0, 0.0, 1.0));
});
let t2 = Thread::scoped(move || {
let t2 = thread::scoped(move || {
run(window2, (0.0, 0.0, 1.0, 1.0));
});
let t3 = Thread::scoped(move || {
let t3 = thread::scoped(move || {
run(window3, (1.0, 0.0, 0.0, 1.0));
});

View file

@ -1,5 +1,6 @@
#![cfg(feature = "window")]
use std::ffi::CStr;
use glutin;
#[cfg(not(target_os = "android"))]
@ -21,8 +22,8 @@ pub fn load(window: &glutin::Window) -> Context {
let gl = gl::Gl::load(window);
let version = unsafe {
use std::ffi;
String::from_utf8(ffi::c_str_to_bytes(&(gl.GetString(gl::VERSION) as *const i8)).to_vec()).unwrap()
let data = CStr::from_ptr(gl.GetString(gl::VERSION) as *const i8).to_bytes().to_vec();
String::from_utf8(data).unwrap()
};
println!("OpenGL version {}", version);