From c6ab1df7e3cab3e76cb9333167143e55482fb28e Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Tue, 22 Mar 2016 21:47:50 -0400 Subject: [PATCH 1/3] Add appveyor config for Windows CI support. Fixes https://github.com/servo/webrender/issues/246. --- appveyor.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000000..f82a3036cf --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,14 @@ +environment: + PATH: '%PATH%;C:\msys64\mingw64\bin;C:\Rust\bin' + +install: + - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-x86_64-pc-windows-gnu.msi" + - msiexec /passive /i "rust-nightly-x86_64-pc-windows-gnu.msi" ADDLOCAL=Rustc,Cargo,Std INSTALLDIR=C:\Rust + - C:\msys64\usr\bin\bash -lc "pacman -S --noconfirm mingw-w64-x86_64-freetype" + - rustc -V + - cargo -V + +build: false + +test_script: + - cargo test --verbose From ad245a7c0db751826561c135e1bbf5afd5863274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Wed, 23 Mar 2016 17:53:38 +0100 Subject: [PATCH 2/3] Use offscreen_gl_context from crates.io --- Cargo.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4b22aee2ba..2e819f68a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,14 +27,12 @@ git = "https://github.com/servo/ipc-channel" [dependencies.webrender_traits] git = "https://github.com/servo/webrender_traits" -[dependencies.offscreen_gl_context] -git = "https://github.com/ecoal95/rust-offscreen-rendering-context" - #[dependencies.notify] #git = "https://github.com/glennw/rsnotify.git" #branch = "inotify-modify" [dependencies] +offscreen_gl_context = {version = "0.1.1", features = ["serde_serialization"]} gleam = "0.2" euclid = {version = "0.6.2", features = ["plugins"]} num = {version = "0.1.31", default-features = false} From 4495168ba8184c58ca79d884dd17a154ac3cd52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Sun, 27 Mar 2016 15:33:06 +0200 Subject: [PATCH 3/3] webgl: Return the GLLimits structure to the caller --- src/render_backend.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/render_backend.rs b/src/render_backend.rs index f059e0d98d..bdff41a70b 100644 --- a/src/render_backend.rs +++ b/src/render_backend.rs @@ -217,12 +217,14 @@ impl RenderBackend { (draw_buffer.size(), draw_buffer.get_bound_texture_id().unwrap()) }; + let limits = ctx.borrow_limits().clone(); + self.webgl_contexts.insert(id, ctx); self.resource_cache .add_webgl_texture(id, TextureId(texture_id), real_size); - tx.send(Ok(id)).unwrap(); + tx.send(Ok((id, limits))).unwrap(); }, Err(msg) => { tx.send(Err(msg.to_owned())).unwrap();