From 8addf6f6336fee07f9d0c7b199e8134c6ef3e093 Mon Sep 17 00:00:00 2001
From: Glenn Watson <gw@intuitionlibrary.com>
Date: Mon, 17 Nov 2014 07:41:54 +1000
Subject: [PATCH] Update gleam submodule, and use glfw to load OpenGL function
 pointers.

---
 Cargo.lock                        | 2 +-
 ports/android/glut_app/Cargo.lock | 2 +-
 ports/cef/Cargo.lock              | 2 +-
 ports/glfw/lib.rs                 | 1 +
 ports/glfw/window.rs              | 3 +++
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 50e78de161c..3a0da9595bd 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -251,7 +251,7 @@ dependencies = [
 [[package]]
 name = "gleam"
 version = "0.0.1"
-source = "git+https://github.com/servo/gleam#8e77178eaebddfeae6557dfec2bcccbefaba93f3"
+source = "git+https://github.com/servo/gleam#aaea38be25ce9de6e1e8620fa5b554669ac6475c"
 dependencies = [
  "gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
 ]
diff --git a/ports/android/glut_app/Cargo.lock b/ports/android/glut_app/Cargo.lock
index 9a16a43736f..ad28f6f5dfb 100644
--- a/ports/android/glut_app/Cargo.lock
+++ b/ports/android/glut_app/Cargo.lock
@@ -249,7 +249,7 @@ dependencies = [
 [[package]]
 name = "gleam"
 version = "0.0.1"
-source = "git+https://github.com/servo/gleam#8e77178eaebddfeae6557dfec2bcccbefaba93f3"
+source = "git+https://github.com/servo/gleam#aaea38be25ce9de6e1e8620fa5b554669ac6475c"
 dependencies = [
  "gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
 ]
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 1313b8021a9..7e420f55e33 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -259,7 +259,7 @@ dependencies = [
 [[package]]
 name = "gleam"
 version = "0.0.1"
-source = "git+https://github.com/servo/gleam#8e77178eaebddfeae6557dfec2bcccbefaba93f3"
+source = "git+https://github.com/servo/gleam#aaea38be25ce9de6e1e8620fa5b554669ac6475c"
 dependencies = [
  "gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git)",
 ]
diff --git a/ports/glfw/lib.rs b/ports/glfw/lib.rs
index 13babca7462..9741072db2f 100644
--- a/ports/glfw/lib.rs
+++ b/ports/glfw/lib.rs
@@ -13,6 +13,7 @@ extern crate alert;
 extern crate cgl;
 extern crate compositing;
 extern crate geom;
+extern crate gleam;
 extern crate glfw;
 extern crate layers;
 extern crate libc;
diff --git a/ports/glfw/window.rs b/ports/glfw/window.rs
index 0fe1b30f4b2..3bf18949280 100644
--- a/ports/glfw/window.rs
+++ b/ports/glfw/window.rs
@@ -20,6 +20,7 @@ use geom::point::{Point2D, TypedPoint2D};
 use geom::scale_factor::ScaleFactor;
 use geom::size::TypedSize2D;
 use glfw::{mod, Context};
+use gleam::gl;
 use layers::geometry::DevicePixel;
 use layers::platform::surface::NativeGraphicsMetadata;
 use libc::c_int;
@@ -63,6 +64,8 @@ impl Window {
             .expect("Failed to create GLFW window");
         glfw_window.make_current();
 
+        gl::load_with(|s| glfw_window.get_proc_address(s));
+
         // Create our window object.
         let window = Window {
             glfw: glfw,