From 69c5bc8fca3d34699092ab824f13ef9365f7a189 Mon Sep 17 00:00:00 2001 From: Glenn Watson Date: Thu, 30 Oct 2014 11:13:25 +1000 Subject: [PATCH] Update to use new GL bindings. --- Cargo.lock | 46 ++++++++++++++++---------- components/compositing/Cargo.toml | 6 ++-- components/compositing/compositor.rs | 39 +++++++++++----------- components/compositing/lib.rs | 2 +- ports/android/glut_app/Cargo.lock | 44 +++++++++++++++++-------- ports/cef/Cargo.lock | 49 ++++++++++++++++------------ ports/cef/Cargo.toml | 3 -- ports/cef/lib.rs | 1 - 8 files changed, 112 insertions(+), 78 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 44367f5b74c..650610ec34d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -33,8 +33,8 @@ dependencies = [ "egl 0.1.0 (git+https://github.com/servo/rust-egl#88f2a13812ddbce2bf2317221663a61c31b3e220)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype#0b03da276e4bdeae2300596dabc4ccb16733ad70)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", - "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", + "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#fed3a988e56ed8300a62940704796194847d197b)", "skia-sys 0.0.20130412 (git+https://github.com/servo/skia#6d696712962fd0d41120b7a414a48417da8e6a92)", "xlib 0.1.0 (git+https://github.com/servo/rust-xlib#581d4faddec5188d3c3ae5307dbea28aab90644c)", ] @@ -51,9 +51,9 @@ dependencies = [ [[package]] name = "cgl" version = "0.0.1" -source = "git+https://github.com/servo/rust-cgl#0a8d726e57b4cd55bee9f7c743d29ae1cf8f3fc2" +source = "git+https://github.com/servo/rust-cgl#698c6c5409c1049ba5a7e0f7bdddf97f91dc4cf5" dependencies = [ - "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", + "gleam 0.0.1 (git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199)", ] [[package]] @@ -73,11 +73,11 @@ dependencies = [ "devtools_traits 0.0.1", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", "gfx 0.0.1", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "gleam 0.0.1 (git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "layout_traits 0.0.1", "msg 0.0.1", "net 0.0.1", - "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", "png 0.1.0 (git+https://github.com/servo/rust-png#74418ffbf20e94b0d3bed4a9d004062a13342c79)", "script_traits 0.0.1", "url 0.1.0 (git+https://github.com/servo/rust-url#29f70a47230c2aa736e263977247c786e0b2c243)", @@ -189,7 +189,7 @@ dependencies = [ "freetype 0.1.0 (git+https://github.com/servo/rust-freetype#0b03da276e4bdeae2300596dabc4ccb16733ad70)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", "harfbuzz 0.1.0 (git+https://github.com/servo/rust-harfbuzz#ad520942cc17232e1a40cdd8a99c2905623d35f6)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "msg 0.0.1", "net 0.0.1", "plugins 0.0.1", @@ -209,6 +209,14 @@ dependencies = [ "rust-xml 0.1.0 (git+https://github.com/netvl/rust-xml#fdc021b2bfec7855866b964f459559903c6b7808)", ] +[[package]] +name = "gleam" +version = "0.0.1" +source = "git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199" +dependencies = [ + "gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git#2857ad712bd443196983ea7c0bd4b6bdcf653e7c)", +] + [[package]] name = "glfw" version = "0.0.1" @@ -228,11 +236,11 @@ name = "glfw_app" version = "0.0.1" dependencies = [ "alert 0.1.0 (git+https://github.com/servo/rust-alert#fdc24f13be8d8a2d15214ec228d166b3221b809e)", - "cgl 0.0.1 (git+https://github.com/servo/rust-cgl#0a8d726e57b4cd55bee9f7c743d29ae1cf8f3fc2)", + "cgl 0.0.1 (git+https://github.com/servo/rust-cgl#698c6c5409c1049ba5a7e0f7bdddf97f91dc4cf5)", "compositing 0.0.1", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", "glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo#a15c2d04b8969aea653841d1d79e5fdf68de664b)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "msg 0.0.1", "util 0.0.1", ] @@ -279,11 +287,12 @@ dependencies = [ [[package]] name = "io_surface" version = "0.1.0" -source = "git+https://github.com/servo/rust-io-surface#7038341220bd7e86e21118fac2cbc6bd50890e47" +source = "git+https://github.com/servo/rust-io-surface#3f8220ab2e94651ced69b04068c5126b1adadf1f" dependencies = [ + "cgl 0.0.1 (git+https://github.com/servo/rust-cgl#698c6c5409c1049ba5a7e0f7bdddf97f91dc4cf5)", "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#5c3b85b079ab2fe4a046497a84e55386db7598e8)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", - "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", + "gleam 0.0.1 (git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199)", ] [[package]] @@ -302,14 +311,15 @@ source = "git+https://github.com/bjz/gl-rs.git#2857ad712bd443196983ea7c0bd4b6bdc [[package]] name = "layers" version = "0.1.0" -source = "git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461" +source = "git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f" dependencies = [ + "cgl 0.0.1 (git+https://github.com/servo/rust-cgl#698c6c5409c1049ba5a7e0f7bdddf97f91dc4cf5)", "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#5c3b85b079ab2fe4a046497a84e55386db7598e8)", "egl 0.1.0 (git+https://github.com/servo/rust-egl#88f2a13812ddbce2bf2317221663a61c31b3e220)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", + "gleam 0.0.1 (git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199)", "glx 0.0.1 (git+https://github.com/servo/rust-glx#e2ce3d297260ccd23fcb4627f6ed218b68e1095f)", - "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface#7038341220bd7e86e21118fac2cbc6bd50890e47)", - "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", + "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface#3f8220ab2e94651ced69b04068c5126b1adadf1f)", "xlib 0.1.0 (git+https://github.com/servo/rust-xlib#581d4faddec5188d3c3ae5307dbea28aab90644c)", ] @@ -361,8 +371,8 @@ dependencies = [ "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#5c3b85b079ab2fe4a046497a84e55386db7598e8)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", "http 0.1.0-pre (git+https://github.com/servo/rust-http?ref=servo#5e9b063b36028a5b40a417c661ee5c628b594be9)", - "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface#7038341220bd7e86e21118fac2cbc6bd50890e47)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface#3f8220ab2e94651ced69b04068c5126b1adadf1f)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "url 0.1.0 (git+https://github.com/servo/rust-url#29f70a47230c2aa736e263977247c786e0b2c243)", "util 0.0.1", ] @@ -382,7 +392,7 @@ dependencies = [ [[package]] name = "opengles" version = "0.1.0" -source = "git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50" +source = "git+https://github.com/servo/rust-opengles#fed3a988e56ed8300a62940704796194847d197b" [[package]] name = "openssl" @@ -527,7 +537,7 @@ name = "util" version = "0.0.1" dependencies = [ "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "string_cache 0.0.0 (git+https://github.com/servo/string-cache#124b891ebb4564743068f99aaeb0e154de343efb)", "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache#124b891ebb4564743068f99aaeb0e154de343efb)", "task_info 0.0.1", diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml index 83a4bbee5cc..47f732d9c0d 100644 --- a/components/compositing/Cargo.toml +++ b/components/compositing/Cargo.toml @@ -43,9 +43,6 @@ git = "https://github.com/servo/rust-geom" [dependencies.layers] git = "https://github.com/servo/rust-layers" -[dependencies.opengles] -git = "https://github.com/servo/rust-opengles" - [dependencies.png] git = "https://github.com/servo/rust-png" @@ -57,3 +54,6 @@ git = "https://github.com/servo/rust-core-graphics" [dependencies.core_text] git = "https://github.com/servo/rust-core-text" + +[dependencies.gleam] +git = "https://github.com/servo/gleam" diff --git a/components/compositing/compositor.rs b/components/compositing/compositor.rs index 16d81c4c6f5..e11f66d1e34 100644 --- a/components/compositing/compositor.rs +++ b/components/compositing/compositor.rs @@ -32,8 +32,9 @@ use layers::layers::{BufferRequest, Layer, LayerBufferSet}; use layers::rendergl; use layers::rendergl::RenderContext; use layers::scene::Scene; -use opengles::gl2; use png; +use gleam::gl::types::{GLint, GLsizei}; +use gleam::gl; use servo_msg::compositor_msg::{Blank, Epoch, FinishedLoading, IdleRenderState, LayerId}; use servo_msg::compositor_msg::{ReadyState, RenderingRenderState, RenderState, Scrollable}; use servo_msg::constellation_msg::{ConstellationChan, ExitMsg, LoadUrlMsg, NavigateMsg}; @@ -904,21 +905,21 @@ impl IOCompositor { let (width, height) = (self.window_size.width.get(), self.window_size.height.get()); if output_image { - framebuffer_ids = gl2::gen_framebuffers(1); - gl2::bind_framebuffer(gl2::FRAMEBUFFER, framebuffer_ids[0]); + framebuffer_ids = gl::gen_framebuffers(1); + gl::bind_framebuffer(gl::FRAMEBUFFER, framebuffer_ids[0]); - texture_ids = gl2::gen_textures(1); - gl2::bind_texture(gl2::TEXTURE_2D, texture_ids[0]); + texture_ids = gl::gen_textures(1); + gl::bind_texture(gl::TEXTURE_2D, texture_ids[0]); - gl2::tex_image_2d(gl2::TEXTURE_2D, 0, gl2::RGB as gl2::GLint, width as gl2::GLsizei, - height as gl2::GLsizei, 0, gl2::RGB, gl2::UNSIGNED_BYTE, None); - gl2::tex_parameter_i(gl2::TEXTURE_2D, gl2::TEXTURE_MAG_FILTER, gl2::NEAREST as gl2::GLint); - gl2::tex_parameter_i(gl2::TEXTURE_2D, gl2::TEXTURE_MIN_FILTER, gl2::NEAREST as gl2::GLint); + gl::tex_image_2d(gl::TEXTURE_2D, 0, gl::RGB as GLint, width as GLsizei, + height as GLsizei, 0, gl::RGB, gl::UNSIGNED_BYTE, None); + gl::tex_parameter_i(gl::TEXTURE_2D, gl::TEXTURE_MAG_FILTER, gl::NEAREST as GLint); + gl::tex_parameter_i(gl::TEXTURE_2D, gl::TEXTURE_MIN_FILTER, gl::NEAREST as GLint); - gl2::framebuffer_texture_2d(gl2::FRAMEBUFFER, gl2::COLOR_ATTACHMENT0, gl2::TEXTURE_2D, - texture_ids[0], 0); + gl::framebuffer_texture_2d(gl::FRAMEBUFFER, gl::COLOR_ATTACHMENT0, gl::TEXTURE_2D, + texture_ids[0], 0); - gl2::bind_texture(gl2::TEXTURE_2D, 0); + gl::bind_texture(gl::TEXTURE_2D, 0); } profile(time::CompositingCategory, None, self.time_profiler_chan.clone(), || { @@ -939,15 +940,15 @@ impl IOCompositor { if output_image { let path = from_str::(opts::get().output_file.as_ref().unwrap().as_slice()).unwrap(); - let mut pixels = gl2::read_pixels(0, 0, - width as gl2::GLsizei, - height as gl2::GLsizei, - gl2::RGB, gl2::UNSIGNED_BYTE); + let mut pixels = gl::read_pixels(0, 0, + width as GLsizei, + height as GLsizei, + gl::RGB, gl::UNSIGNED_BYTE); - gl2::bind_framebuffer(gl2::FRAMEBUFFER, 0); + gl::bind_framebuffer(gl::FRAMEBUFFER, 0); - gl2::delete_buffers(texture_ids.as_slice()); - gl2::delete_frame_buffers(framebuffer_ids.as_slice()); + gl::delete_buffers(texture_ids.as_slice()); + gl::delete_frame_buffers(framebuffer_ids.as_slice()); // flip image vertically (texture is upside down) let orig_pixels = pixels.clone(); diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs index 0f3cf47696c..e5af7de77ca 100644 --- a/components/compositing/lib.rs +++ b/components/compositing/lib.rs @@ -21,13 +21,13 @@ extern crate geom; extern crate gfx; extern crate layers; extern crate layout_traits; -extern crate opengles; extern crate png; extern crate script_traits; extern crate "msg" as servo_msg; extern crate "net" as servo_net; #[phase(plugin, link)] extern crate "util" as servo_util; +extern crate gleam; extern crate libc; extern crate time; diff --git a/ports/android/glut_app/Cargo.lock b/ports/android/glut_app/Cargo.lock index 6e3c896698e..8d303cb4d27 100644 --- a/ports/android/glut_app/Cargo.lock +++ b/ports/android/glut_app/Cargo.lock @@ -7,7 +7,7 @@ dependencies = [ "egl 0.1.0 (git+https://github.com/servo/rust-egl#88f2a13812ddbce2bf2317221663a61c31b3e220)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", "glut 0.0.1 (git+https://github.com/servo/rust-glut#01af0162ea0322ad1a40d6adb023a39813605949)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "msg 0.0.1", "servo 0.0.1", "util 0.0.1", @@ -33,7 +33,7 @@ dependencies = [ "egl 0.1.0 (git+https://github.com/servo/rust-egl#88f2a13812ddbce2bf2317221663a61c31b3e220)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype#0b03da276e4bdeae2300596dabc4ccb16733ad70)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", "skia-sys 0.0.20130412 (git+https://github.com/servo/skia#6d696712962fd0d41120b7a414a48417da8e6a92)", "xlib 0.1.0 (git+https://github.com/servo/rust-xlib#581d4faddec5188d3c3ae5307dbea28aab90644c)", @@ -48,6 +48,14 @@ dependencies = [ "util 0.0.1", ] +[[package]] +name = "cgl" +version = "0.0.1" +source = "git+https://github.com/servo/rust-cgl#698c6c5409c1049ba5a7e0f7bdddf97f91dc4cf5" +dependencies = [ + "gleam 0.0.1 (git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199)", +] + [[package]] name = "cocoa" version = "0.1.0" @@ -65,11 +73,11 @@ dependencies = [ "devtools_traits 0.0.1", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", "gfx 0.0.1", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "gleam 0.0.1 (git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "layout_traits 0.0.1", "msg 0.0.1", "net 0.0.1", - "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", "png 0.1.0 (git+https://github.com/servo/rust-png#74418ffbf20e94b0d3bed4a9d004062a13342c79)", "script_traits 0.0.1", "url 0.1.0 (git+https://github.com/servo/rust-url#29f70a47230c2aa736e263977247c786e0b2c243)", @@ -181,7 +189,7 @@ dependencies = [ "freetype 0.1.0 (git+https://github.com/servo/rust-freetype#0b03da276e4bdeae2300596dabc4ccb16733ad70)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", "harfbuzz 0.1.0 (git+https://github.com/servo/rust-harfbuzz#ad520942cc17232e1a40cdd8a99c2905623d35f6)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "msg 0.0.1", "net 0.0.1", "plugins 0.0.1", @@ -201,6 +209,14 @@ dependencies = [ "rust-xml 0.1.0 (git+https://github.com/netvl/rust-xml#fdc021b2bfec7855866b964f459559903c6b7808)", ] +[[package]] +name = "gleam" +version = "0.0.1" +source = "git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199" +dependencies = [ + "gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git#2857ad712bd443196983ea7c0bd4b6bdcf653e7c)", +] + [[package]] name = "glut" version = "0.0.1" @@ -251,11 +267,12 @@ dependencies = [ [[package]] name = "io_surface" version = "0.1.0" -source = "git+https://github.com/servo/rust-io-surface#7038341220bd7e86e21118fac2cbc6bd50890e47" +source = "git+https://github.com/servo/rust-io-surface#3f8220ab2e94651ced69b04068c5126b1adadf1f" dependencies = [ + "cgl 0.0.1 (git+https://github.com/servo/rust-cgl#698c6c5409c1049ba5a7e0f7bdddf97f91dc4cf5)", "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#5c3b85b079ab2fe4a046497a84e55386db7598e8)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", - "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", + "gleam 0.0.1 (git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199)", ] [[package]] @@ -274,14 +291,15 @@ source = "git+https://github.com/bjz/gl-rs.git#2857ad712bd443196983ea7c0bd4b6bdc [[package]] name = "layers" version = "0.1.0" -source = "git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461" +source = "git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f" dependencies = [ + "cgl 0.0.1 (git+https://github.com/servo/rust-cgl#698c6c5409c1049ba5a7e0f7bdddf97f91dc4cf5)", "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#5c3b85b079ab2fe4a046497a84e55386db7598e8)", "egl 0.1.0 (git+https://github.com/servo/rust-egl#88f2a13812ddbce2bf2317221663a61c31b3e220)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", + "gleam 0.0.1 (git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199)", "glx 0.0.1 (git+https://github.com/servo/rust-glx#e2ce3d297260ccd23fcb4627f6ed218b68e1095f)", - "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface#7038341220bd7e86e21118fac2cbc6bd50890e47)", - "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", + "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface#3f8220ab2e94651ced69b04068c5126b1adadf1f)", "xlib 0.1.0 (git+https://github.com/servo/rust-xlib#581d4faddec5188d3c3ae5307dbea28aab90644c)", ] @@ -333,8 +351,8 @@ dependencies = [ "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#5c3b85b079ab2fe4a046497a84e55386db7598e8)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", "http 0.1.0-pre (git+https://github.com/servo/rust-http?ref=servo#5e9b063b36028a5b40a417c661ee5c628b594be9)", - "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface#7038341220bd7e86e21118fac2cbc6bd50890e47)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface#3f8220ab2e94651ced69b04068c5126b1adadf1f)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "url 0.1.0 (git+https://github.com/servo/rust-url#29f70a47230c2aa736e263977247c786e0b2c243)", "util 0.0.1", ] @@ -508,7 +526,7 @@ name = "util" version = "0.0.1" dependencies = [ "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "string_cache 0.0.0 (git+https://github.com/servo/string-cache#97754929f38d93f6728d1f0acce8107648420e98)", "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache#97754929f38d93f6728d1f0acce8107648420e98)", "task_info 0.0.1", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index cd85aefd208..cce71458516 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -11,10 +11,9 @@ dependencies = [ "glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo#a15c2d04b8969aea653841d1d79e5fdf68de664b)", "glfw_app 0.0.1", "js 0.1.0 (git+https://github.com/servo/rust-mozjs#1ec216a2577c03738fa11a78958bb2a0fd3f7fbd)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "msg 0.0.1", "net 0.0.1", - "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", "plugins 0.0.1", "png 0.1.0 (git+https://github.com/servo/rust-png#74418ffbf20e94b0d3bed4a9d004062a13342c79)", "script 0.0.1", @@ -44,8 +43,8 @@ dependencies = [ "egl 0.1.0 (git+https://github.com/servo/rust-egl#88f2a13812ddbce2bf2317221663a61c31b3e220)", "freetype 0.1.0 (git+https://github.com/servo/rust-freetype#0b03da276e4bdeae2300596dabc4ccb16733ad70)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", - "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", + "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#fed3a988e56ed8300a62940704796194847d197b)", "skia-sys 0.0.20130412 (git+https://github.com/servo/skia#6d696712962fd0d41120b7a414a48417da8e6a92)", "xlib 0.1.0 (git+https://github.com/servo/rust-xlib#581d4faddec5188d3c3ae5307dbea28aab90644c)", ] @@ -62,9 +61,9 @@ dependencies = [ [[package]] name = "cgl" version = "0.0.1" -source = "git+https://github.com/servo/rust-cgl#0a8d726e57b4cd55bee9f7c743d29ae1cf8f3fc2" +source = "git+https://github.com/servo/rust-cgl#698c6c5409c1049ba5a7e0f7bdddf97f91dc4cf5" dependencies = [ - "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", + "gleam 0.0.1 (git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199)", ] [[package]] @@ -84,11 +83,11 @@ dependencies = [ "devtools_traits 0.0.1", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", "gfx 0.0.1", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "gleam 0.0.1 (git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "layout_traits 0.0.1", "msg 0.0.1", "net 0.0.1", - "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", "png 0.1.0 (git+https://github.com/servo/rust-png#74418ffbf20e94b0d3bed4a9d004062a13342c79)", "script_traits 0.0.1", "url 0.1.0 (git+https://github.com/servo/rust-url#29f70a47230c2aa736e263977247c786e0b2c243)", @@ -200,7 +199,7 @@ dependencies = [ "freetype 0.1.0 (git+https://github.com/servo/rust-freetype#0b03da276e4bdeae2300596dabc4ccb16733ad70)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", "harfbuzz 0.1.0 (git+https://github.com/servo/rust-harfbuzz#ad520942cc17232e1a40cdd8a99c2905623d35f6)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "msg 0.0.1", "net 0.0.1", "plugins 0.0.1", @@ -220,6 +219,14 @@ dependencies = [ "rust-xml 0.1.0 (git+https://github.com/netvl/rust-xml#fdc021b2bfec7855866b964f459559903c6b7808)", ] +[[package]] +name = "gleam" +version = "0.0.1" +source = "git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199" +dependencies = [ + "gl_generator 0.0.1 (git+https://github.com/bjz/gl-rs.git#2857ad712bd443196983ea7c0bd4b6bdcf653e7c)", +] + [[package]] name = "glfw" version = "0.0.1" @@ -239,11 +246,11 @@ name = "glfw_app" version = "0.0.1" dependencies = [ "alert 0.1.0 (git+https://github.com/servo/rust-alert#fdc24f13be8d8a2d15214ec228d166b3221b809e)", - "cgl 0.0.1 (git+https://github.com/servo/rust-cgl#0a8d726e57b4cd55bee9f7c743d29ae1cf8f3fc2)", + "cgl 0.0.1 (git+https://github.com/servo/rust-cgl#698c6c5409c1049ba5a7e0f7bdddf97f91dc4cf5)", "compositing 0.0.1", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", "glfw 0.0.1 (git+https://github.com/servo/glfw-rs?ref=servo#a15c2d04b8969aea653841d1d79e5fdf68de664b)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "msg 0.0.1", "util 0.0.1", ] @@ -290,11 +297,12 @@ dependencies = [ [[package]] name = "io_surface" version = "0.1.0" -source = "git+https://github.com/servo/rust-io-surface#7038341220bd7e86e21118fac2cbc6bd50890e47" +source = "git+https://github.com/servo/rust-io-surface#3f8220ab2e94651ced69b04068c5126b1adadf1f" dependencies = [ + "cgl 0.0.1 (git+https://github.com/servo/rust-cgl#698c6c5409c1049ba5a7e0f7bdddf97f91dc4cf5)", "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#5c3b85b079ab2fe4a046497a84e55386db7598e8)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", - "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", + "gleam 0.0.1 (git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199)", ] [[package]] @@ -313,14 +321,15 @@ source = "git+https://github.com/bjz/gl-rs.git#2857ad712bd443196983ea7c0bd4b6bdc [[package]] name = "layers" version = "0.1.0" -source = "git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461" +source = "git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f" dependencies = [ + "cgl 0.0.1 (git+https://github.com/servo/rust-cgl#698c6c5409c1049ba5a7e0f7bdddf97f91dc4cf5)", "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#5c3b85b079ab2fe4a046497a84e55386db7598e8)", "egl 0.1.0 (git+https://github.com/servo/rust-egl#88f2a13812ddbce2bf2317221663a61c31b3e220)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", + "gleam 0.0.1 (git+https://github.com/servo/gleam#5ebe1656d63087c68512c93c6528f9300abcd199)", "glx 0.0.1 (git+https://github.com/servo/rust-glx#e2ce3d297260ccd23fcb4627f6ed218b68e1095f)", - "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface#7038341220bd7e86e21118fac2cbc6bd50890e47)", - "opengles 0.1.0 (git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50)", + "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface#3f8220ab2e94651ced69b04068c5126b1adadf1f)", "xlib 0.1.0 (git+https://github.com/servo/rust-xlib#581d4faddec5188d3c3ae5307dbea28aab90644c)", ] @@ -372,8 +381,8 @@ dependencies = [ "core_foundation 0.1.0 (git+https://github.com/servo/rust-core-foundation#5c3b85b079ab2fe4a046497a84e55386db7598e8)", "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", "http 0.1.0-pre (git+https://github.com/servo/rust-http?ref=servo#5e9b063b36028a5b40a417c661ee5c628b594be9)", - "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface#7038341220bd7e86e21118fac2cbc6bd50890e47)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "io_surface 0.1.0 (git+https://github.com/servo/rust-io-surface#3f8220ab2e94651ced69b04068c5126b1adadf1f)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "url 0.1.0 (git+https://github.com/servo/rust-url#29f70a47230c2aa736e263977247c786e0b2c243)", "util 0.0.1", ] @@ -393,7 +402,7 @@ dependencies = [ [[package]] name = "opengles" version = "0.1.0" -source = "git+https://github.com/servo/rust-opengles#e308a8672f7d953f6484932b6a4aaae8a0cc2a50" +source = "git+https://github.com/servo/rust-opengles#fed3a988e56ed8300a62940704796194847d197b" [[package]] name = "openssl" @@ -553,7 +562,7 @@ name = "util" version = "0.0.1" dependencies = [ "geom 0.1.0 (git+https://github.com/servo/rust-geom#b001a76e907befaae1d0d6dd259418a22092da86)", - "layers 0.1.0 (git+https://github.com/servo/rust-layers#4282ee4203a2e706007b723f4fd3f5eca9541461)", + "layers 0.1.0 (git+https://github.com/servo/rust-layers#3737b00270644594a95896a2cd37ffca36d5bc5f)", "string_cache 0.0.0 (git+https://github.com/servo/string-cache#97754929f38d93f6728d1f0acce8107648420e98)", "string_cache_macros 0.0.0 (git+https://github.com/servo/string-cache#97754929f38d93f6728d1f0acce8107648420e98)", "task_info 0.0.1", diff --git a/ports/cef/Cargo.toml b/ports/cef/Cargo.toml index a0de421b970..6ea7c406270 100644 --- a/ports/cef/Cargo.toml +++ b/ports/cef/Cargo.toml @@ -54,9 +54,6 @@ git = "https://github.com/servo/rust-mozjs" [dependencies.layers] git = "https://github.com/servo/rust-layers" -[dependencies.opengles] -git = "https://github.com/servo/rust-opengles" - [dependencies.png] git = "https://github.com/servo/rust-png" diff --git a/ports/cef/lib.rs b/ports/cef/lib.rs index c84879937f3..a13c489b790 100644 --- a/ports/cef/lib.rs +++ b/ports/cef/lib.rs @@ -23,7 +23,6 @@ extern crate glfw; extern crate glfw_app; extern crate js; extern crate layers; -extern crate opengles; extern crate png; extern crate script;