Merge pull request #141 from ozkriff/master

android: Updated for rust 395901393 2014-11-24 00:46:30 +0000
This commit is contained in:
David Partouche 2014-11-26 14:41:30 +01:00
commit 3ec343d12c

View file

@ -104,12 +104,12 @@ impl Window {
let config = unsafe { let config = unsafe {
let mut attribute_list = vec!(); let mut attribute_list = vec!();
if use_gles2 { if use_gles2 {
attribute_list.push_all([ffi::egl::RENDERABLE_TYPE as i32, attribute_list.push_all(&[ffi::egl::RENDERABLE_TYPE as i32,
ffi::egl::OPENGL_ES2_BIT as i32]); ffi::egl::OPENGL_ES2_BIT as i32]);
} }
attribute_list.push_all([ffi::egl::RED_SIZE as i32, 1]); attribute_list.push_all(&[ffi::egl::RED_SIZE as i32, 1]);
attribute_list.push_all([ffi::egl::GREEN_SIZE as i32, 1]); attribute_list.push_all(&[ffi::egl::GREEN_SIZE as i32, 1]);
attribute_list.push_all([ffi::egl::BLUE_SIZE as i32, 1]); attribute_list.push_all(&[ffi::egl::BLUE_SIZE as i32, 1]);
attribute_list.push(ffi::egl::NONE as i32); attribute_list.push(ffi::egl::NONE as i32);
let mut num_config: ffi::egl::types::EGLint = mem::uninitialized(); let mut num_config: ffi::egl::types::EGLint = mem::uninitialized();
@ -132,7 +132,7 @@ impl Window {
let context = unsafe { let context = unsafe {
let mut context_attributes = vec!(); let mut context_attributes = vec!();
if use_gles2 { if use_gles2 {
context_attributes.push_all([ffi::egl::CONTEXT_CLIENT_VERSION as i32, 2]); context_attributes.push_all(&[ffi::egl::CONTEXT_CLIENT_VERSION as i32, 2]);
} }
context_attributes.push(ffi::egl::NONE as i32); context_attributes.push(ffi::egl::NONE as i32);