Rework project directory structure

This is a major simplification of the project directory structure. An
example of what was confusing before was that there were multiple
directories named `generic` and `egl`. Now modules are named more
specifically and the directory structure is flattened. The new
structure:

`src/`
 - `angle/` <- Windows ANGLE backend
 - `cgl/` <- macOS CGL backend
 - `hardware_buffer/` <- Android / OHOS hardware buffer backends
 - `mesa_surfaceless/` <- Mesa-specific pbuffer surface backend
 - `multi/` <- multi backend
 - `wayland/` <- Wayland backend
 - `wgl/` <- Windows WGL backend
 - `x11/` <- X11 backend
 - `base` <- a directory for code that can be shared by multiple backends
   - `io_surface` <- IOSurface shared code (could be used by future Metal backend)
   - `egl` <- shared EGL types

In addition, this commit removes the full file path included as a
comment at the top of every source file. These paths are now incorrect
and they were likely only there because the directory structure was so
confusing.

Signed-off-by: Martin Robinson <mrobinson@abandonedwig.info>

Author: mrobinson

android-example/rust/src/lib.rs

@@ -14,7 +14,7 @@ use log::Level;
 use std::cell::{Cell, RefCell};
 use std::mem;
 use std::thread::{self, JoinHandle};
-use surfman::platform::egl::tests;
+use surfman::hardware_buffer::tests;
 use surfman::{Connection, NativeContext, NativeDevice};
 
 #[path = "../../../examples/threads.rs"]

build.rs

@@ -1,5 +1,3 @@
-// surfman/surfman/build.rs
-//
 //! The `surfman` build script.
 
 use cfg_aliases::cfg_aliases;

examples/chaos_game.rs

@@ -1,5 +1,3 @@
-// surfman/surfman/examples/chaos_game.rs
-//
 //! Demonstrates how to use `surfman` to draw to a window surface via the CPU.
 
 use euclid::default::{Point2D, Size2D};

examples/offscreen.rs

@@ -1,5 +1,3 @@
-// surfman/surfman/examples/offscreen.rs
-//
 //! This example demonstrates how to create an off-screen context and render into it using
 //! `surfman` alone, without any other windowing libraries.
 

src/platform/windows/angle/connection.rs src/angle/connection.rssrc/platform/windows/angle/connection.rs renamed to src/angle/connection.rs

@@ -1,5 +1,3 @@
-// surfman/surfman/src/platform/windows/angle/connection.rs
-//
 //! A connection to the window server.
 //!
 //! It might seem like this should wrap an `EGLDisplay`, but it doesn't. Unfortunately, in the

src/platform/windows/angle/context.rs src/angle/context.rssrc/platform/windows/angle/context.rs renamed to src/angle/context.rs

@@ -1,16 +1,14 @@
-// surfman/surfman/src/platform/windows/angle/context.rs
-//
 //! Wrapper for EGL contexts managed by ANGLE using Direct3D 11 as a backend on Windows.
 
 use super::device::Device;
 use super::surface::{Surface, Synchronization, Win32Objects};
+use crate::base::egl::context::{self, CurrentContextGuard};
+use crate::base::egl::device::EGL_FUNCTIONS;
+use crate::base::egl::error::ToWindowingApiError;
+use crate::base::egl::surface::ExternalEGLSurfaces;
 use crate::context::{ContextID, CREATE_CONTEXT_MUTEX};
 use crate::egl;
 use crate::egl::types::{EGLConfig, EGLContext, EGLint};
-use crate::platform::generic::egl::context::{self, CurrentContextGuard};
-use crate::platform::generic::egl::device::EGL_FUNCTIONS;
-use crate::platform::generic::egl::error::ToWindowingApiError;
-use crate::platform::generic::egl::surface::ExternalEGLSurfaces;
 use crate::surface::Framebuffer;
 use crate::{ContextAttributes, Error, Gl, SurfaceInfo};
 use euclid::default::Size2D;
@@ -22,7 +20,7 @@ use std::thread;
 use winapi::shared::winerror::S_OK;
 use winapi::um::winbase::INFINITE;
 
-pub use crate::platform::generic::egl::context::{ContextDescriptor, NativeContext};
+pub use crate::base::egl::context::{ContextDescriptor, NativeContext};
 
 /// Represents an OpenGL rendering context.
 ///

