From 6e09fa092fcfb256922c748fee829dc211dc2caf Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Tue, 10 Mar 2020 14:43:41 -0500 Subject: [PATCH 1/2] Update surfman-chains multi branch --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index f8ea31cf907..8e1cb57b1e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5754,7 +5754,7 @@ dependencies = [ [[package]] name = "surfman-chains" version = "0.3.0" -source = "git+https://github.com/asajeffrey/surfman-chains?branch=multi#80a71b1a2df71ae70c3c194d0af40b8ebf72968a" +source = "git+https://github.com/asajeffrey/surfman-chains?branch=multi#e775b8c7807659958a4f20cf8e6eca4290f35124" dependencies = [ "euclid", "fnv", From 9c2163cf89e97109c053d641eafc42ee75ef2f6d Mon Sep 17 00:00:00 2001 From: Alan Jeffrey Date: Tue, 10 Mar 2020 15:12:33 -0500 Subject: [PATCH 2/2] Updated gst plugin for new surfman-chains API --- ports/gstplugin/servowebsrc.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/gstplugin/servowebsrc.rs b/ports/gstplugin/servowebsrc.rs index d09b18fbf9b..4c562e50a13 100644 --- a/ports/gstplugin/servowebsrc.rs +++ b/ports/gstplugin/servowebsrc.rs @@ -90,6 +90,7 @@ use surfman::GLApi; use surfman::GLVersion; use surfman::SurfaceAccess; use surfman::SurfaceType; +use surfman_chains::SurfmanProvider; use surfman_chains::SwapChain; use surfman_chains_api::SwapChainAPI; @@ -359,7 +360,8 @@ impl ServoWebSrcWindow { (gl::FRAMEBUFFER_COMPLETE, gl::NO_ERROR) ); - let swap_chain = SwapChain::create_attached(&mut device, &mut context, access) + let provider = Box::new(SurfmanProvider::new(access)); + let swap_chain = SwapChain::create_attached(&mut device, &mut context, provider) .expect("Failed to create swap chain"); device.make_no_context_current().unwrap();