Misc changes.

Signed-off-by: Hal Gentz <zegentzy@protonmail.com>

Author: goddessfreya

glutin/src/api/egl.rs

@@ -585,7 +585,7 @@ impl Context {
     }
 
     #[inline]
-    pub unsafe fn make_current_window(
+    pub unsafe fn make_current_surface(
         &self,
         surface: &WindowSurface,
     ) -> Result<(), ContextError> {

glutin/src/context.rs

@@ -18,11 +18,11 @@ impl Context {
     }
 
     #[inline]
-    pub unsafe fn make_current_window(
+    pub unsafe fn make_current_surface(
         &self,
         surface: &WindowSurface,
     ) -> Result<(), ContextError> {
-        self.context.make_current_window(surface.inner())
+        self.context.make_current_surface(surface.inner())
     }
 
     #[inline]

glutin/src/platform_impl/unix/unix.rs

@@ -118,15 +118,15 @@ impl Context {
     }
 
     #[inline]
-    pub unsafe fn make_current_window(
+    pub unsafe fn make_current_surface(
         &self,
         surface: &WindowSurface,
     ) -> Result<(), ContextError> {
         match (self, surface) {
             (
                 Context::Wayland(ref ctx),
                 WindowSurface::Wayland(ref surface),
-            ) => ctx.make_current_window(surface),
+            ) => ctx.make_current_surface(surface),
         }
     }
 
@@ -242,14 +242,14 @@ impl WindowSurface {
         el: &EventLoopWindowTarget<T>,
         ctx: &Context,
         wb: WindowBuilder,
-    ) -> Result<(Self, Window), CreationError> {
+    ) -> Result<(Window, Self), CreationError> {
         match ctx {
             // Context::X11(ref ctx) => x11::WindowSurface::new(el, ctx, wb)
             //    .map(|(surface, win)| (WindowSurface::X11(surface), win)),
             Context::Wayland(ref ctx) => wayland::WindowSurface::new(
                 el, ctx, wb,
             )
-            .map(|(surface, win)| (WindowSurface::Wayland(surface), win)),
+            .map(|(win, surface)| (win, WindowSurface::Wayland(surface))),
         }
     }
 

glutin/src/platform_impl/unix/wayland.rs

@@ -39,7 +39,7 @@ impl WindowSurface {
         el: &EventLoopWindowTarget<T>,
         ctx: &Context,
         wb: WindowBuilder,
-    ) -> Result<(Self, Window), CreationError> {
+    ) -> Result<(Window, Self), CreationError> {
         let win = wb.build(el)?;
 
         let dpi_factor = win.hidpi_factor();
@@ -69,7 +69,7 @@ impl WindowSurface {
             &ctx.context,
             wsurface.ptr() as *const _,
         )
-        .map(|surface| (WindowSurface { wsurface, surface }, win))
+        .map(|surface| (win, WindowSurface { wsurface, surface }))
     }
 
     #[inline]
@@ -156,11 +156,11 @@ impl Context {
     }
 
     #[inline]
-    pub unsafe fn make_current_window(
+    pub unsafe fn make_current_surface(
         &self,
         surface: &WindowSurface,
     ) -> Result<(), ContextError> {
-        self.context.make_current_window(&surface.surface)
+        self.context.make_current_surface(&surface.surface)
     }
 
     #[inline]

glutin/src/surface.rs

@@ -9,7 +9,7 @@ pub struct PBuffer {
 
 impl PBuffer {
     #[inline]
-    pub fn new<TE>(
+    pub unsafe fn new<TE>(
         el: &EventLoopWindowTarget<TE>,
         ctx: &Context,
         size: dpi::PhysicalSize,
@@ -46,13 +46,13 @@ pub struct WindowSurface {
 
 impl WindowSurface {
     #[inline]
-    pub fn new<TE>(
+    pub unsafe fn new<TE>(
         el: &EventLoopWindowTarget<TE>,
         ctx: &Context,
         wb: WindowBuilder,
-    ) -> Result<(WindowSurface, Window), CreationError> {
+    ) -> Result<(Window, WindowSurface), CreationError> {
         platform_impl::WindowSurface::new(el, ctx.inner(), wb)
-            .map(|(surface, window)| (WindowSurface { surface }, window))
+            .map(|(window, surface)| (window, WindowSurface { surface }))
     }
 
     #[inline]

glutin_examples/Cargo.toml

@@ -13,7 +13,6 @@ publish = false
 [dependencies]
 glutin = { path = "../glutin" }
 glutin_lighter = { path = "../glutin_lighter" }
-winit = "0.19"
 takeable-option = "0.5"
 image = "0.21"
 env_logger = "0.6"