Skip to content
This repository has been archived by the owner on Jun 8, 2020. It is now read-only.

Commit

Permalink
Auto merge of #169 - Eijebong:ci, r=jdm
Browse files Browse the repository at this point in the history
Fix the windows build and make sure I won't break it anymore

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/skia/169)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Nov 18, 2018
2 parents 65f2977 + 62a5169 commit 93e8a33
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]

name = "servo-skia"
version = "0.30000020.0"
version = "0.30000020.1"
authors = ["The Skia Project Developers and The Servo Project Developers"]
description = "2D graphic library for drawing Text, Geometries, and Images"
license = "BSD-3-Clause"
Expand Down
15 changes: 15 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
environment:
PATH: '%PATH%;C:\Program Files (x86)\Rust\bin;C:\MinGW\bin'
RUST_BACKTRACE: 1
matrix:
- TARGET: x86_64-pc-windows-msvc
install:
- ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-nightly-${env:TARGET}.exe"
- rust-nightly-%TARGET%.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
- rustc -V
- cargo -V

build: false

test_script:
- 'cargo test --verbose'
8 changes: 4 additions & 4 deletions src/gl_context_wgl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ impl PlatformDisplayData {

pub struct GLPlatformContext {
gl: Rc<gl::Gl>,
pub context: glutin::HeadlessContext,
pub context: glutin::Context,

pub framebuffer_id: gl::GLuint,
texture_id: gl::GLuint,
Expand All @@ -50,9 +50,9 @@ impl GLPlatformContext {
size: Size2D<i32>)
-> Option<GLPlatformContext> {
unsafe {
// 32x32 is just the size of the dummy underlying context; the real
// size is used below when we create the FBO
let cx = glutin::HeadlessRendererBuilder::new(32, 32).build().unwrap();
let events_loop = glutin::EventsLoop::new();
let context = glutin::ContextBuilder::new();
let cx = glutin::Context::new(&events_loop, context, true).unwrap();
cx.make_current().expect("make_current failed");

let gl_interface = skia::SkiaGrGLCreateNativeInterface();
Expand Down

0 comments on commit 93e8a33

Please sign in to comment.