src/platform/windows/angle/device.rs src/angle/device.rssrc/platform/windows/angle/device.rs renamed to src/angle/device.rs

@@ -1,14 +1,12 @@
-// surfman/surfman/src/platform/windows/angle/device.rs
-//
 //! A thread-local handle to the device.
 
 use super::connection::Connection;
+use crate::base::egl::device::EGL_FUNCTIONS;
+use crate::base::egl::ffi::EGL_DEVICE_EXT;
+use crate::base::egl::ffi::{EGL_D3D11_DEVICE_ANGLE, EGL_EXTENSION_FUNCTIONS};
+use crate::base::egl::ffi::{EGL_NO_DEVICE_EXT, EGL_PLATFORM_DEVICE_EXT};
 use crate::egl;
 use crate::egl::types::{EGLAttrib, EGLDeviceEXT, EGLDisplay, EGLint};
-use crate::platform::generic::egl::device::EGL_FUNCTIONS;
-use crate::platform::generic::egl::ffi::EGL_DEVICE_EXT;
-use crate::platform::generic::egl::ffi::{EGL_D3D11_DEVICE_ANGLE, EGL_EXTENSION_FUNCTIONS};
-use crate::platform::generic::egl::ffi::{EGL_NO_DEVICE_EXT, EGL_PLATFORM_DEVICE_EXT};
 use crate::{Error, GLApi};
 
 use std::cell::{RefCell, RefMut};

src/platform/windows/angle/mod.rs src/angle/mod.rssrc/platform/windows/angle/mod.rs renamed to src/angle/mod.rs

@@ -1,5 +1,3 @@
-// surfman/surfman/src/platform/windows/angle/mod.rs
-//
 //! Bindings to Direct3D 11 via the ANGLE OpenGL-to-Direct3D translation layer on Windows.
 
 pub mod connection;
@@ -10,5 +8,5 @@ pub mod surface;
 crate::implement_interfaces!();
 
 #[cfg(test)]
-#[path = "../../../tests.rs"]
+#[path = "../tests.rs"]
 mod tests;

src/platform/windows/angle/surface.rs src/angle/surface.rssrc/platform/windows/angle/surface.rs renamed to src/angle/surface.rs

@@ -1,20 +1,18 @@
-// surfman/surfman/src/platform/windows/angle/surface.rs
-//
 //! Surface management for Direct3D 11 on Windows using the ANGLE library as a frontend.
 
 use super::context::{Context, ContextDescriptor};
 use super::device::Device;
+use crate::base::egl::device::EGL_FUNCTIONS;
+use crate::base::egl::error::ToWindowingApiError;
+use crate::base::egl::ffi::EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE;
+use crate::base::egl::ffi::EGL_D3D_TEXTURE_ANGLE;
+use crate::base::egl::ffi::EGL_DXGI_KEYED_MUTEX_ANGLE;
+use crate::base::egl::ffi::EGL_EXTENSION_FUNCTIONS;
 use crate::context::ContextID;
 use crate::egl::types::EGLNativeWindowType;
 use crate::egl::types::EGLSurface;
 use crate::egl::{self, EGLint};
 use crate::gl;
-use crate::platform::generic::egl::device::EGL_FUNCTIONS;
-use crate::platform::generic::egl::error::ToWindowingApiError;
-use crate::platform::generic::egl::ffi::EGL_D3D_TEXTURE_2D_SHARE_HANDLE_ANGLE;
-use crate::platform::generic::egl::ffi::EGL_D3D_TEXTURE_ANGLE;
-use crate::platform::generic::egl::ffi::EGL_DXGI_KEYED_MUTEX_ANGLE;
-use crate::platform::generic::egl::ffi::EGL_EXTENSION_FUNCTIONS;
 use crate::{Error, SurfaceAccess, SurfaceID, SurfaceInfo, SurfaceType};
 
 use euclid::default::Size2D;

src/platform/generic/egl/context.rs src/base/egl/context.rssrc/platform/generic/egl/context.rs renamed to src/base/egl/context.rs

@@ -1,5 +1,3 @@
-// surfman/surfman/src/platform/generic/egl/context.rs
-//
 //! Functionality common to backends using EGL contexts.
 
 use super::device::EGL_FUNCTIONS;