Auto merge of #27743 - lorenzbutter:master, r=jdm

bors-servo · web-flow · commit cb43a9fe9832 · 2020-11-08T00:34:16.000-05:00
Call eglMakeCurrent with non-null surfaces before anything else First call to eglMakeCurrent with no draw or read surface leads to black window on Nvidia/X11. This change ensures first call to eglMakeCurrent made with non-null surfaces.  - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #26353 (GitHub issue number if applicable)  - [ ] There are tests for these changes OR - [X] These changes do not require tests because ___
diff --git a/components/webrender_surfman/lib.rs b/components/webrender_surfman/lib.rs
@@ -80,6 +80,9 @@ impl WebrenderSurfman {
                 let _ = device.destroy_surface(&mut context, &mut surface);
                 err
             })?;
+
+        device.make_context_current(&context)?;
+
         let swap_chain = if headless {
             Some(SwapChain::create_attached(
                 &mut device,
