Merge pull request #99 from tomaka/update-glrs

Update for changes in gl-rs

examples/support/mod.rs

@@ -31,7 +31,7 @@ pub struct Context {
 }
 
 pub fn load(window: &glutin::Window) -> Context {
-    let gl = gl::Gl::load_with(|symbol| window.get_proc_address(symbol));
+    let gl = gl::Gl::load(window);
 
     let version = {
         use std::c_str::CString;
@@ -46,6 +46,7 @@ pub fn load(window: &glutin::Window) -> Context {
 impl Context {
     #[cfg(not(target_os = "android"))]
     pub fn draw_frame(&self, color: (f32, f32, f32, f32)) {
+        unsafe {
             self.gl.ClearColor(color.0, color.1, color.2, color.3);
             self.gl.Clear(gl::COLOR_BUFFER_BIT);
 
@@ -60,9 +61,11 @@ impl Context {
 
             self.gl.Flush();
         }
+    }
 
     #[cfg(target_os = "android")]
     pub fn draw_frame(&self, color: (f32, f32, f32, f32)) {
+        unsafe {
             self.gl.ClearColor(color.0, color.1, color.2, color.3);
             self.gl.Clear(gl::COLOR_BUFFER_BIT);
 
@@ -83,6 +86,7 @@ impl Context {
             
             self.gl.Flush();
         }
+    }
 }
 
 #[cfg(target_os = "android")]

src/lib.rs

@@ -31,6 +31,8 @@
 
 #[phase(plugin)] extern crate compile_msg;
 #[phase(plugin)] extern crate gl_generator;
+
+extern crate gl_common;
 extern crate libc;
 
 #[cfg(target_os = "macos")]
@@ -397,6 +399,13 @@ impl Window {
     }
 }
 
+#[cfg(feature = "window")]
+impl gl_common::GlFunctionsSource for Window {
+    fn get_proc_addr(&self, addr: &str) -> *const libc::c_void {
+        self.get_proc_address(addr)
+    }
+}
+
 /// Represents a headless OpenGL context.
 #[cfg(feature = "headless")]
 pub struct HeadlessContext {
@@ -421,6 +430,13 @@ impl HeadlessContext {
     }
 }
 
+#[cfg(feature = "headless")]
+impl gl_common::GlFunctionsSource for HeadlessContext {
+    fn get_proc_addr(&self, addr: &str) -> *const libc::c_void {
+        self.get_proc_address(addr)
+    }
+}
+
 /// An iterator for the `poll_events` function.
 // Implementation note: we retreive the list once, then serve each element by one by one.
 // This may change in the future.

src/win32/init.rs

@@ -350,7 +350,7 @@ pub fn new_window(builder_dimensions: Option<(uint, uint)>, builder_title: Strin
         if builder_vsync {
             if extra_functions.SwapIntervalEXT.is_loaded() {
                 unsafe { ffi::wgl::MakeCurrent(hdc, context) };
-                if extra_functions.SwapIntervalEXT(1) == 0 {
+                if unsafe { extra_functions.SwapIntervalEXT(1) } == 0 {
                     tx.send(Err(format!("wglSwapIntervalEXT failed")));
                     unsafe { ffi::wgl::DeleteContext(context); }
                     unsafe { ffi::DestroyWindow(real_window); }

tests/headless.rs

@@ -24,12 +24,14 @@ fn main() {
 
     let gl = gl::Gl::load_with(|symbol| window.get_proc_address(symbol));
 
+    unsafe {
         gl.ClearColor(0.0, 1.0, 0.0, 1.0);
         gl.Clear(gl::COLOR_BUFFER_BIT);
 
-    let mut value: (u8, u8, u8, u8) = unsafe { std::mem::uninitialized() };
+        let mut value: (u8, u8, u8, u8) = std::mem::uninitialized();
-    unsafe { gl.ReadPixels(0, 0, 1, 1, gl::RGBA, gl::UNSIGNED_BYTE, std::mem::transmute(&mut value)) };
+        gl.ReadPixels(0, 0, 1, 1, gl::RGBA, gl::UNSIGNED_BYTE, std::mem::transmute(&mut value));
         
         assert!(value == (0, 255, 0, 255) || value == (0, 64, 0, 255) ||
             value == (0, 64, 0, 255) || value == (0, 64, 0, 0));
+    }
 }