Fix the build on Windows after recent refactoring (#383)

Signed-off-by: Martin Robinson <mrobinson@igalia.com>

Author: mrobinson

src/angle/device.rs

@@ -1,10 +1,10 @@
 //! A thread-local handle to the device.
 
-use super::connection::Connection;
-use super::context::{Context, ContextDescriptor};
-use super::surface::{Surface, Synchronization, Win32Objects};
-use crate::angle::context::NativeContext;
-use crate::angle::surface::{NativeWidget, SurfaceDataGuard, SurfaceTexture};
+use crate::angle::connection::Connection;
+use crate::angle::context::{Context, ContextDescriptor, NativeContext};
+use crate::angle::surface::{
+    NativeWidget, Surface, SurfaceDataGuard, SurfaceTexture, Synchronization, Win32Objects,
+};
 use crate::base::egl::context::{self, CurrentContextGuard};
 use crate::base::egl::device::EGL_FUNCTIONS;
 use crate::base::egl::error::ToWindowingApiError;
@@ -14,16 +14,12 @@ use crate::base::egl::ffi::{
     EGL_PLATFORM_DEVICE_EXT,
 };
 use crate::base::egl::surface::ExternalEGLSurfaces;
-use crate::context::ContextID;
-use crate::context::CREATE_CONTEXT_MUTEX;
-use crate::egl;
+use crate::context::{ContextID, CREATE_CONTEXT_MUTEX};
 use crate::egl::types::{EGLAttrib, EGLConfig, EGLDeviceEXT, EGLDisplay, EGLSurface, EGLint};
-use crate::gl;
 use crate::surface::Framebuffer;
-use crate::GLApi;
-use crate::Gl;
-use crate::{ContextAttributes, Error, SurfaceInfo};
-use crate::{SurfaceAccess, SurfaceType};
+use crate::{
+    egl, gl, ContextAttributes, Error, GLApi, Gl, SurfaceAccess, SurfaceInfo, SurfaceType,
+};
 use euclid::default::Size2D;
 use glow::HasContext;
 use std::cell::{RefCell, RefMut};

src/wgl/device.rs

@@ -2,21 +2,18 @@
 //
 //! An implementation of the GPU device for Windows using the WGL API.
 
-use super::connection::Connection;
-use super::context::WGL_EXTENSION_FUNCTIONS;
-use super::surface::{Surface, Win32Objects};
-use crate::context::{self, ContextID, CREATE_CONTEXT_MUTEX};
+use crate::context::{current_context_uses_compatibility_profile, ContextID, CREATE_CONTEXT_MUTEX};
 use crate::error::WindowingApiError;
 use crate::renderbuffers::Renderbuffers;
 use crate::surface::Framebuffer;
-use crate::wgl::context::{ContextStatus, CurrentContextGuard, FramebufferGuard, OPENGL_LIBRARY};
-use crate::wgl::surface::SurfaceDataGuard;
-use crate::{gl, ContextDescriptor, SurfaceAccess, SurfaceType};
-use crate::{gl_utils, NativeWidget};
-use crate::{Context, GLApi};
-use crate::{ContextAttributeFlags, ContextAttributes, Error, GLVersion};
-use crate::{Gl, NativeContext};
-use crate::{SurfaceInfo, SurfaceTexture};
+use crate::wgl::connection::Connection;
+use crate::wgl::context::{
+    Context, ContextDescriptor, ContextStatus, CurrentContextGuard, FramebufferGuard,
+    NativeContext, OPENGL_LIBRARY, WGL_EXTENSION_FUNCTIONS,
+};
+use crate::wgl::surface::{NativeWidget, Surface, SurfaceDataGuard, SurfaceTexture, Win32Objects};
+use crate::{gl, gl_utils, GLApi, Gl, SurfaceAccess, SurfaceType};
+use crate::{ContextAttributeFlags, ContextAttributes, Error, GLVersion, SurfaceInfo};
 use euclid::default::Size2D;
 use glow::HasContext;
 use libc::c_uint;
@@ -514,8 +511,7 @@ impl Device {
             let _guard = self.temporarily_make_context_current(context);
 
             let gl_version = GLVersion::current(&context.gl);
-            let compatibility_profile =
-                context::current_context_uses_compatibility_profile(&context.gl);
+            let compatibility_profile = current_context_uses_compatibility_profile(&context.gl);
 
             ContextDescriptor {
                 pixel_format,