Updates for .as_ptr() and other std changes

gl2.rs

@@ -16,11 +16,10 @@ use std::cast::transmute;
 use std::cmp;
 use std::ptr;
 use std::ptr::to_unsafe_ptr;
-use std::str::from_utf8;
+use std::str::from_utf8_owned;
 use std::str::raw::from_c_str;
 use std::mem::size_of;
 use std::vec::from_elem;
-use std::vec::raw::{set_len, to_ptr};
 
 // Linking
 #[nolink]
@@ -456,7 +455,7 @@ pub fn buffer_data<T>(target: GLenum, data: &[T], usage: GLenum) {
     unsafe {
         glBufferData(target,
                      (data.len() * size_of::<T>()) as GLsizeiptr,
-                     to_ptr(data) as *GLvoid,
+                     data.as_ptr() as *GLvoid,
                      usage);
     }
 }
@@ -469,7 +468,7 @@ pub fn buffer_sub_data<T>(target: GLenum, element_offset_index: uint, data: &[T]
         glBufferSubData(target,
                         (element_offset_index * size) as GLintptr,
                         (data.len() * size) as GLsizeiptr,
-                        to_ptr(data) as *GLvoid);
+                        data.as_ptr() as *GLvoid);
     }
 }
 
@@ -517,13 +516,13 @@ pub fn cull_face(mode: GLenum) {
 
 pub fn delete_buffers(buffers: &[GLuint]) {
     unsafe {
-        glDeleteBuffers(buffers.len() as GLsizei, to_ptr(buffers));
+        glDeleteBuffers(buffers.len() as GLsizei, buffers.as_ptr());
     }
 }
 
 pub fn delete_frame_buffers(frame_buffers: &[GLuint]) {
     unsafe {
-        glDeleteFramebuffers(frame_buffers.len() as GLsizei, to_ptr(frame_buffers));
+        glDeleteFramebuffers(frame_buffers.len() as GLsizei, frame_buffers.as_ptr());
     }
 }
 
@@ -535,7 +534,7 @@ pub fn delete_program(program: GLuint) {
 
 pub fn delete_render_buffers(render_buffers: &[GLuint]) {
     unsafe {
-        glDeleteRenderbuffers(render_buffers.len() as GLsizei, to_ptr(render_buffers));
+        glDeleteRenderbuffers(render_buffers.len() as GLsizei, render_buffers.as_ptr());
     }
 }
 
@@ -547,7 +546,7 @@ pub fn delete_shader(shader: GLuint) {
 
 pub fn delete_textures(textures: &[GLuint]) {
     unsafe {
-        return glDeleteTextures(textures.len() as GLsizei, to_ptr(textures));
+        return glDeleteTextures(textures.len() as GLsizei, textures.as_ptr());
     }
 }
 
@@ -671,23 +670,23 @@ pub fn front_face(mode: GLenum) {
 pub fn gen_buffers(n: GLsizei) -> ~[GLuint] {
     unsafe {
         let result = from_elem(n as uint, 0 as GLuint);
-        glGenBuffers(n, to_ptr(result));
+        glGenBuffers(n, result.as_ptr());
         return result;
     }
 }
 
 pub fn gen_framebuffers(n: GLsizei) -> ~[GLuint] {
     unsafe {
         let result = from_elem(n as uint, 0 as GLuint);
-        glGenFramebuffers(n, to_ptr(result));
+        glGenFramebuffers(n, result.as_ptr());
         return result;
     }
 }
 
 pub fn gen_textures(n: GLsizei) -> ~[GLuint] {
     unsafe {
         let result = from_elem(n as uint, 0 as GLuint);
-        glGenTextures(n, to_ptr(result));
+        glGenTextures(n, result.as_ptr());
         return result;
     }
 }
@@ -697,7 +696,7 @@ pub fn gen_textures(n: GLsizei) -> ~[GLuint] {
 pub fn gen_vertex_arrays(n: GLsizei) -> ~[GLuint] {
     unsafe {
         let result = from_elem(n as uint, 0 as GLuint);
-        glGenVertexArrays(n, to_ptr(result));
+        glGenVertexArrays(n, result.as_ptr());
         return result;
     }
 }
@@ -729,9 +728,9 @@ pub fn get_program_info_log(program: GLuint) -> ~str {
         glGetProgramInfoLog(program,
                             1024 as GLsizei,
                             to_unsafe_ptr(&result_len),
-                            to_ptr(result) as *GLchar);
+                            result.as_ptr() as *GLchar);
         result.truncate(if result_len > 0 {result_len-1} else {0} as uint);
-        return from_utf8(result);
+        return from_utf8_owned(result);
     }
 }
 
@@ -750,9 +749,9 @@ pub fn get_shader_info_log(shader: GLuint) -> ~str {
         glGetShaderInfoLog(shader,
                            1024 as GLsizei,
                            to_unsafe_ptr(&result_len),
-                           to_ptr(result) as *GLchar);
+                           result.as_ptr() as *GLchar);
         result.truncate(if result_len > 0 {result_len-1} else {0} as uint);
-        return from_utf8(result);
+        return from_utf8_owned(result);
     }
 }
 
@@ -873,7 +872,7 @@ pub fn read_pixels(x: GLint, y: GLint, width: GLsizei, height: GLsizei, format:
         }
     });
 
-    unsafe { set_len(&mut pixels, len); }
+    unsafe { pixels.set_len(len); }
 
     pixels
 }
@@ -886,10 +885,10 @@ pub fn scissor(x: GLint, y: GLint, width: GLsizei, height: GLsizei) {
 
 pub fn shader_source(shader: GLuint, strings: &[~[u8]]) {
     unsafe {
-        let pointers = strings.map(|string| to_ptr(*string));
+        let pointers = strings.map(|string| string.as_ptr());
         let lengths = strings.map(|string| string.len() as GLint);
         glShaderSource(shader, pointers.len() as GLsizei,
-                       to_ptr(pointers) as **GLchar, to_ptr(lengths));
+                       pointers.as_ptr() as **GLchar, lengths.as_ptr());
         destroy(lengths);
         destroy(pointers);
     }
@@ -908,7 +907,7 @@ pub fn tex_image_2d(target: GLenum,
     match opt_data {
         Some(data) => {
             unsafe {
-                let pdata = transmute(to_ptr(data));
+                let pdata = transmute(data.as_ptr());
                 glTexImage2D(target, level, internal_format, width, height, border, format, ty,
                              pdata);
             }
@@ -935,7 +934,7 @@ pub fn tex_sub_image_2d(target: GLenum,
     match opt_data {
         Some(data) => {
             unsafe {
-                let pdata = transmute(to_ptr(data));
+                let pdata = transmute(data.as_ptr());
                 glTexSubImage2D(target, level, xoffset, yoffset, width, height, format, ty,
                                 pdata);
             }
@@ -1085,10 +1084,9 @@ pub fn viewport(x: GLint, y: GLint, width: GLsizei, height: GLsizei) {
 pub mod apple {
     use super::{GLenum, GLsizei};
     use std::cast::transmute;
-    use std::vec::raw::to_ptr;
 
     pub unsafe fn texture_range(target: GLenum, buffer: &[u8]) {
-        super::glTextureRangeAPPLE(target, buffer.len() as GLsizei, transmute(to_ptr(buffer)));
+        super::glTextureRangeAPPLE(target, buffer.len() as GLsizei, transmute(buffer.as_ptr()));
     }
 }
 

lib.rs

@@ -7,6 +7,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#[feature(link_args)];
+
 extern mod std;
 
 pub mod gl2;