mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Auto merge of #25942 - asajeffrey:surfman-chains-multiup, r=jdm
Update surfman-chains multi branch <!-- Please describe your changes on the following line: --> Updates the mutli branch of surfman-chains, which we get from git, so is broken when I rebase. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because it fixes CI bustage <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
This commit is contained in:
commit
ec5315d76f
2 changed files with 4 additions and 2 deletions
2
Cargo.lock
generated
2
Cargo.lock
generated
|
@ -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",
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue